diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
index e8fecdbf5..158c4d117 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -207,12 +207,12 @@
 <br />
 <input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rule_groups|@count}checked="checked"{/if} /> <strong>{l s='Product selection'}</strong>
 <div id="product_restriction_div">
-	<table id="product_rule_group_table" style="border:1px solid #AAAAAA;margin:10px 0 10px 0;padding:10px 10px 10px 10px;background-color:#FFF5D3;width:600px" cellpadding="0" cellspacing="0">
+	<table id="product_rule_group_table" style="border:1px solid #AAAAAA;margin:10px 0 10px 0;padding:10px 10px 10px 10px;background-color:#FFF5D3;width:600px;display:none" cellpadding="0" cellspacing="0">
 		{foreach from=$product_rule_groups item='product_rule_group'}
 			{$product_rule_group}
 		{/foreach}
 	</table>
-	<a href="javascript:addProductRuleGroup();">
+	<a href="javascript:addProductRuleGroup();" style="margin-top:5px;display:block">
 		<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Product selection'}
 	</a>
 </div>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.js b/admin-dev/themes/default/template/controllers/cart_rules/form.js
index ff7c38d9a..82cc6c8af 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.js
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.js
@@ -25,6 +25,7 @@
 
 function addProductRuleGroup()
 {
+	$('#product_rule_group_table').show();
 	product_rule_groups_counter += 1;
 	product_rule_counters[product_rule_groups_counter] = 0;
 
diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl
index fbe4ac3cb..2e8e0ea65 100644
--- a/admin-dev/themes/default/template/controllers/images/content.tpl
+++ b/admin-dev/themes/default/template/controllers/images/content.tpl
@@ -76,7 +76,7 @@
 	</form>
 {/if}
 
-{if isset($display_move)}
+{if isset($display_move) && $display_move}
 	<br /><h2 class="space">{l s='Move images'}</h2>
 	{l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a large number of products.'}<br />
 	<br />
diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
index c2192d48f..5fc5f3b05 100644
--- a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
@@ -38,7 +38,7 @@
 	    if (html == 'false')
 	    {
 		$("#conf_id_PS_SHOP_STATE_ID").fadeOut();
-		$('#id_state option[value=0]').attr("selected", "selected");
+		$('#PS_SHOP_STATE_ID option[value=0]').attr("selected", "selected");
 	    }
 	    else
 	    {
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
index 6102eb998..89748e739 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
@@ -33,22 +33,29 @@
 			document.getElementById('typeTranslationForm').submit();
 		}
 
-		function addThemeSelect(el)
+		function addThemeSelect()
 		{
-			var list_type_for_theme = [{foreach $translations_type_for_theme as $type}'{$type}', {/foreach}];
-			var type = el.value;
+			var list_type_for_theme = ['front', 'modules', 'pdf', 'mails'];
+			var type = $('select[name=type]').val();
 
 			$('select[name=theme]').hide();
 			for (i=0; i < list_type_for_theme.length; i++)
 				if (list_type_for_theme[i] == type)
+				{
 					$('select[name=theme]').show();
+					if (type == 'front')
+						$('select[name=theme]').children('option[value=""]').attr('disabled', true)
+					else
+						$('select[name=theme]').children('option[value=""]').attr('disabled', false)
+				}
 				else
 					$('select[name=theme]').val('{$theme_default}');
 		}
 
 		$(document).ready(function(){
+			addThemeSelect();
 			$('select[name=type]').change(function() {
-				addThemeSelect(this);
+				addThemeSelect();
 			});
 		});
 	</script>
@@ -60,15 +67,15 @@
 		<form method="get" action="index.php" id="typeTranslationForm">
 			<input type="hidden" name="controller" value="AdminTranslations" />
 			<input type="hidden" name="lang" id="translation_lang" value="0" />
-			<select name="type" style="float:left; margin-right:10px;">
+			<select name="type" style="float:left;margin-right:10px">
 				{foreach $translations_type as $type => $array}
-					<option value="{$type}">{$array.name} &nbsp;</option>
+					<option value="{$type}">{$array.name}</option>
 				{/foreach}
 			</select>
-			<select name="theme" style="float:left; margin-right:10px;">
+			<select name="theme" style="float:left;margin-right:10px">
+				<option value="">{l s='Core (no theme selected)'}</option>
 				{foreach $themes as $theme}
-
-					<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name} &nbsp;</option>
+					<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
 				{/foreach}
 			</select>
 			{foreach $languages as $language}
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
index 0125cc184..81fae60f5 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
@@ -117,7 +117,7 @@
 											<td style="width: 40%">{$key|stripslashes}</td>
 											<td>= 
 												{* Prepare name string for md5() *}
-												{capture assign="name"}{strtolower($module_name)}_{strtolower($theme_name)}_{strtolower($template_name)}_{md5($key)}{/capture}
+												{capture assign="name"}{strtolower($module_name)}{if $theme_name}_{strtolower($theme_name)}{/if}_{strtolower($template_name)}_{md5($key)}{/capture}
 												{if $key|strlen < $textarea_sized}
 													<input type="text" 
 														style="width: 450px{if empty($value.trad)};background:#FBB{/if}"
diff --git a/admin-dev/themes/default/template/layout-export.tpl b/admin-dev/themes/default/template/layout-export.tpl
index 385d49b23..3197a209b 100644
--- a/admin-dev/themes/default/template/layout-export.tpl
+++ b/admin-dev/themes/default/template/layout-export.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{foreach from=$export_headers item=header}{$header};{/foreach}
+{$export_precontent}{foreach from=$export_headers item=header}{$header};{/foreach}
 {foreach from=$export_content item=line}
 
 {foreach from=$line item=content}{$content};{/foreach}
diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index 414ae9080..2eebe37aa 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -386,15 +386,15 @@ class DispatcherCore
 		// Load custom routes from modules
 		$modules_routes = Hook::exec('moduleRoutes', array(), null, true, false);
 		if (is_array($modules_routes) && count($modules_routes))
-		foreach($modules_routes as $module_route)
-		  foreach($module_route as $route => $route_details)
-		    if (array_key_exists('controller', $route_details) && array_key_exists('rule', $route_details) 
-		      && array_key_exists('keywords', $route_details) && array_key_exists('params', $route_details))
-		      {
-			      if (!isset($this->default_routes[$route]))
-			      	$this->default_routes[$route] = array();
-			      $this->default_routes[$route] = array_merge($this->default_routes[$route], $route_details);
-				}
+			foreach($modules_routes as $module_route)
+				foreach($module_route as $route => $route_details)
+					if (array_key_exists('controller', $route_details) && array_key_exists('rule', $route_details) 
+						&& array_key_exists('keywords', $route_details) && array_key_exists('params', $route_details))
+					{
+						if (!isset($this->default_routes[$route]))
+						$this->default_routes[$route] = array();
+						$this->default_routes[$route] = array_merge($this->default_routes[$route], $route_details);
+					}
 		
 		// Set default routes
 		foreach (Language::getLanguages() as $lang)
@@ -674,38 +674,41 @@ class DispatcherCore
 			if (!$this->request_uri)
 				return strtolower($this->controller_not_found);
 			$controller = $this->controller_not_found;
+			
+			// If the request_uri matches a static file, then there is no need to check the routes, we keep "controller_not_found" (a static file should not go through the dispatcher) 
+			if (!preg_match('/\.(gif|jpe?g|png|css|js|ico)$/i', $this->request_uri))
+			{
+				// Add empty route as last route to prevent this greedy regexp to match request uri before right time
+				if ($this->empty_route)
+					$this->addRoute($this->empty_route['routeID'], $this->empty_route['rule'], $this->empty_route['controller'], Context::getContext()->language->id);
 
-			// Add empty route as last route to prevent this greedy regexp to match request uri before right time
-			if ($this->empty_route)
-				$this->addRoute($this->empty_route['routeID'], $this->empty_route['rule'], $this->empty_route['controller'], Context::getContext()->language->id);
-
-			if (isset($this->routes[Context::getContext()->language->id]))
-				foreach ($this->routes[Context::getContext()->language->id] as $route)
-					if (preg_match($route['regexp'], $this->request_uri, $m))
-					{
-						// Route found ! Now fill $_GET with parameters of uri
-						foreach ($m as $k => $v)
-							if (!is_numeric($k))
-								$_GET[$k] = $v;
-	
-						$controller = $route['controller'] ? $route['controller'] : $_GET['controller'];
-						if (!empty($route['params']))
-							foreach ($route['params'] as $k => $v)
-								$_GET[$k] = $v;
-	
-						// A patch for module friendly urls
-						if (preg_match('#module-([a-z0-9_-]+)-([a-z0-9]+)$#i', $controller, $m))
+				if (isset($this->routes[Context::getContext()->language->id]))
+					foreach ($this->routes[Context::getContext()->language->id] as $route)
+						if (preg_match($route['regexp'], $this->request_uri, $m))
 						{
-							$_GET['module'] = $m[1];
-							$_GET['fc'] = 'module';
-							$controller = $m[2];
+							// Route found ! Now fill $_GET with parameters of uri
+							foreach ($m as $k => $v)
+								if (!is_numeric($k))
+									$_GET[$k] = $v;
+		
+							$controller = $route['controller'] ? $route['controller'] : $_GET['controller'];
+							if (!empty($route['params']))
+								foreach ($route['params'] as $k => $v)
+									$_GET[$k] = $v;
+		
+							// A patch for module friendly urls
+							if (preg_match('#module-([a-z0-9_-]+)-([a-z0-9]+)$#i', $controller, $m))
+							{
+								$_GET['module'] = $m[1];
+								$_GET['fc'] = 'module';
+								$controller = $m[2];
+							}
+		
+							if (isset($_GET['fc']) && $_GET['fc'] == 'module')
+								$this->front_controller = self::FC_MODULE;
+							break;
 						}
-	
-						if (isset($_GET['fc']) && $_GET['fc'] == 'module')
-							$this->front_controller = self::FC_MODULE;
-						break;
-					}
-
+			}
 			if ($controller == 'index' || $this->request_uri == '/index.php')
 				$controller = $this->default_controller;
 			$this->controller = $controller;
diff --git a/classes/LocalizationPack.php b/classes/LocalizationPack.php
index 7111dcb0f..133ad8534 100644
--- a/classes/LocalizationPack.php
+++ b/classes/LocalizationPack.php
@@ -51,7 +51,6 @@ class LocalizationPackCore
 			$res &= $this->_installUnits($xml);
 			$res &= $this->installConfiguration($xml);
 			$res &= $this->installModules($xml);
-			$res &= $this->updateDefaultGroupDisplayMethod($xml);
 			$res &= $this->_installLanguages($xml, $install_mode);
 
 			if ($res && isset($this->iso_code_lang))
@@ -233,7 +232,7 @@ class LocalizationPackCore
 				}
 			}
 		}
-		return true;
+		return $this->updateDefaultGroupDisplayMethod($xml);
 	}
 
 	protected function _installCurrencies($xml, $install_mode = false)
@@ -391,10 +390,13 @@ class LocalizationPackCore
 			$attributes = $xml->group_default->attributes();
 			if (isset($attributes['price_display_method']) && in_array((int)$attributes['price_display_method'], array(0, 1)))
 			{
-				$group = new Group((int)Configuration::get('PS_CUSTOMER_GROUP'));
-				$group->price_display_method = (int)$attributes['price_display_method'];
-				if (!$group->save())
-					$this->_errors[] = Tools::displayError('An error occurred during the default group update');
+				foreach (array((int)Configuration::get('PS_CUSTOMER_GROUP'), (int)Configuration::get('PS_GUEST_GROUP'), (int)Configuration::get('PS_UNIDENTIFIED_GROUP')) as $id_group)
+				{
+					$group = new Group((int)$id_group);
+					$group->price_display_method = (int)$attributes['price_display_method'];
+					if (!$group->save())
+						$this->_errors[] = Tools::displayError('An error occurred during the default group update');
+				}
 			}
 			else
 				$this->_errors[] = Tools::displayError('An error has occurred during the default group update');
diff --git a/classes/Tools.php b/classes/Tools.php
index 867767d4e..7617ddec1 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1633,10 +1633,10 @@ class ToolsCore
 					{
 						fwrite($write_fd, $media_domains);
 						fwrite($write_fd, $domain_rewrite_cond);
-						fwrite($write_fd, 'RewriteRule ^([a-z0-9]+)\-([a-z0-9]+)(\-[_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}'._PS_PROD_IMG_.'$1-$2$3$4.jpg [L]'."\n");
+						fwrite($write_fd, 'RewriteRule ^([a-z0-9]+)\-([a-z0-9]+)(\-[_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1-$2$3$4.jpg [L]'."\n");
 						fwrite($write_fd, $media_domains);
 						fwrite($write_fd, $domain_rewrite_cond);
-						fwrite($write_fd, 'RewriteRule ^([0-9]+)\-([0-9]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}'._PS_PROD_IMG_.'$1-$2$3.jpg [L]'."\n");
+						fwrite($write_fd, 'RewriteRule ^([0-9]+)\-([0-9]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1-$2$3.jpg [L]'."\n");
 					}
 
 					// Rewrite product images < 100 millions
@@ -1651,7 +1651,7 @@ class ToolsCore
 						$img_name .= '$'.$j;
 							fwrite($write_fd, $media_domains);
 						fwrite($write_fd, $domain_rewrite_cond);
-						fwrite($write_fd, 'RewriteRule ^'.str_repeat('([0-9])', $i).'(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}'._PS_PROD_IMG_.$img_path.$img_name.'$'.($j + 1).".jpg [L]\n");
+						fwrite($write_fd, 'RewriteRule ^'.str_repeat('([0-9])', $i).'(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/'.$img_path.$img_name.'$'.($j + 1).".jpg [L]\n");
 					}
 					fwrite($write_fd, $media_domains);
 					fwrite($write_fd, $domain_rewrite_cond);
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index d8b39b224..87f4d5ea7 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -594,6 +594,7 @@ class AdminControllerCore extends Controller
 				
 		}
 		$this->context->smarty->assign(array(
+			'export_precontent' => "\xEF\xBB\xBF",
 			'export_headers' => $headers,
 			'export_content' => $content
 			)
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index ea74e877e..2ab0cdf47 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -384,21 +384,22 @@ class OrderInvoiceCore extends ObjectModel
 	 */
 	public function getEcoTaxTaxesBreakdown()
 	{
-		$res = Db::getInstance()->executeS('
+		$result = Db::getInstance()->executeS('
 		SELECT `ecotax_tax_rate` as `rate`, SUM(`ecotax` * `product_quantity`) as `ecotax_tax_excl`, SUM(`ecotax` * `product_quantity`) as `ecotax_tax_incl`
 		FROM `'._DB_PREFIX_.'order_detail`
 		WHERE `id_order` = '.(int)$this->id_order.'
 		AND `id_order_invoice` = '.(int)$this->id.'
-		GROUP BY `ecotax_tax_rate`'
-		);
+		GROUP BY `ecotax_tax_rate`');
 
-		if ($res)
-			foreach ($res as &$row)
+		$taxes = array();
+		foreach ($result as $row)
+			if ($row['ecotax_tax_excl'] > 0)
 			{
 				$row['ecotax_tax_incl'] = Tools::ps_round($row['ecotax_tax_excl'] + ($row['ecotax_tax_excl'] * $row['rate'] / 100), 2);
 				$row['ecotax_tax_excl'] = Tools::ps_round($row['ecotax_tax_excl'], 2);
+				$taxes[] = $row;
 			}
-		return $res;
+		return $taxes;
 	}
 
 	/**
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index 2f86626b5..1538bb2e2 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -308,7 +308,7 @@ class ShopCore extends ObjectModel
 					WHERE (su.domain = \''.$host.'\' OR su.domain_ssl = \''.$host.'\')
 						AND s.active = 1
 						AND s.deleted = 0
-					ORDER BY LENGTH(uri) DESC';
+					ORDER BY LENGTH(CONCAT(su.physical_uri, su.virtual_uri)) DESC';
 
 			$id_shop = '';
 			$found_uri = '';
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 0438b68ab..38ecea2e4 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -28,6 +28,7 @@ class AdminImagesControllerCore extends AdminController
 {
 	protected $start_time = 0;
 	protected $max_execution_time = 7200;
+	protected $display_move;
 
 	public function __construct()
 	{
@@ -50,6 +51,9 @@ class AdminImagesControllerCore extends AdminController
 			'scenes' => array('title' => $this->l('Scenes'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
 			'stores' => array('title' => $this->l('Stores'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false)
 		);
+		
+		// No need to display the old image system if the install has been made later than 2013-03-26
+		$this->display_move = (defined('_PS_CREATION_DATE_') && strtotime(_PS_CREATION_DATE_) > strtotime('2013-03-26')) ? false : true;
 
 		$this->fields_options = array(
 			'images' => array(
@@ -141,20 +145,22 @@ class AdminImagesControllerCore extends AdminController
 						'type' => 'text',
 						'height' => 'px',
 						'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 "Images" page under the "Preferences" menu.'),
-						'validation' => 'isBool',
-						'cast' => 'intval',
-						'required' => false,
-						'type' => 'bool',
-						'visibility' => Shop::CONTEXT_ALL
-					),
+					)
 				),
 				'submit' => array('title' => $this->l('Save   '), 'class' => 'button'),
 			),
 		);
+		
+		if ($this->display_move)
+			$this->fields_options['product_images']['fields']['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 "Images" page under the "Preferences" menu.'),
+				'validation' => 'isBool',
+				'cast' => 'intval',
+				'required' => false,
+				'type' => 'bool',
+				'visibility' => Shop::CONTEXT_ALL
+			);
 
 		$this->fields_form = array(
 			'legend' => array(
@@ -670,7 +676,7 @@ class AdminImagesControllerCore extends AdminController
 
 			$this->context->smarty->assign(array(
 				'display_regenerate' => true,
-				'display_move' => true
+				'display_move' => $this->display_move
 			));
 		}
 
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index df8898e62..3456183b3 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -52,9 +52,6 @@ class AdminTranslationsControllerCore extends AdminController
 	/** @var array : List of theme by translation type : FRONT, BACK, ERRORS... */
 	protected $translations_informations = array();
 
-	/** @var array : List of theme by translation type : FRONT, BACK, ERRORS... */
-	protected $translations_type_for_theme = array('front', 'modules', 'pdf', 'mails');
-
 	/** @var array : List of all languages */
 	protected $languages;
 
@@ -199,7 +196,6 @@ class AdminTranslationsControllerCore extends AdminController
 			'token' => $this->token,
 			'languages' => $this->languages,
 			'translations_type' => $this->translations_informations,
-			'translations_type_for_theme' => $this->translations_type_for_theme,
 			'packs_to_install' => $packs_to_install,
 			'packs_to_update' => $packs_to_update,
 			'url_submit' => self::$currentIndex.'&token='.$this->token,
@@ -761,7 +757,7 @@ class AdminTranslationsControllerCore extends AdminController
 							$this->errors[] = sprintf(Tools::displayError('Cannot delete the archive %s.'), $file);
 				}
 				else
-					$this->errors[] = Tools::displayError('The server does not have permissions for writing.'. ' '.sprintf(Tools::displayError('Please check rights for %s'), dirname($file)));
+					$this->errors[] = Tools::displayError('The server does not have permissions for writing.').' '.sprintf(Tools::displayError('Please check rights for %s'), dirname($file));
 			}
 			else
 				$this->errors[] = Tools::displayError('Language not found.');
@@ -788,14 +784,13 @@ class AdminTranslationsControllerCore extends AdminController
 		static $str_write = '';
 		static $array_check_duplicate = array();
 
-		// Default translations and Prestashop overriding themes are distinguish
-		$is_default = $theme_name === self::DEFAULT_THEME_NAME ? true : false;
-
 		// Set file_name in static var, this allow to open and wright the file just one time
 		if (!isset($cache_file[$theme_name.'-'.$file_name]))
 		{
 			$str_write = '';
 			$cache_file[$theme_name.'-'.$file_name] = true;
+			if (!Tools::file_exists_cache(dirname($file_name)))
+				mkdir(dirname($file_name), 0777, true);
 			if (!Tools::file_exists_cache($file_name))
 				file_put_contents($file_name, '');
 			if (!is_writable($file_name))
@@ -811,10 +806,10 @@ class AdminTranslationsControllerCore extends AdminController
 
 		foreach ($files as $file)
 		{
-			if (preg_match('/^(.*).(tpl|php)$/', $file) && Tools::file_exists_cache($file_path = $dir.$file) && !in_array($file, self::$ignore_folder))
+			if (preg_match('/^(.*).(tpl|php)$/', $file) && Tools::file_exists_cache($dir.$file) && !in_array($file, self::$ignore_folder))
 			{
 				// Get content for this file
-				$content = file_get_contents($file_path);
+				$content = file_get_contents($dir.$file);
 
 				// Get file type
 				$type_file = substr($file, -4) == '.tpl' ? 'tpl' : 'php';
@@ -827,16 +822,16 @@ class AdminTranslationsControllerCore extends AdminController
 
 				foreach ($matches as $key)
 				{
-					if ($is_default)
-					{
-						$post_key = md5(strtolower($module_name).'_'.self::DEFAULT_THEME_NAME.'_'.strtolower($template_name).'_'.md5($key));
-						$pattern = '\'<{'.strtolower($module_name).'}prestashop>'.strtolower($template_name).'_'.md5($key).'\'';
-					}
-					else
+					if ($theme_name)
 					{
 						$post_key = md5(strtolower($module_name).'_'.strtolower($theme_name).'_'.strtolower($template_name).'_'.md5($key));
 						$pattern = '\'<{'.strtolower($module_name).'}'.strtolower($theme_name).'>'.strtolower($template_name).'_'.md5($key).'\'';
 					}
+					else
+					{
+						$post_key = md5(strtolower($module_name).'_'.strtolower($template_name).'_'.md5($key));
+						$pattern = '\'<{'.strtolower($module_name).'}prestashop>'.strtolower($template_name).'_'.md5($key).'\'';
+					}
 
 					if (array_key_exists($post_key, $_POST) && !empty($_POST[$post_key]) && !in_array($pattern, $array_check_duplicate))
 					{
@@ -900,9 +895,6 @@ class AdminTranslationsControllerCore extends AdminController
 		// added for compatibility
 		$GLOBALS[$name_var] = array_change_key_case($GLOBALS[$name_var]);
 
-		// Default translations and Prestashop overriding themes are distinguish
-		$is_default = $theme_name === self::DEFAULT_THEME_NAME ? true : false;
-
 		// Thank to this var similar keys are not duplicate
 		// in AndminTranslation::modules_translations array
 		// see below
@@ -929,19 +921,22 @@ class AdminTranslationsControllerCore extends AdminController
 
 				foreach ($matches as $key)
 				{
-					$module_key = '<{'.Tools::strtolower($module_name).'}'.
-						strtolower($is_default ? 'prestashop' : $theme_name).'>'.Tools::strtolower($template_name).'_'.md5($key);
+					$md5_key = md5($key);
+					$module_key = '<{'.Tools::strtolower($module_name).'}'.strtolower($theme_name).'>'.Tools::strtolower($template_name).'_'.$md5_key;
+					$default_key = '<{'.Tools::strtolower($module_name).'}prestashop>'.Tools::strtolower($template_name).'_'.$md5_key;
 					// to avoid duplicate entry
 					if (!in_array($module_key, $array_check_duplicate))
 					{
 						$array_check_duplicate[] = $module_key;
 						if (!isset($this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad']))
 							$this->total_expression++;
-
-						if (array_key_exists($module_key, $GLOBALS[$name_var]))
+						if ($theme_name && array_key_exists($module_key, $GLOBALS[$name_var]))
 							$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = html_entity_decode($GLOBALS[$name_var][$module_key], ENT_COMPAT, 'UTF-8');
+						elseif (array_key_exists($default_key, $GLOBALS[$name_var]))
+							$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = html_entity_decode($GLOBALS[$name_var][$default_key], ENT_COMPAT, 'UTF-8');
 						else
 						{
+							//d(array($module_key, $default_key, $key, $GLOBALS[$name_var]));
 							$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = '';
 							$this->missing_translations++;
 						}
@@ -1128,7 +1123,7 @@ class AdminTranslationsControllerCore extends AdminController
 			'front' => array(
 				'name' => $this->l('Front Office translations'),
 				'var' => '_LANG',
-				'dir' => _PS_THEME_SELECTED_DIR_.'lang/',
+				'dir' => defined('_PS_THEME_SELECTED_DIR_') ? _PS_THEME_SELECTED_DIR_.'lang/' : '',
 				'file' => $this->lang_selected->iso_code.'.php'
 			),
 			'back' => array(
@@ -1153,33 +1148,28 @@ class AdminTranslationsControllerCore extends AdminController
 				'name' => $this->l('Installed modules translations'),
 				'var' => '_MODULES',
 				'dir' => _PS_MODULE_DIR_,
-				'file' => '',
-				'override' => array(
-					'dir' => _PS_THEME_SELECTED_DIR_.'modules/',
-					'file' => ''
-				)
+				'file' => ''		
 			),
 			'pdf' => array(
 				'name' => $this->l('PDF translations'),
 				'var' => '_LANGPDF',
 				'dir' => _PS_TRANSLATIONS_DIR_.$this->lang_selected->iso_code.'/',
-				'file' => 'pdf.php',
-				'override' => array(
-					'dir' => _PS_THEME_SELECTED_DIR_.'pdf/lang/',
-					'file' => $this->lang_selected->iso_code.'.php'
-				)
+				'file' => 'pdf.php'
 			),
 			'mails' => array(
 				'name' => $this->l('Email templates translations'),
 				'var' => '_LANGMAIL',
 				'dir' => _PS_MAIL_DIR_.$this->lang_selected->iso_code.'/',
-				'file' => 'lang.php',
-				'override' => array(
-					'dir' => _PS_THEME_SELECTED_DIR_.'mails/'.$this->lang_selected->iso_code.'/',
-					'file' => 'lang.php'
-				)
+				'file' => 'lang.php'
 			)
 		);
+			
+		if (defined('_PS_THEME_SELECTED_DIR_'))
+		{
+			$this->translations_informations['modules']['override'] = array('dir' => _PS_THEME_SELECTED_DIR_.'modules/', 'file' => '');
+			$this->translations_informations['pdf']['override'] = array('dir' => _PS_THEME_SELECTED_DIR_.'pdf/lang/', 'file' => $this->lang_selected->iso_code.'.php');
+			$this->translations_informations['mails']['override'] = array('dir' => _PS_THEME_SELECTED_DIR_.'mails/'.$this->lang_selected->iso_code.'/', 'file' => 'lang.php');
+		}
 	}
 
 	/**
@@ -1200,20 +1190,15 @@ class AdminTranslationsControllerCore extends AdminController
 		// Get folder name of theme
 		if (($theme = Tools::getValue('theme')) && !is_array($theme))
 		{
-			$theme_exists = false;
-			foreach ($this->themes as $existing_theme)
-				if ($existing_theme->directory == $theme)
-					$theme_exists = true;
-			if ($theme_exists)
-				$this->theme_selected = Tools::safeOutput($theme);
-			else
+			$theme_exists = $this->theme_exists($theme);
+			if (!$theme_exists)
 				throw new PrestaShopException(sprintf(Tools::displayError('Invalid theme "%s"'), $theme));
+			$this->theme_selected = Tools::safeOutput($theme);
 		}
-		else
-			$this->theme_selected = self::DEFAULT_THEME_NAME;
 
 		// Set the path of selected theme
-		define('_PS_THEME_SELECTED_DIR_', _PS_ROOT_DIR_.'/themes/'.$this->theme_selected.'/');
+		if ($this->theme_selected)
+			define('_PS_THEME_SELECTED_DIR_', _PS_ROOT_DIR_.'/themes/'.$this->theme_selected.'/');
 
 		// Get type of translation
 		if (($type = Tools::getValue('type')) && !is_array($type))
@@ -1294,7 +1279,7 @@ class AdminTranslationsControllerCore extends AdminController
 			{
 				if ($this->tabAccess['edit'] === '1')
 					// Only the PrestaShop team should write the translations into the _PS_TRANSLATIONS_DIR_
-					if (($this->theme_selected == self::DEFAULT_THEME_NAME) && _PS_MODE_DEV_)
+					if (!$this->theme_selected)
 						$this->writeTranslationFile();
 					else
 						$this->writeTranslationFile(true);
@@ -1339,7 +1324,7 @@ class AdminTranslationsControllerCore extends AdminController
 					{
 						// Get files of all modules
 						$arr_files = $this->getAllModuleFiles($modules, null, $this->lang_selected->iso_code, true);
-
+						
 						// Find and write all translation modules files
 						foreach ($arr_files as $value)
 							$this->findAndWriteTranslationsIntoFile($value['file_name'], $value['files'], $value['theme'], $value['module'], $value['dir']);
@@ -1409,7 +1394,7 @@ class AdminTranslationsControllerCore extends AdminController
 			$arr_mail_content['core_mail'] = Tools::getValue('core_mail');
 
 			// Get path of directory for find a good path of translation file
-			if ($this->theme_selected == self::DEFAULT_THEME_NAME && _PS_MODE_DEV_)
+			if (!$this->theme_selected)
 				$arr_mail_path['core_mail'] = $this->translations_informations[$this->type_selected]['dir'];
 			else
 				$arr_mail_path['core_mail'] = $this->translations_informations[$this->type_selected]['override']['dir'];
@@ -1420,7 +1405,7 @@ class AdminTranslationsControllerCore extends AdminController
 			$arr_mail_content['module_mail'] = Tools::getValue('module_mail');
 
 			// Get path of directory for find a good path of translation file
-			if ($this->theme_selected == self::DEFAULT_THEME_NAME && _PS_MODE_DEV_)
+			if (!$this->theme_selected)
 				$arr_mail_path['module_mail'] = $this->translations_informations['modules']['dir'].'{module}/mails/'.$this->lang_selected->iso_code.'/';
 			else
 				$arr_mail_path['module_mail'] = $this->translations_informations['modules']['override']['dir'].'{module}/mails/'.$this->lang_selected->iso_code.'/';
@@ -1601,6 +1586,12 @@ class AdminTranslationsControllerCore extends AdminController
 	 */
 	public function initFormFront()
 	{
+		if (!$this->theme_exists(Tools::getValue('theme')))
+		{
+			$this->errors[] = sprintf(Tools::displayError('Invalid theme "%s"'), Tools::getValue('theme'));
+			return;
+		}
+	
 		$missing_translations_front = array();
 		$name_var = $this->translations_informations[$this->type_selected]['var'];
 		$GLOBALS[$name_var] = $this->fileExists();
@@ -2300,7 +2291,7 @@ class AdminTranslationsControllerCore extends AdminController
 			if (!in_array($module_dir, self::$ignore_folder))
 			{
 				$dir = false;
-				if (($this->theme_selected != self::DEFAULT_THEME_NAME || !_PS_MODE_DEV_) && Tools::file_exists_cache($this->translations_informations['modules']['override']['dir'].$module_dir.'/mails/'))
+				if ($this->theme_selected && Tools::file_exists_cache($this->translations_informations['modules']['override']['dir'].$module_dir.'/mails/'))
 					$dir = $this->translations_informations['modules']['override']['dir'].$module_dir.'/';
 				elseif (Tools::file_exists_cache($this->translations_informations['modules']['dir'].$module_dir.'/mails/'))
 					$dir = $this->translations_informations['modules']['dir'].$module_dir.'/';
@@ -2359,7 +2350,7 @@ class AdminTranslationsControllerCore extends AdminController
 					$subject_mail = $this->getSubjectMail($dir, $file, $subject_mail);
 
 		// Get path of directory for find a good path of translation file
-		if (($this->theme_selected != self::DEFAULT_THEME_NAME || !_PS_MODE_DEV_) && @filemtime($this->translations_informations[$this->type_selected]['override']['dir']))
+		if ($this->theme_selected && @filemtime($this->translations_informations[$this->type_selected]['override']['dir']))
 			$i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir'];
 		else
 			$i18n_dir = $this->translations_informations[$this->type_selected]['dir'];
@@ -2534,28 +2525,37 @@ class AdminTranslationsControllerCore extends AdminController
 			$root_dir = $initial_root_dir;
 			if ($module{0} == '.')
 				continue;
-			// Get path of directory for find a good path of translation file
-			if ($root_dir == null)
-			{
-				$i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir'];
-				if (is_dir($i18n_dir.$module))
-					$root_dir = $i18n_dir;
-			}
+
+			// First we load the default translation file
 			if ($root_dir == null)
 			{
 				$i18n_dir = $this->translations_informations[$this->type_selected]['dir'];
 				if (is_dir($i18n_dir.$module))
 					$root_dir = $i18n_dir;
-			}
 
-			if (is_dir($root_dir.$module))
-			{
-				if (Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php'))
-					$lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
-				else
+				$lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
+				if (!Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php') && Tools::file_exists_cache($root_dir.$module.'/'.$lang.'.php'))
 					$lang_file = $root_dir.$module.'/'.$lang.'.php';
 				@include($lang_file);
+				$this->getModuleTranslations();
+				// If a theme is selected, then the destination translation file must be in the theme
+				if ($this->theme_selected)
+					$lang_file = $this->translations_informations[$this->type_selected]['override']['dir'].$module.'/translations/'.$lang.'.php';
+				$this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $lang_file, $is_default);
+			}
 
+			$root_dir = $initial_root_dir;
+			// Then we load the overriden translation file
+			if ($this->theme_selected && isset($this->translations_informations[$this->type_selected]['override']))
+			{
+				$i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir'];
+				if (is_dir($i18n_dir.$module))
+					$root_dir = $i18n_dir;
+				if (Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php'))
+					$lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
+				elseif (Tools::file_exists_cache($root_dir.$module.'/'.$lang.'.php'))
+					$lang_file = $root_dir.$module.'/'.$lang.'.php';
+				@include($lang_file);
 				$this->getModuleTranslations();
 				$this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $lang_file, $is_default);
 			}
@@ -2641,7 +2641,7 @@ class AdminTranslationsControllerCore extends AdminController
 		$i18n_dir = $this->translations_informations[$this->type_selected]['dir'];
 		$default_i18n_file = $i18n_dir.$this->translations_informations[$this->type_selected]['file'];
 
-		if (($this->theme_selected == self::DEFAULT_THEME_NAME) && _PS_MODE_DEV_)
+		if (!$this->theme_selected)
 			$i18n_file = $default_i18n_file;
 		else
 		{
@@ -2736,5 +2736,16 @@ class AdminTranslationsControllerCore extends AdminController
 		}
 		return $list;
 	}
+	
+	protected function theme_exists($theme)
+	{
+		if (!is_array($this->themes))
+			$this->themes = Theme::getThemes();
 
+		$theme_exists = false;
+		foreach ($this->themes as $existing_theme)
+			if ($existing_theme->directory == $theme)
+				return true;
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
old mode 100644
new mode 100755
index 491f6fab6..7244ffb36
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -23,6 +23,135 @@ International Registred Trademark & Property of PrestaShop SA
 
 Release Notes for PrestaShop 1.5
 --------------------------------
+####################################
+#   v1.5.4.1 - (2013-04-25)  #
+####################################
+
+	Fixed bugs:
+
+	[-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here
+	[-] Installer : do not select activity if not defined
+	[-] INSTALLER : add counter loop in update_order_messages
+	[-] Installer : Fix bug #PSCFV-8606 bad performance when updating messages
+	[-] INSTALLER : fix bug #PSCFV-7688 mailalert_customer_oos not existing in database
+	[-] Installer: fix installer in PT languahe
+	[-] Installer : Missing directory separator when upgrading images types
+	[-] Installer: Switch test of session.save_path to optional test
+	[-] INSTALLER : Fix bug, can not check rights on theme folders
+	[-] INSTALLER : Fix bug #PSCFV-8167 duplicates product_sqlstock INDEX
+
+	[-] FO : do not use dispatcher routes for static files
+	[-] FO : invoice: do not display taxes table if there is not tax to display
+	[-] FO : Fixed product comparator CSS
+	[-] Fo : Remove additionnal space in phone field value
+	[-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO
+	[-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825
+	[-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC
+	[-] FO: fixed some css bug for ie7
+	[-] FO: Add the protocol content to the cache id of  modules #PSCFV-8810
+	[-] FO : empty cache getContextualValue_ when updating cart quantity
+	[-] FO : Disable confirm order when already clicked
+	[-] FO : address alias lost
+	[-] FO : Undefined free_shipping in POC when updateQty
+	[-] Fo : Fix big pic alt with jqzoom
+	[-] FO : Class free order name for validateOrder
+	[-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers
+	[-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically
+	[-] FO : add cart rul when cart rul has several groups
+	[-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule
+	[-] Fo : Fix undefined var in cart-summary when updating id_address_delivery
+	[-] FO : Fix login cookie issues
+	[-] FO: fixed bug #PSCFV-3238 - compareController typo
+	[-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong
+	[-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading
+	[-] FO :  standardize behavior of selected country in the list when create a new address
+	[-] FO: fixed bug DOCTYPE line - #PSCFV-8602
+	[-] FO: Fix htaccess generation when disable mod_security is selected #PSCFV-8675
+	[-] FO: Don't display vat_number field if not required for the country on address.tpl
+	[-] FO: Extension test on file attachment for contact form should not be case sensitive #PSCFV-8616
+	[-] FO : Do not fade out on bigpic source change
+	[-] FO : Fix bug #PSCFV-7743 and #PSCFV-8286, bigpic source change
+	[-] FO: fixed bug Cart Summery Borders - #PSCFV-8421
+	[-] FO : Fix bug #PSCFV-8286, displayImage bad selector called
+	[-] FO: fixed bug Solved a problem with JSON.stringify problem with IE8 - #PSCFV-8340
+	[-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances
+	[-] FO: fixed bug missing <div class="clear"></div> in product.tpl - #PSCFV-8164
+	[-] FO : Add ccs and js to frontcontroller for old modules
+	[-] FO: change logo position
+	[-] FO : Fix bug #PSCFV-8183 lost order message in OPC
+
+	[-] BO: Fix htaccess generation for subfolders installation
+	[-] BO : Fix bug witth shop address and no state in country
+	[-] BO : Fix bug for csv export
+	[-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop
+	[-] BO : Bad gender image when no gender
+	[-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float
+	[-] BO: Fix admin carts currency prices on view and listing
+	[-] BO : Remove typo in address formating fields links
+	[-] BO : Remove undefined name when module can not be installed
+	[-] BO: Don't delete the directory of modules before upgrade them
+	[-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image
+	[-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch
+	[-] BO : Deactivate backwardcompatibility module
+	[-] BO: PSCFV-7685 parent category for root categories after upgrade
+	[-] BO : Fix bug #PSCFV-8626 rename actual admin folder
+	[-] BO: fixed bug Cart rules - Javascript error - #PSCFV-5045
+	[-] BO : Fix bug #PSCFV-8620 returns with customized product
+	[-] BO: Fix #PSCFV-8683 order_way collusion on listing between 2 tabs
+	[-] BO : Fix bug : #PSCFV-8631 no download-product.tpl in languages packs
+	[-] BO : Fix bug #PSCFV-8540 setting cookie key in cache key
+	[-] BO: fixed bug In back office, in product modification page, image pane, the image list appears broken in IE8 - #PSCFV-8024
+	[-] BO: Fix the Htaccess rewriting generation when one shop has the rewriting enabled and the last one on the same domain not
+	[-] BO: fixed bug #PSCFV-8258
+	[-] BO: Clear cart when customer is changed in back office orders #PSCFV-8520
+	[-] BO : Remove warning on ProductDownload
+	[-] BO : fixed field value saving when value is equal to 0 #PSCFV-8530
+	[-] BO : Fix bug #PSCFV-8481 no live edit on index when one language is active only
+	[-] BO : fixed bug #PSCFV-8095 now maximum weigh for carrier is float
+
+	[-] Classes : Bug fix : OrderOpcController, check instance of blocknewsletter module
+	[-] Classes : Bug fix : Mobile hooks, check PayPal for payments only
+
+	[-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by
+	[-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping
+	[-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping
+	[-] CORE : Fix bug #PSCFV-5624 set order reference to CHAR(10)
+	[-] CORE : fixed bug #PSCFV-8475 - Email templates with {shop_url} append url with index.php
+	[-] Core: Cache of Cart::getPackageList is now per cart
+	[-] Core: Local cache could never be totally cleaned
+
+	[-] MO: homefeatured - numbers are now the same
+	[-] MO: Fix product cover image on blockviewed with multishop
+	[-] MO : Fix rand parameter in favorite module js
+	[-] MO : Fix bug #PSCFV-8430 bad post type ajax request, thanks to maofree
+	[-] MO : Fix bug #PSCFV-8399 dictinct categegories in module blockcategories
+
+	Improved/changed features:
+
+	[*] Installer : Set context in upgrader
+	[*] Installer: Add PHP CLI installer
+
+	[*] FO : one_phone_at_least should be set
+	[*] FO : add steps to authentication pull request 002f468958 thanks to radovanx
+	[*] FO: use subdirectory per template for smarty cache
+	[*] FO : Check if grid_prestashop.css is available in theme before including
+	[*] FO : Retrocompat for default theme 1.4.10
+
+	[*] BO : Add block "close_td" in list_content.tpl    [*] BO : Add block "close_td" in list_content.tpl    {block name="td_content"}    .....    {/block}    {block name="close_td"}    {/block}    So now we can override "td" and "/td" tags.    So we can create    "td" "a" ... content.... "/a" "/td"    when overriding the block open-td and close-td    and we can use "a" tag with "href" rather than "onclick" to create view links in the list.    And the user can choose to open the link in another tab or window.
+	[*] BO: The translation of modules are now made in the theme if modules are overrided or directly in the module folder
+	[*] BO: List all modules with an upgrade available on AdminModules header
+
+	[*] TR : Removed hard-coded dot in history.tpl
+	[*] TR : Improved English text of installer
+	[*] TR : added russian installer tabs
+	[*] TR : Fixed wrong use of translation functions in AdminTranslationsController
+	[*] TR : Added tab translations for installer languages
+
+	Added Features:
+
+	[+] BO: show all languages in setting of employee
+
+
 ####################################
 #   v1.5.4.0 - (2013-03-26)  #
 ####################################
diff --git a/docs/readme_de.txt b/docs/readme_de.txt
index 06bfd2c09..c5038ba98 100755
--- a/docs/readme_de.txt
+++ b/docs/readme_de.txt
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
 @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 International Registered Trademark & Property of PrestaShop SA
 
-NAME: Prestashop 1.5.4.0
-VERSION: 1.5.4.0
+NAME: Prestashop 1.5.4.1
+VERSION: 1.5.4.1
 
 VORBEREITUNG
 ===========
diff --git a/docs/readme_en.txt b/docs/readme_en.txt
index b886bb6f3..8fd02b40c 100755
--- a/docs/readme_en.txt
+++ b/docs/readme_en.txt
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
 @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 International Registered Trademark & Property of PrestaShop SA
 
-NAME: Prestashop 1.5.4.0
-VERSION: 1.5.4.0
+NAME: Prestashop 1.5.4.1
+VERSION: 1.5.4.1
 
 PREPARATION
 ===========
diff --git a/docs/readme_es.txt b/docs/readme_es.txt
index e1baafc1e..dd37179d4 100755
--- a/docs/readme_es.txt
+++ b/docs/readme_es.txt
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
 @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 International Registered Trademark & Property of PrestaShop SA
 
-NAME: Prestashop 1.5.4.0
-VERSION: 1.5.4.0
+NAME: Prestashop 1.5.4.1
+VERSION: 1.5.4.1
 
 PREPARACI�N
 ===========
diff --git a/docs/readme_fr.txt b/docs/readme_fr.txt
index 859a5f4e7..64eae1dc2 100755
--- a/docs/readme_fr.txt
+++ b/docs/readme_fr.txt
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
 @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 International Registered Trademark & Property of PrestaShop SA
 
-NAME: Prestashop 1.5.4.0
-VERSION: 1.5.4.0
+NAME: Prestashop 1.5.4.1
+VERSION: 1.5.4.1
 
 PREPARATION
 ===========
diff --git a/docs/readme_it.txt b/docs/readme_it.txt
index c4c89116e..e07a67d29 100755
--- a/docs/readme_it.txt
+++ b/docs/readme_it.txt
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
 @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 International Registered Trademark & Property of PrestaShop SA
 
-NAME: Prestashop 1.5.4.0
-VERSION: 1.5.4.0
+NAME: Prestashop 1.5.4.1
+VERSION: 1.5.4.1
 
 PREPARAZIONE
 ===========
diff --git a/error500.html b/error500.html
new file mode 100644
index 000000000..d72dc2183
--- /dev/null
+++ b/error500.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="description" content="Boutique propuls&eacute;e par PrestaShop" />
+		<link rel="shortcut icon" href="/img/favicon.ico" />
+	</head>
+	<body>
+		<div id="maintenance" style="margin:0 auto;width:940px;font:normal 30px Arial, Verdana, sans-serif;color:#333;">
+			 <p><img src="/img/logo.jpg" width="209" height="52" alt="logo" /><br /><br /></p>
+			 <p id="message" style="margin:0 20px;padding:50px 310px 0 0;height:360px;background:url(/img/bg_500.png) no-repeat 100% 0 #fff">
+				Oops, something went wrong.<br /><br />
+				Try to refresh this page or feel free to contact us if the problem persists.
+			 </p>
+			 <span style="clear:both;">&nbsp;</span>
+		</div>
+	</body>
+</html>
diff --git a/img/bg_500.png b/img/bg_500.png
new file mode 100644
index 000000000..f95c88e1d
Binary files /dev/null and b/img/bg_500.png differ
diff --git a/install-dev/langs/br/data/tab.xml b/install-dev/langs/br/data/tab.xml
index 818f33034..27e2d2651 100644
--- a/install-dev/langs/br/data/tab.xml
+++ b/install-dev/langs/br/data/tab.xml
@@ -1,105 +1,105 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Home"/>
-  <tab id="CMS_Pages" name="CMS Pages"/>
-  <tab id="CMS_Categories" name="CMS Categories"/>
-  <tab id="Combinations_Generator" name="Combinations Generator"/>
-  <tab id="Search" name="Search"/>
-  <tab id="Login" name="Login"/>
-  <tab id="Shops" name="Shops"/>
-  <tab id="Shop_URLs" name="Shop URLs"/>
-  <tab id="Catalog" name="Cat&#xE1;logo"/>
-  <tab id="Orders" name="Pedidos"/>
-  <tab id="Customers" name="Clientes"/>
-  <tab id="Price_Rules" name="Regras para pre&#xE7;o"/>
-  <tab id="Shipping" name="Entrega"/>
-  <tab id="Localization" name="Localiza&#xE7;&#xE3;o"/>
-  <tab id="Modules" name="M&#xF3;dulos"/>
-  <tab id="Preferences" name="Prefer&#xEA;ncias"/>
-  <tab id="Advanced_Parameters" name="Par&#xE2;metros Avan&#xE7;ados"/>
+  <tab id="Addresses" name="Endere&#xE7;os"/>
   <tab id="Administration" name="Administra&#xE7;&#xE3;o"/>
-  <tab id="Stats" name="Estat&#xED;sticas"/>
-  <tab id="Stock" name="Estoque"/>
-  <tab id="Products" name="Products"/>
-  <tab id="Categories" name="Categories"/>
-  <tab id="Monitoring" name="Monitoring"/>
-  <tab id="Attributes_and_Values" name="Attributes and Values"/>
-  <tab id="Features" name="Features"/>
-  <tab id="Manufacturers" name="Manufacturers"/>
-  <tab id="Suppliers" name="Suppliers"/>
-  <tab id="Image_Mapping" name="Image Mapping"/>
-  <tab id="Tags" name="Tags"/>
-  <tab id="Attachments" name="Attachments"/>
-  <tab id="Orders_1" name="Orders"/>
-  <tab id="Invoices" name="Invoices"/>
-  <tab id="Merchandise_Returns" name="Merchandise Returns"/>
-  <tab id="Delivery_Slips" name="Delivery Slips"/>
-  <tab id="Credit_Slips" name="Credit Slips"/>
-  <tab id="Statuses" name="Statuses"/>
-  <tab id="Order_Messages" name="Order Messages"/>
-  <tab id="Customers_1" name="Customers"/>
-  <tab id="Addresses" name="Addresses"/>
-  <tab id="Groups" name="Groups"/>
-  <tab id="Shopping_Carts" name="Shopping Carts"/>
-  <tab id="Customer_Service" name="Customer Service"/>
-  <tab id="Contacts" name="Contacts"/>
-  <tab id="Titles" name="Titles"/>
-  <tab id="Outstanding" name="Outstanding"/>
-  <tab id="Cart_Rules" name="Cart Rules"/>
-  <tab id="Catalog_Price_Rules" name="Catalog Price Rules"/>
-  <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Shipping"/>
-  <tab id="Carriers" name="Carriers"/>
-  <tab id="Price_Ranges" name="Price Ranges"/>
-  <tab id="Weight_Ranges" name="Weight Ranges"/>
-  <tab id="Localization_1" name="Localization"/>
-  <tab id="Languages" name="Languages"/>
-  <tab id="Zones" name="Zones"/>
-  <tab id="Countries" name="Countries"/>
-  <tab id="States" name="States"/>
-  <tab id="Currencies" name="Currencies"/>
-  <tab id="Taxes" name="Taxes"/>
-  <tab id="Tax_Rules" name="Tax Rules"/>
-  <tab id="Translations" name="Translations"/>
-  <tab id="Modules_1" name="Modules"/>
-  <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
-  <tab id="Positions" name="Positions"/>
-  <tab id="Payment" name="Payment"/>
-  <tab id="General" name="General"/>
-  <tab id="Orders_2" name="Orders"/>
-  <tab id="Products_1" name="Products"/>
-  <tab id="Customers_2" name="Customers"/>
-  <tab id="Themes" name="Themes"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Advanced_Parameters" name="Par&#xE2;metros Avan&#xE7;ados"/>
+  <tab id="Attachments" name="Anexos"/>
+  <tab id="Attributes_and_Values" name="Atributos e Valores"/>
+  <tab id="Carriers" name="Transportadoras"/>
+  <tab id="Cart_Rules" name="Regras do Carrinho"/>
+  <tab id="Catalog" name="Cat&#xE1;logo"/>
+  <tab id="Catalog_Price_Rules" name="Regras de pre&#xE7;o do cat&#xE1;logo"/>
+  <tab id="Categories" name="Categorias"/>
   <tab id="CMS" name="CMS"/>
-  <tab id="Images" name="Images"/>
-  <tab id="Store_Contacts" name="Store Contacts"/>
-  <tab id="Search_1" name="Search"/>
-  <tab id="Maintenance" name="Maintenance"/>
-  <tab id="Geolocation" name="Geolocation"/>
-  <tab id="Configuration_Information" name="Configuration Information"/>
-  <tab id="Performance" name="Performance"/>
+  <tab id="CMS_Categories" name="Categorias CMS"/>
+  <tab id="CMS_Pages" name="P&#xE1;ginas CMS"/>
+  <tab id="Combinations_Generator" name="Gerador de Combina&#xE7;&#xF5;es"/>
+  <tab id="Configuration" name="Configura&#xE7;&#xE3;o"/>
+  <tab id="Configuration_Information" name="Informa&#xE7;&#xF5;es da Configura&#xE7;&#xE3;o"/>
+  <tab id="Contacts" name="Contatos"/>
+  <tab id="Countries" name="Pa&#xED;ses"/>
+  <tab id="Credit_Slips" name="Cr&#xE9;ditos"/>
+  <tab id="CSV_Import" name="Importar CSV"/>
+  <tab id="Currencies" name="Moedas"/>
+  <tab id="Customer_Service" name="Atendimento ao Cliente"/>
+  <tab id="Customers" name="Clientes"/>
+  <tab id="Customers_2" name="Clientes"/>
+  <tab id="Customers_1" name="Clientes"/>
+  <tab id="DB_Backup" name="Backup do Banco de Dados"/>
+  <tab id="Delivery_Slips" name="Recibos de Envio"/>
   <tab id="E-mail" name="E-mail"/>
-  <tab id="Multistore" name="Multistore"/>
-  <tab id="CSV_Import" name="CSV Import"/>
-  <tab id="DB_Backup" name="DB Backup"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Employees" name="Empregados"/>
+  <tab id="Features" name="Caracter&#xED;sticas"/>
+  <tab id="General" name="Geral"/>
+  <tab id="Geolocation" name="Geolocaliza&#xE7;&#xE3;o"/>
+  <tab id="Groups" name="Grupos"/>
+  <tab id="Home" name="In&#xED;cio"/>
+  <tab id="Image_Mapping" name="Mapeamento de Imagem"/>
+  <tab id="Images" name="Imagens"/>
+  <tab id="Instant_Stock_Status" name="Status atual do estoque"/>
+  <tab id="Invoices" name="Faturas"/>
+  <tab id="Languages" name="Idiomas"/>
+  <tab id="Localization" name="Localiza&#xE7;&#xE3;o"/>
+  <tab id="Localization_1" name="Localiza&#xE7;&#xE3;o"/>
+  <tab id="Login" name="Entrar"/>
   <tab id="Logs" name="Logs"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Preferences_1" name="Preferences"/>
-  <tab id="Quick_Access" name="Quick Access"/>
-  <tab id="Employees" name="Employees"/>
-  <tab id="Profiles" name="Profiles"/>
-  <tab id="Permissions" name="Permissions"/>
-  <tab id="Menus" name="Menus"/>
-  <tab id="Stats_1" name="Stats"/>
-  <tab id="Search_Engines" name="Search Engines"/>
-  <tab id="Referrers" name="Referrers"/>
-  <tab id="Warehouses" name="Warehouses"/>
-  <tab id="Stock_Management" name="Stock Management"/>
-  <tab id="Stock_Movement" name="Stock Movement"/>
-  <tab id="Instant_Stock_Status" name="Instant Stock Status"/>
-  <tab id="Stock_Coverage" name="Stock Coverage"/>
-  <tab id="Supply_orders" name="Supply orders"/>
-  <tab id="Configuration" name="Configuration"/>
+  <tab id="Maintenance" name="Manuten&#xE7;&#xE3;o"/>
+  <tab id="Manufacturers" name="Fabricantes"/>
+  <tab id="Marketing" name="Marketing"/>
+  <tab id="Menus" name="Abas"/>
+  <tab id="Merchandise_Returns" name="Devolu&#xE7;&#xE3;o de mercadoria"/>
+  <tab id="Modules_1" name="M&#xF3;dulos"/>
+  <tab id="Modules" name="M&#xF3;dulos"/>
+  <tab id="Modules_Themes_Catalog" name="Cat&#xE1;logo de M&#xF3;dulos &amp; Temas"/>
+  <tab id="Monitoring" name="Monitoramento"/>
+  <tab id="Multistore" name="Multiloja"/>
+  <tab id="Order_Messages" name="Mensagens de compras"/>
+  <tab id="Orders_2" name="Compras"/>
+  <tab id="Orders" name="Compras"/>
+  <tab id="Orders_1" name="Compras"/>
+  <tab id="Outstanding" name="Pendente"/>
+  <tab id="Payment" name="Pagamento"/>
+  <tab id="Performance" name="Desempenho"/>
+  <tab id="Permissions" name="Permiss&#xF5;es"/>
+  <tab id="Positions" name="Posi&#xE7;&#xF5;es"/>
+  <tab id="Preferences_1" name="Prefer&#xEA;ncias"/>
+  <tab id="Preferences" name="Prefer&#xEA;ncias"/>
+  <tab id="Price_Ranges" name="Faixas de pre&#xE7;os"/>
+  <tab id="Price_Rules" name="Regras de Pre&#xE7;os"/>
+  <tab id="Products_1" name="Produtos"/>
+  <tab id="Products" name="Produtos"/>
+  <tab id="Profiles" name="Perfis"/>
+  <tab id="Quick_Access" name="Acesso R&#xE1;pido"/>
+  <tab id="Referrers" name="Refer&#xEA;ncias"/>
+  <tab id="Search_1" name="Pesquisar"/>
+  <tab id="Search" name="Pesquisar"/>
+  <tab id="Search_Engines" name="Ferramentas de Pesquisa"/>
+  <tab id="SEO_URLs" name="SEO e URLs"/>
+  <tab id="Shipping" name="Envio"/>
+  <tab id="Shipping_1" name="Envio"/>
+  <tab id="Shop_URLs" name="URL da loja"/>
+  <tab id="Shopping_Carts" name="Carrinhos de Compras"/>
+  <tab id="Shops" name="Lojas"/>
+  <tab id="SQL_Manager" name="Gerenciador SQL"/>
+  <tab id="States" name="Estados"/>
+  <tab id="Stats" name="Estat&#xED;sticas"/>
+  <tab id="Stats_1" name="Estat&#xED;sticas"/>
+  <tab id="Statuses" name="Status"/>
+  <tab id="Stock" name="Estoque"/>
+  <tab id="Stock_Coverage" name="Cobertura do estoque"/>
+  <tab id="Stock_Management" name="Gest&#xE3;o de estoque"/>
+  <tab id="Stock_Movement" name="Movimenta&#xE7;&#xE3;o do estoque"/>
+  <tab id="Store_Contacts" name="Contatos da loja"/>
+  <tab id="Suppliers" name="Fornecedores"/>
+  <tab id="Supply_orders" name="Ordens de fornecimento"/>
+  <tab id="Tags" name="Etiquetas"/>
+  <tab id="Tax_Rules" name="Regras de impostos"/>
+  <tab id="Taxes" name="Taxas"/>
+  <tab id="Themes" name="Temas"/>
+  <tab id="Titles" name="T&#xED;tulos"/>
+  <tab id="Translations" name="Tradu&#xE7;&#xF5;es"/>
+  <tab id="Warehouses" name="Armaz&#xE9;ns"/>
+  <tab id="Webservice" name="Servi&#xE7;o Web"/>
+  <tab id="Weight_Ranges" name="Faixas de peso"/>
+  <tab id="Zones" name="Regi&#xF5;es"/>
 </entity_tab>
diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index 7fcacdf9b..104f2a514 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -200,7 +200,7 @@ return array(
 		'Your Account' => 'Sua informação pessoal',
 		'This email address will be your username to access your store\'s back office.' => 'Este endereço de email será seu nome de usuário para acessar a área administrativa da sua loja.',
 		'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'O PrestaShop pode oferecer orientações à você diariamente ao enviar dicas de como otimizar o gerenciamente da sua loja, o que vai lhe ajudar a crescer seu negócio. Se você não quer receber essas dicas, por favor desmarque este quadrinho.',
-		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Para usar o PrestaShop, você deve <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">criar um banco de dados</a> para coletar todas as informações relacionadas com as atividades de sua loja.',
+		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Para usar o PrestaShop, você deve <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">criar um banco de dados</a> para coletar todas as informações relacionadas com as atividades de sua loja.',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Por favor, complete os campos abaixo para que o PrestaShop possa conectar com seu database.',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'O port padrão é 3306. Para usar um port diferente, adicione o número do port no final do endereço do seu servidor por exemplo “:4242”.',
 		'Test your database connection now!' => 'Teste a conexão do seu banco de dados agora!',
@@ -232,7 +232,7 @@ return array(
 		'PDO MySQL extension is not loaded' => 'Extensão PDO MySQL não está carregada',
 		'Cannot copy flag language "%s"' => 'Não é possível copiar a bandeira do idioma "%s" ',
 		'Sign-up to the newsletter' => 'Inscreva-se para a newsletter',
-		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Se você está tendo problemas durante o processo de instalação, por favor ligue para o nosso time no %s e um de nossos especialistas lhe ajudará.',
+		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Se você está tendo problemas durante o processo de instalação, por favor ligue para o nosso time no %s e um de nossos especialistas lhe ajudará.',
 		'Contact us!' => 'Contate-nos!',
 		'E-mail:' => 'E-mail:',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop requer pelo menos 32M de memória para funcionar, por favor verifique memory_limit no php.ini ou contate seu provedor de hospedagem.',
diff --git a/install-dev/langs/de/data/tab.xml b/install-dev/langs/de/data/tab.xml
index bf69da7b9..fdda483e3 100644
--- a/install-dev/langs/de/data/tab.xml
+++ b/install-dev/langs/de/data/tab.xml
@@ -1,105 +1,105 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Home"/>
-  <tab id="CMS_Pages" name="CMS-Seiten"/>
-  <tab id="CMS_Categories" name="CMS-Kategorien"/>
-  <tab id="Combinations_Generator" name="Kombinationsgenerator"/>
-  <tab id="Search" name="Suche"/>
-  <tab id="Login" name="Anmeldung"/>
-  <tab id="Shops" name="Shops"/>
-  <tab id="Shop_URLs" name="Shop URLs"/>
-  <tab id="Catalog" name="Katalog"/>
-  <tab id="Orders" name="Bestellungen"/>
-  <tab id="Customers" name="Kunden"/>
-  <tab id="Price_Rules" name="Preisregeln"/>
-  <tab id="Shipping" name="Versand"/>
-  <tab id="Localization" name="Lokalisierung"/>
-  <tab id="Modules" name="Module"/>
-  <tab id="Preferences" name="Voreinstellungen"/>
-  <tab id="Advanced_Parameters" name="Erweiterte Parameter"/>
-  <tab id="Administration" name="Verwaltung"/>
-  <tab id="Stats" name="Statistiken"/>
-  <tab id="Stock" name="Lager"/>
-  <tab id="Products" name="Produkte"/>
-  <tab id="Categories" name="Kategorien"/>
-  <tab id="Monitoring" name="Kontroll&#xFC;bersicht"/>
-  <tab id="Attributes_and_Values" name="Attribute und Werte"/>
-  <tab id="Features" name="Produktmerkmale"/>
-  <tab id="Manufacturers" name="Hersteller"/>
-  <tab id="Suppliers" name="Zulieferer"/>
-  <tab id="Image_Mapping" name="Bild-Diagramme"/>
-  <tab id="Tags" name="Tags"/>
-  <tab id="Attachments" name="Anh&#xE4;nge"/>
-  <tab id="Orders_1" name="Bestellungen"/>
-  <tab id="Invoices" name="Rechnungen"/>
-  <tab id="Merchandise_Returns" name="Warenr&#xFC;cksendungen"/>
-  <tab id="Delivery_Slips" name="Lieferscheine"/>
-  <tab id="Credit_Slips" name="Gutschriften"/>
-  <tab id="Statuses" name="Status"/>
-  <tab id="Order_Messages" name="Bestellnachrichten"/>
-  <tab id="Customers_1" name="Kunden"/>
   <tab id="Addresses" name="Adressen"/>
-  <tab id="Groups" name="Gruppen"/>
-  <tab id="Shopping_Carts" name="Warenk&#xF6;rbe"/>
-  <tab id="Customer_Service" name="Kundenservice"/>
-  <tab id="Contacts" name="Kontakte"/>
-  <tab id="Titles" name="Geschlechter"/>
-  <tab id="Outstanding" name="Offene Forderungen"/>
-  <tab id="Cart_Rules" name="Warenkorb Preisregeln"/>
-  <tab id="Catalog_Price_Rules" name="Katalog Preisregeln"/>
-  <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Versand"/>
+  <tab id="Administration" name="Verwaltung"/>
+  <tab id="Advanced_Parameters" name="Erweiterte Einstellungen"/>
+  <tab id="Attachments" name="Anh&#xE4;nge"/>
+  <tab id="Attributes_and_Values" name="Attribute &amp; Gruppen"/>
   <tab id="Carriers" name="Versanddienste"/>
-  <tab id="Price_Ranges" name="Preisklassen"/>
-  <tab id="Weight_Ranges" name="Gewichtsklassen"/>
-  <tab id="Localization_1" name="Lokalisierung"/>
-  <tab id="Languages" name="Sprachen"/>
-  <tab id="Zones" name="Zonen"/>
-  <tab id="Countries" name="L&#xE4;nder"/>
-  <tab id="States" name="Staaten"/>
-  <tab id="Currencies" name="W&#xE4;hrungen"/>
-  <tab id="Taxes" name="Steuern"/>
-  <tab id="Tax_Rules" name="Steuerregeln"/>
-  <tab id="Translations" name="&#xDC;bersetzungen"/>
-  <tab id="Modules_1" name="Module"/>
-  <tab id="Modules_Themes_Catalog" name="Module &amp; Themenkatalog"/>
-  <tab id="Positions" name="Postionen"/>
-  <tab id="Payment" name="Zahlung"/>
-  <tab id="General" name="Allgemein"/>
-  <tab id="Orders_2" name="Bestellungen"/>
-  <tab id="Products_1" name="Produkte"/>
-  <tab id="Customers_2" name="Kunden"/>
-  <tab id="Themes" name="Themen"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Cart_Rules" name="Warenkorb Preisregeln"/>
+  <tab id="Catalog" name="Katalog"/>
+  <tab id="Catalog_Price_Rules" name="Katalog Preisregeln"/>
+  <tab id="Categories" name="Kategorien"/>
   <tab id="CMS" name="CMS"/>
-  <tab id="Images" name="Bilder"/>
-  <tab id="Store_Contacts" name="Shopadressen"/>
-  <tab id="Search_1" name="Suche"/>
-  <tab id="Maintenance" name="Wartung"/>
-  <tab id="Geolocation" name="Geotargeting"/>
-  <tab id="Configuration_Information" name="Konfigurationsinformationen"/>
-  <tab id="Performance" name="Leistung"/>
-  <tab id="E-mail" name="E-Mail"/>
-  <tab id="Multistore" name="Shopgruppe"/>
-  <tab id="CSV_Import" name="CSV Import"/>
+  <tab id="CMS_Categories" name="CMS-Kategorien"/>
+  <tab id="CMS_Pages" name="CMS-Seiten"/>
+  <tab id="Combinations_Generator" name="Kombinationsgenerator"/>
+  <tab id="Configuration" name="Konfiguration"/>
+  <tab id="Configuration_Information" name="Konfiguration"/>
+  <tab id="Contacts" name="Kontakte"/>
+  <tab id="Countries" name="L&#xE4;nder"/>
+  <tab id="Credit_Slips" name="Gutschriften"/>
+  <tab id="CSV_Import" name="CSV-Import"/>
+  <tab id="Currencies" name="W&#xE4;hrungen"/>
+  <tab id="Customer_Service" name="Kundenservice"/>
+  <tab id="Customers" name="Kunden"/>
+  <tab id="Customers_2" name="Kunden"/>
+  <tab id="Customers_1" name="Kunden"/>
   <tab id="DB_Backup" name="DB-Sicherung"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Logs" name="Log"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Preferences_1" name="Voreinstellungen"/>
-  <tab id="Quick_Access" name="Schnellzugriff"/>
+  <tab id="Delivery_Slips" name="Lieferscheine"/>
+  <tab id="E-mail" name="E-Mail"/>
   <tab id="Employees" name="Mitarbeiter"/>
-  <tab id="Profiles" name="Profile"/>
+  <tab id="Features" name="Produktmerkmale"/>
+  <tab id="General" name="Allgemein"/>
+  <tab id="Geolocation" name="Geotargeting"/>
+  <tab id="Groups" name="Gruppen"/>
+  <tab id="Home" name="Startseite"/>
+  <tab id="Image_Mapping" name="Bilder-Mapping"/>
+  <tab id="Images" name="Bilder"/>
+  <tab id="Instant_Stock_Status" name="aktueller Lagerstand"/>
+  <tab id="Invoices" name="Rechnungen"/>
+  <tab id="Languages" name="Sprachen"/>
+  <tab id="Localization" name="Lokalisierung"/>
+  <tab id="Localization_1" name="Lokalisierung"/>
+  <tab id="Login" name="Anmeldung"/>
+  <tab id="Logs" name="Log-Dateien"/>
+  <tab id="Maintenance" name="Wartung"/>
+  <tab id="Manufacturers" name="Hersteller"/>
+  <tab id="Marketing" name="Marketing"/>
+  <tab id="Menus" name="Men&#xFC;punkte"/>
+  <tab id="Merchandise_Returns" name="Warenr&#xFC;cksendungen"/>
+  <tab id="Modules_1" name="Module"/>
+  <tab id="Modules" name="Module"/>
+  <tab id="Modules_Themes_Catalog" name="Module &amp; Templates"/>
+  <tab id="Monitoring" name="Kontroll&#xFC;bersicht"/>
+  <tab id="Multistore" name="Multishop"/>
+  <tab id="Order_Messages" name="Bestellnachrichten"/>
+  <tab id="Orders_2" name="Bestellungen"/>
+  <tab id="Orders" name="Bestellungen"/>
+  <tab id="Orders_1" name="Bestellungen"/>
+  <tab id="Outstanding" name="Offene Forderungen"/>
+  <tab id="Payment" name="Zahlung"/>
+  <tab id="Performance" name="Leistung"/>
   <tab id="Permissions" name="Berechtigungen"/>
-  <tab id="Menus" name="Tabs"/>
-  <tab id="Stats_1" name="Statistiken"/>
-  <tab id="Search_Engines" name="Suchmaschinen"/>
+  <tab id="Positions" name="Positionen"/>
+  <tab id="Preferences_1" name="Voreinstellungen"/>
+  <tab id="Preferences" name="Voreinstellungen"/>
+  <tab id="Price_Ranges" name="Preisspannen"/>
+  <tab id="Price_Rules" name="Preisregeln"/>
+  <tab id="Products_1" name="Produkte"/>
+  <tab id="Products" name="Produkte"/>
+  <tab id="Profiles" name="Profile"/>
+  <tab id="Quick_Access" name="Schnellzugriff"/>
   <tab id="Referrers" name="Referrer"/>
-  <tab id="Warehouses" name="Lagerh&#xE4;user"/>
+  <tab id="Search_1" name="Suche"/>
+  <tab id="Search" name="Suche"/>
+  <tab id="Search_Engines" name="Suchmaschinen"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Shipping" name="Versand"/>
+  <tab id="Shipping_1" name="Versand"/>
+  <tab id="Shop_URLs" name="Shop-URLs"/>
+  <tab id="Shopping_Carts" name="Warenk&#xF6;rbe"/>
+  <tab id="Shops" name="Shops"/>
+  <tab id="SQL_Manager" name="SQL-Manager"/>
+  <tab id="States" name="Bundesl&#xE4;nder"/>
+  <tab id="Stats" name="Statistiken"/>
+  <tab id="Stats_1" name="Statistiken"/>
+  <tab id="Statuses" name="Status"/>
+  <tab id="Stock" name="Lager"/>
+  <tab id="Stock_Coverage" name="Bestandsdeckung"/>
   <tab id="Stock_Management" name="Lagerverwaltung"/>
   <tab id="Stock_Movement" name="Lagerbewegung"/>
-  <tab id="Instant_Stock_Status" name="Aktuelle Bestandsinformation"/>
-  <tab id="Stock_Coverage" name="Berechnete Bestandsinformation"/>
-  <tab id="Supply_orders" name="Zulieferer-Bestellungen"/>
-  <tab id="Configuration" name="Konfiguration"/>
+  <tab id="Store_Contacts" name="Shopadressen"/>
+  <tab id="Suppliers" name="Lieferanten"/>
+  <tab id="Supply_orders" name="Lieferauftr&#xE4;ge"/>
+  <tab id="Tags" name="Tags"/>
+  <tab id="Tax_Rules" name="Steuerregeln"/>
+  <tab id="Taxes" name="Steuers&#xE4;tze"/>
+  <tab id="Themes" name="Templates &amp; Vorlagen"/>
+  <tab id="Titles" name="Anreden"/>
+  <tab id="Translations" name="&#xDC;bersetzungen"/>
+  <tab id="Warehouses" name="Lagerort"/>
+  <tab id="Webservice" name="Webdienste"/>
+  <tab id="Weight_Ranges" name="Gewichtsspannen"/>
+  <tab id="Zones" name="Zonen"/>
 </entity_tab>
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index 12d9451a5..fedcb2247 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -193,7 +193,7 @@ return array(
 		'Your Account' => 'Ihre persönlichen Informationen',
 		'This email address will be your username to access your store\'s back office.' => 'Bitte bedenken Sie, dass diese E-Mail-Adresse Ihre Identifizierung ist, um ins Verwaltungsinterface Ihres Shops zu gelangen.',
 		'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop kann Sie regelmäßig anleiten und Ihnen Tipps für die Shopverwaltung und Aktivitätsentwicklung geben. Wenn Sie keine Tipps wünschen, dann entfernen Sie bitte den Haken in diesem Kästchen.',
-		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Um PrestaShop zu nutzen, <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">müssen Sie eine Datenbank erstellen,</a> auf der alle Daten zur Aktivität Ihres Shops gespeichert werden können.',
+		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Um PrestaShop zu nutzen, <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">müssen Sie eine Datenbank erstellen,</a> auf der alle Daten zur Aktivität Ihres Shops gespeichert werden können.',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Wenn Sie einen anderen Port als den Standardport (3306) nutzen möchten, fügen Sie zu Ihrer Serveradresse die Nummer xx Ihres Ports hinzu.',
 		'Test your database connection now!' => 'Testen Sie die Verbindung mit Ihrer Datenbank',
 		'PrestaShop Installation Assistant' => 'Installationsassistent',
@@ -227,7 +227,7 @@ return array(
 		'Must be alphanumeric string with at least 8 characters' => 'Sie müssen eine alphanumerische Folge aus mindestens 8 Zeichen eingegeben',
 		'Sign-up to the newsletter' => 'Für den Newsletter anmelden',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Bitte füllen Sie die untenstehenden Felder aus, damit PrestaShop sich mit Ihrer Datenbank verbinden kann.',
-		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Wenn während des Installationsprozesses technische Schwierigkeiten auftreten, kontaktieren Sie bitte unser Team unter %s. Ein Experte ist Ihnen gerne behilflich!',
+		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Wenn während des Installationsprozesses technische Schwierigkeiten auftreten, kontaktieren Sie bitte unser Team unter %s. Ein Experte ist Ihnen gerne behilflich!',
 		'E-mail:' => 'E-Mail:',
 		'Display' => 'Anzeige',
 		'PrestaShop compatibility with your system environment has been verified!' => 'Die Kompatibilität von PrestaShop mit Ihrem System wurde überprüft!',
diff --git a/install-dev/langs/es/data/tab.xml b/install-dev/langs/es/data/tab.xml
index f5c82f32d..0d83e4f2a 100644
--- a/install-dev/langs/es/data/tab.xml
+++ b/install-dev/langs/es/data/tab.xml
@@ -1,105 +1,105 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Inicio"/>
-  <tab id="CMS_Pages" name="P&#xE1;ginas CMS"/>
-  <tab id="CMS_Categories" name="Categor&#xED;as CMS"/>
-  <tab id="Combinations_Generator" name="Generador de combinaciones"/>
-  <tab id="Search" name="B&#xFA;squeda"/>
-  <tab id="Login" name="Login"/>
-  <tab id="Shops" name="Tiendas"/>
-  <tab id="Shop_URLs" name="URL de las tiendas"/>
-  <tab id="Catalog" name="Cat&#xE1;logo"/>
-  <tab id="Orders" name="Pedidos"/>
-  <tab id="Customers" name="Clientes"/>
-  <tab id="Price_Rules" name="Reglas de precios"/>
-  <tab id="Shipping" name="Env&#xED;o"/>
-  <tab id="Localization" name="Localizaci&#xF3;n"/>
-  <tab id="Modules" name="M&#xF3;dulos"/>
-  <tab id="Preferences" name="Preferencias"/>
-  <tab id="Advanced_Parameters" name="Parametros avanzados"/>
-  <tab id="Administration" name="Administraci&#xF3;n"/>
-  <tab id="Stats" name="Estad&#xED;sticas"/>
-  <tab id="Stock" name="Existencias"/>
-  <tab id="Products" name="Productos"/>
-  <tab id="Categories" name="Categor&#xED;as"/>
-  <tab id="Monitoring" name="Monitoreo"/>
-  <tab id="Attributes_and_Values" name="Atributos y Valores"/>
-  <tab id="Features" name="Caracter&#xED;sticas"/>
-  <tab id="Manufacturers" name="Fabricantes"/>
-  <tab id="Suppliers" name="Distribuidores"/>
-  <tab id="Image_Mapping" name="Mapeo de im&#xE1;genes"/>
-  <tab id="Tags" name="Etiquetas"/>
-  <tab id="Attachments" name="Adjuntos"/>
-  <tab id="Orders_1" name="Pedidos"/>
-  <tab id="Invoices" name="Facturas"/>
-  <tab id="Merchandise_Returns" name="Retorno de mercanc&#xED;a"/>
-  <tab id="Delivery_Slips" name="Comprobantes de entrega"/>
-  <tab id="Credit_Slips" name="Creditos"/>
-  <tab id="Statuses" name="Estados"/>
-  <tab id="Order_Messages" name="Mensajes de pedidos"/>
-  <tab id="Customers_1" name="Clientes"/>
   <tab id="Addresses" name="Direcciones"/>
-  <tab id="Groups" name="Grupos"/>
-  <tab id="Shopping_Carts" name="Carro de compras"/>
-  <tab id="Customer_Service" name="Atenci&#xF3;n al cliente"/>
-  <tab id="Contacts" name="Contacto"/>
-  <tab id="Titles" name="Generos"/>
-  <tab id="Outstanding" name="No resuelto"/>
-  <tab id="Cart_Rules" name="Reglas de cesta"/>
-  <tab id="Catalog_Price_Rules" name="Reglas de precio del cat&#xE1;logo"/>
-  <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Env&#xED;o"/>
+  <tab id="Administration" name="Administraci&#xF3;n"/>
+  <tab id="Advanced_Parameters" name="Par&#xE1;metros Avanzados"/>
+  <tab id="Attachments" name="Adjuntos"/>
+  <tab id="Attributes_and_Values" name="Atributos y Valores"/>
   <tab id="Carriers" name="Transportistas"/>
-  <tab id="Price_Ranges" name="Rangos de precio"/>
-  <tab id="Weight_Ranges" name="Rangos de peso"/>
-  <tab id="Localization_1" name="Localizaci&#xF3;n"/>
-  <tab id="Languages" name="Idiomas"/>
-  <tab id="Zones" name="Zonas"/>
-  <tab id="Countries" name="Pa&#xED;ses"/>
-  <tab id="States" name="Estados"/>
-  <tab id="Currencies" name="Monedas"/>
-  <tab id="Taxes" name="Impuestos"/>
-  <tab id="Tax_Rules" name="Reglas de impuestos"/>
-  <tab id="Translations" name="Traducciones"/>
-  <tab id="Modules_1" name="M&#xF3;dulos"/>
-  <tab id="Modules_Themes_Catalog" name="Cat&#xE1;logo de modulos y temas"/>
-  <tab id="Positions" name="Posiciones"/>
-  <tab id="Payment" name="Pago"/>
-  <tab id="General" name="General"/>
-  <tab id="Orders_2" name="Pedidos"/>
-  <tab id="Products_1" name="Productos"/>
-  <tab id="Customers_2" name="Clientes"/>
-  <tab id="Themes" name="Temas"/>
-  <tab id="SEO_URLs" name="SEO y URL"/>
+  <tab id="Cart_Rules" name="Reglas de compra"/>
+  <tab id="Catalog" name="catalogo"/>
+  <tab id="Catalog_Price_Rules" name="Reglas de precio del cat&#xE1;logo"/>
+  <tab id="Categories" name="Categor&#xED;as"/>
   <tab id="CMS" name="CMS"/>
-  <tab id="Images" name="Im&#xE1;genes"/>
-  <tab id="Store_Contacts" name="Contacto y tiendas"/>
-  <tab id="Search_1" name="B&#xFA;squeda"/>
-  <tab id="Maintenance" name="Mantenimiento"/>
-  <tab id="Geolocation" name="Geolocalizaci&#xF3;n"/>
-  <tab id="Configuration_Information" name="Informaci&#xF3;n de configuraci&#xF3;n"/>
-  <tab id="Performance" name="Rendimiento"/>
-  <tab id="E-mail" name="E-mail"/>
-  <tab id="Multistore" name="Multi-tienda"/>
-  <tab id="CSV_Import" name="Importar CVS"/>
-  <tab id="DB_Backup" name="Backup de BD"/>
-  <tab id="SQL_Manager" name="Administrador SQL"/>
-  <tab id="Logs" name="Registros"/>
-  <tab id="Webservice" name="Servicio web"/>
-  <tab id="Preferences_1" name="Preferencias"/>
-  <tab id="Quick_Access" name="Acceso r&#xE1;pido"/>
-  <tab id="Employees" name="Empleados"/>
-  <tab id="Profiles" name="Perfiles"/>
-  <tab id="Permissions" name="Permisos"/>
-  <tab id="Menus" name="Pesta&#xF1;as"/>
-  <tab id="Stats_1" name="Estad&#xED;sticas"/>
-  <tab id="Search_Engines" name="Motores de b&#xFA;squeda"/>
-  <tab id="Referrers" name="Referidos"/>
-  <tab id="Warehouses" name="Almacenes"/>
-  <tab id="Stock_Management" name="Administraci&#xF3;n de existencias"/>
-  <tab id="Stock_Movement" name="Movimiento de existencias"/>
-  <tab id="Instant_Stock_Status" name="Estado instantaneo de existencia"/>
-  <tab id="Stock_Coverage" name="Portada de existencias"/>
-  <tab id="Supply_orders" name="Pedidos de distribuidores"/>
+  <tab id="CMS_Categories" name="categor&#xED;as CMS"/>
+  <tab id="CMS_Pages" name="Paginas CMS"/>
+  <tab id="Combinations_Generator" name="Generador de Combinaciones"/>
   <tab id="Configuration" name="Configuraci&#xF3;n"/>
+  <tab id="Configuration_Information" name="Informaci&#xF3;n"/>
+  <tab id="Contacts" name="Contacto"/>
+  <tab id="Countries" name="Pa&#xED;ses"/>
+  <tab id="Credit_Slips" name="Vales"/>
+  <tab id="CSV_Import" name="Importes de CSV"/>
+  <tab id="Currencies" name="Monedas"/>
+  <tab id="Customer_Service" name="Servicio clientela"/>
+  <tab id="Customers" name="clientes"/>
+  <tab id="Customers_2" name="clientes"/>
+  <tab id="Customers_1" name="clientes"/>
+  <tab id="DB_Backup" name="Copia de seguridad DB"/>
+  <tab id="Delivery_Slips" name="Bonos de entrega"/>
+  <tab id="E-mail" name="Correo electr&#xF3;nico"/>
+  <tab id="Employees" name="Empleados"/>
+  <tab id="Features" name="Caracter&#xED;sticas"/>
+  <tab id="General" name="General"/>
+  <tab id="Geolocation" name="Localizaci&#xF3;n"/>
+  <tab id="Groups" name="Grupos"/>
+  <tab id="Home" name="Inicio"/>
+  <tab id="Image_Mapping" name="Cartograf&#xED;a de im&#xE1;genes"/>
+  <tab id="Images" name="Im&#xE1;genes"/>
+  <tab id="Instant_Stock_Status" name="Estado de existencias instantes"/>
+  <tab id="Invoices" name="facturas"/>
+  <tab id="Languages" name="Idiomas"/>
+  <tab id="Localization" name="Localizaci&#xF3;n"/>
+  <tab id="Localization_1" name="Localizaci&#xF3;n"/>
+  <tab id="Login" name="Login :"/>
+  <tab id="Logs" name="Registros"/>
+  <tab id="Maintenance" name="Mantenimiento"/>
+  <tab id="Manufacturers" name="Fabricantes"/>
+  <tab id="Marketing" name="Marketing"/>
+  <tab id="Menus" name="Men&#xFA;s"/>
+  <tab id="Merchandise_Returns" name="Devoluciones de mercanc&#xED;a"/>
+  <tab id="Modules_1" name="m&#xF3;dulos"/>
+  <tab id="Modules" name="m&#xF3;dulos"/>
+  <tab id="Modules_Themes_Catalog" name="Catalogo de M&#xF3;dulos y Temas"/>
+  <tab id="Monitoring" name="Monitorizaci&#xF3;n"/>
+  <tab id="Multistore" name="Tiendas M&#xFA;ltiples"/>
+  <tab id="Order_Messages" name="Orden de los mensajes"/>
+  <tab id="Orders_2" name="pedidos"/>
+  <tab id="Orders" name="pedidos"/>
+  <tab id="Orders_1" name="pedidos"/>
+  <tab id="Outstanding" name="Inacabado (?)"/>
+  <tab id="Payment" name="Modo de pago"/>
+  <tab id="Performance" name="Rendimiento"/>
+  <tab id="Permissions" name="Permisos"/>
+  <tab id="Positions" name="Posiciones"/>
+  <tab id="Preferences_1" name="Preferencias"/>
+  <tab id="Preferences" name="Preferencias"/>
+  <tab id="Price_Ranges" name="Rangos de precio"/>
+  <tab id="Price_Rules" name="Precio de las normas"/>
+  <tab id="Products_1" name="Productos"/>
+  <tab id="Products" name="Productos"/>
+  <tab id="Profiles" name="Perfiles"/>
+  <tab id="Quick_Access" name="Acceso r&#xE1;pido"/>
+  <tab id="Referrers" name="Afiliados"/>
+  <tab id="Search_1" name="Buscar"/>
+  <tab id="Search" name="Buscar"/>
+  <tab id="Search_Engines" name="Buscador"/>
+  <tab id="SEO_URLs" name="SEO y URLs"/>
+  <tab id="Shipping" name="transporte"/>
+  <tab id="Shipping_1" name="transporte"/>
+  <tab id="Shop_URLs" name="URL cortos"/>
+  <tab id="Shopping_Carts" name="Cestas"/>
+  <tab id="Shops" name="Tiendas"/>
+  <tab id="SQL_Manager" name="Gerente SQL"/>
+  <tab id="States" name="Estado:"/>
+  <tab id="Stats" name="Estad&#xED;sticas"/>
+  <tab id="Stats_1" name="Estad&#xED;sticas"/>
+  <tab id="Statuses" name="Estados"/>
+  <tab id="Stock" name="Existencias"/>
+  <tab id="Stock_Coverage" name="Cobertura de las existencias"/>
+  <tab id="Stock_Management" name="Gesti&#xF3;n de existencias"/>
+  <tab id="Stock_Movement" name="Movimiento del stock:"/>
+  <tab id="Store_Contacts" name="Contactos de la tienda"/>
+  <tab id="Suppliers" name="Proveedores:"/>
+  <tab id="Supply_orders" name="Ordenes de proveedores"/>
+  <tab id="Tags" name="Etiquetas:"/>
+  <tab id="Tax_Rules" name="Reglas"/>
+  <tab id="Taxes" name="Impuestos"/>
+  <tab id="Themes" name="Temas"/>
+  <tab id="Titles" name="T&#xED;tulos"/>
+  <tab id="Translations" name="Traducciones"/>
+  <tab id="Warehouses" name="Almacenes"/>
+  <tab id="Webservice" name="Servicio Web"/>
+  <tab id="Weight_Ranges" name="Rangos de peso"/>
+  <tab id="Zones" name="Zonas"/>
 </entity_tab>
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index 128022863..e9fb6d41c 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -193,7 +193,7 @@ return array(
 		'Your Account' => 'Tu cuenta',
 		'This email address will be your username to access your store\'s back office.' => 'Esta dirección de correo electrónico corresponderá a tu usuario en el acceso al interfaz de administración de tu tienda Online.',
 		'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop te puede proporcionar orientación con el envío de consejos sobre cómo optimizar y gestionar tu tienda, que te ayudarán a tener éxito en tu negocio. Si no deseas recibir estos consejos, por favor desmarca esta casilla.',
-		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Para utilizar PrestaShop, debes <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">crear una base de datos </a> para poder recoger todos los datos relacionados con tu actividad.',
+		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Para utilizar PrestaShop, debes <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">crear una base de datos </a> para poder recoger todos los datos relacionados con tu actividad.',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Por favor, rellena estos datos con el fin de que PrestaShop pueda conectarse a tu base de datos.',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'El puerto utilizado por defecto es el 3306. Si utilizas un puerto diferente, añade este número de puerto al final de la dirección del servidor con dos puntos, por ejemplo ":4242".',
 		'Test your database connection now!' => '¡Comprueba la conexión de tu base de datos ahora!',
@@ -227,7 +227,7 @@ return array(
 		'Cannot copy flag language "%s"' => 'No se pueden copiar las banderas de los idiomas "%s"',
 		'Must be alphanumeric string with at least 8 characters' => 'Debe ser una cadena alfanumérica de al menos 8 caracteres',
 		'Sign-up to the newsletter' => 'Suscríbete al boletín de noticias',
-		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Si experimenta problemas durante la instalación, por favor llámenos al %s y uno de nuestros expertos estará encantado de ayudarte.',
+		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Si experimenta problemas durante la instalación, por favor llámenos al %s y uno de nuestros expertos estará encantado de ayudarte.',
 		'E-mail:' => 'Correo electrónico:',
 		'Display' => 'Mostrar',
 		'PrestaShop compatibility with your system environment has been verified!' => '¡La compatibilidad de PrestaShop con su entorno del sistema ha sido verificada correctamente!',
diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml
index 67dc7b59d..0da00ee0b 100644
--- a/install-dev/langs/fr/data/tab.xml
+++ b/install-dev/langs/fr/data/tab.xml
@@ -1,105 +1,105 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Accueil"/>
-  <tab id="CMS_Pages" name="Pages CMS"/>
-  <tab id="CMS_Categories" name="Cat&#xE9;gories CMS"/>
-  <tab id="Combinations_Generator" name="G&#xE9;n&#xE9;rateur de d&#xE9;clinaisons"/>
-  <tab id="Search" name="Recherche"/>
-  <tab id="Login" name="Connexion"/>
-  <tab id="Shops" name="Boutiques"/>
-  <tab id="Shop_URLs" name="URLs de boutique"/>
-  <tab id="Catalog" name="Catalogue"/>
-  <tab id="Orders" name="Commandes"/>
-  <tab id="Customers" name="Clients"/>
-  <tab id="Price_Rules" name="Promotions"/>
-  <tab id="Shipping" name="Transport"/>
-  <tab id="Localization" name="Localisation"/>
-  <tab id="Modules" name="Modules"/>
-  <tab id="Preferences" name="Pr&#xE9;f&#xE9;rences"/>
-  <tab id="Advanced_Parameters" name="Param&#xE8;tres avanc&#xE9;s"/>
-  <tab id="Administration" name="Administration"/>
-  <tab id="Stats" name="Stats"/>
-  <tab id="Stock" name="Stock"/>
-  <tab id="Products" name="Produits"/>
-  <tab id="Categories" name="Cat&#xE9;gories"/>
-  <tab id="Monitoring" name="Suivi"/>
-  <tab id="Attributes_and_Values" name="Attributs et Valeurs"/>
-  <tab id="Features" name="Caract&#xE9;ristiques"/>
-  <tab id="Manufacturers" name="Marques"/>
-  <tab id="Suppliers" name="Fournisseurs"/>
-  <tab id="Image_Mapping" name="Sc&#xE8;nes"/>
-  <tab id="Tags" name="Tags"/>
-  <tab id="Attachments" name="Documents joints"/>
-  <tab id="Orders_1" name="Commandes"/>
-  <tab id="Invoices" name="Factures"/>
-  <tab id="Merchandise_Returns" name="Retours produits"/>
-  <tab id="Delivery_Slips" name="Bons de livraison"/>
-  <tab id="Credit_Slips" name="Avoirs"/>
-  <tab id="Statuses" name="Statuts"/>
-  <tab id="Order_Messages" name="Messages pr&#xE9;d&#xE9;finis"/>
-  <tab id="Customers_1" name="Clients"/>
   <tab id="Addresses" name="Adresses"/>
-  <tab id="Groups" name="Groupes"/>
-  <tab id="Shopping_Carts" name="Paniers"/>
-  <tab id="Customer_Service" name="SAV"/>
-  <tab id="Contacts" name="Contacts"/>
-  <tab id="Titles" name="Titres de civilit&#xE9;"/>
-  <tab id="Outstanding" name="Encours"/>
-  <tab id="Cart_Rules" name="R&#xE8;gles paniers"/>
-  <tab id="Catalog_Price_Rules" name="R&#xE8;gles de prix catalogue"/>
-  <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Transport"/>
+  <tab id="Administration" name="Administration"/>
+  <tab id="Advanced_Parameters" name="Param&#xE8;tres avanc&#xE9;s"/>
+  <tab id="Attachments" name="Documents joints"/>
+  <tab id="Attributes_and_Values" name="Attributs et Valeurs"/>
   <tab id="Carriers" name="Transporteurs"/>
-  <tab id="Price_Ranges" name="Tranches de prix"/>
-  <tab id="Weight_Ranges" name="Tranches de poids"/>
-  <tab id="Localization_1" name="Localisation"/>
-  <tab id="Languages" name="Langues"/>
-  <tab id="Zones" name="Zones"/>
-  <tab id="Countries" name="Pays"/>
-  <tab id="States" name="Etats"/>
-  <tab id="Currencies" name="Devises"/>
-  <tab id="Taxes" name="Taxes"/>
-  <tab id="Tax_Rules" name="R&#xE8;gles de taxes"/>
-  <tab id="Translations" name="Traductions"/>
-  <tab id="Modules_1" name="Modules"/>
-  <tab id="Modules_Themes_Catalog" name="Catalogue de modules et th&#xE8;mes"/>
-  <tab id="Positions" name="Positions"/>
-  <tab id="Payment" name="Paiement"/>
-  <tab id="General" name="G&#xE9;n&#xE9;rales"/>
-  <tab id="Orders_2" name="Commandes"/>
-  <tab id="Products_1" name="Produits"/>
-  <tab id="Customers_2" name="Clients"/>
-  <tab id="Themes" name="Th&#xE8;mes"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Cart_Rules" name="R&#xE8;gles paniers"/>
+  <tab id="Catalog" name="Catalogue"/>
+  <tab id="Catalog_Price_Rules" name="R&#xE8;gles de prix catalogue"/>
+  <tab id="Categories" name="Cat&#xE9;gories"/>
   <tab id="CMS" name="CMS"/>
-  <tab id="Images" name="Images"/>
-  <tab id="Store_Contacts" name="Coordonn&#xE9;es &amp; magasins"/>
-  <tab id="Search_1" name="Recherche"/>
-  <tab id="Maintenance" name="Maintenance"/>
-  <tab id="Geolocation" name="G&#xE9;olocalisation"/>
+  <tab id="CMS_Categories" name="Cat&#xE9;gories CMS"/>
+  <tab id="CMS_Pages" name="Pages CMS"/>
+  <tab id="Combinations_Generator" name="G&#xE9;n&#xE9;rateur de d&#xE9;clinaisons"/>
+  <tab id="Configuration" name="Configuration"/>
   <tab id="Configuration_Information" name="Informations"/>
-  <tab id="Performance" name="Performances"/>
-  <tab id="E-mail" name="Emails"/>
-  <tab id="Multistore" name="Multiboutique"/>
+  <tab id="Contacts" name="Contacts"/>
+  <tab id="Countries" name="Pays"/>
+  <tab id="Credit_Slips" name="Avoirs"/>
   <tab id="CSV_Import" name="Import"/>
+  <tab id="Currencies" name="Devises"/>
+  <tab id="Customer_Service" name="SAV"/>
+  <tab id="Customers" name="Clients"/>
+  <tab id="Customers_2" name="Clients"/>
+  <tab id="Customers_1" name="Clients"/>
   <tab id="DB_Backup" name="Sauvegarde BDD"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Logs" name="Log"/>
-  <tab id="Webservice" name="Service web"/>
-  <tab id="Preferences_1" name="Pr&#xE9;f&#xE9;rences"/>
-  <tab id="Quick_Access" name="Acc&#xE8;s rapide"/>
+  <tab id="Delivery_Slips" name="Bons de livraison"/>
+  <tab id="E-mail" name="Emails"/>
   <tab id="Employees" name="Employ&#xE9;s"/>
-  <tab id="Profiles" name="Profils"/>
-  <tab id="Permissions" name="Permissions"/>
+  <tab id="Features" name="Caract&#xE9;ristiques"/>
+  <tab id="General" name="G&#xE9;n&#xE9;rales"/>
+  <tab id="Geolocation" name="G&#xE9;olocalisation"/>
+  <tab id="Groups" name="Groupes"/>
+  <tab id="Home" name="Accueil"/>
+  <tab id="Image_Mapping" name="Sc&#xE8;nes"/>
+  <tab id="Images" name="Images"/>
+  <tab id="Instant_Stock_Status" name="Etat instantan&#xE9; du stock"/>
+  <tab id="Invoices" name="Factures"/>
+  <tab id="Languages" name="Langues"/>
+  <tab id="Localization" name="Localisation"/>
+  <tab id="Localization_1" name="Localisation"/>
+  <tab id="Login" name="Connexion"/>
+  <tab id="Logs" name="Log"/>
+  <tab id="Maintenance" name="Maintenance"/>
+  <tab id="Manufacturers" name="Marques"/>
+  <tab id="Marketing" name="Marketing"/>
   <tab id="Menus" name="Menus"/>
-  <tab id="Stats_1" name="Stats"/>
-  <tab id="Search_Engines" name="Moteurs de recherche"/>
+  <tab id="Merchandise_Returns" name="Retours produits"/>
+  <tab id="Modules_1" name="Modules"/>
+  <tab id="Modules" name="Modules"/>
+  <tab id="Modules_Themes_Catalog" name="Catalogue de modules et th&#xE8;mes"/>
+  <tab id="Monitoring" name="Suivi"/>
+  <tab id="Multistore" name="Multiboutique"/>
+  <tab id="Order_Messages" name="Messages pr&#xE9;d&#xE9;finis"/>
+  <tab id="Orders_2" name="Commandes"/>
+  <tab id="Orders" name="Commandes"/>
+  <tab id="Orders_1" name="Commandes"/>
+  <tab id="Outstanding" name="Encours"/>
+  <tab id="Payment" name="Paiement"/>
+  <tab id="Performance" name="Performances"/>
+  <tab id="Permissions" name="Permissions"/>
+  <tab id="Positions" name="Positions"/>
+  <tab id="Preferences_1" name="Pr&#xE9;f&#xE9;rences"/>
+  <tab id="Preferences" name="Pr&#xE9;f&#xE9;rences"/>
+  <tab id="Price_Ranges" name="Tranches de prix"/>
+  <tab id="Price_Rules" name="Promotions"/>
+  <tab id="Products_1" name="Produits"/>
+  <tab id="Products" name="Produits"/>
+  <tab id="Profiles" name="Profils"/>
+  <tab id="Quick_Access" name="Acc&#xE8;s rapide"/>
   <tab id="Referrers" name="Sites affluents"/>
-  <tab id="Warehouses" name="Entrep&#xF4;ts"/>
+  <tab id="Search_1" name="Recherche"/>
+  <tab id="Search" name="Recherche"/>
+  <tab id="Search_Engines" name="Moteurs de recherche"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Shipping" name="Transport"/>
+  <tab id="Shipping_1" name="Transport"/>
+  <tab id="Shop_URLs" name="URLs de boutique"/>
+  <tab id="Shopping_Carts" name="Paniers"/>
+  <tab id="Shops" name="Boutiques"/>
+  <tab id="SQL_Manager" name="Gestionnaire SQL"/>
+  <tab id="States" name="Etats"/>
+  <tab id="Stats" name="Statistiques"/>
+  <tab id="Stats_1" name="Statistiques"/>
+  <tab id="Statuses" name="Statuts"/>
+  <tab id="Stock" name="Stock"/>
+  <tab id="Stock_Coverage" name="Couverture du stock"/>
   <tab id="Stock_Management" name="Gestion du stock"/>
   <tab id="Stock_Movement" name="Mouvements de Stock"/>
-  <tab id="Instant_Stock_Status" name="Etat instantan&#xE9; du stock"/>
-  <tab id="Stock_Coverage" name="Couverture du stock"/>
+  <tab id="Store_Contacts" name="Coordonn&#xE9;es &amp; magasins"/>
+  <tab id="Suppliers" name="Fournisseurs"/>
   <tab id="Supply_orders" name="Commandes fournisseurs"/>
-  <tab id="Configuration" name="Configuration"/>
+  <tab id="Tags" name="Tags"/>
+  <tab id="Tax_Rules" name="R&#xE8;gles de taxes"/>
+  <tab id="Taxes" name="Taxes"/>
+  <tab id="Themes" name="Th&#xE8;mes"/>
+  <tab id="Titles" name="Titres de civilit&#xE9;"/>
+  <tab id="Translations" name="Traductions"/>
+  <tab id="Warehouses" name="Entrep&#xF4;ts"/>
+  <tab id="Webservice" name="Service web"/>
+  <tab id="Weight_Ranges" name="Tranches de poids"/>
+  <tab id="Zones" name="Zones"/>
 </entity_tab>
diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php
index 37f01522c..4d2e0980b 100644
--- a/install-dev/langs/fr/install.php
+++ b/install-dev/langs/fr/install.php
@@ -194,7 +194,7 @@ return array(
 		'Display' => 'Afficher',
 		'<b>Warning: You cannot use anymore this tool to upgrade your store.</b><br /><br />You already have <b>PrestaShop version %1$s installed</b>.<br /><br />If you want to upgrade to the latest version please read our documentation: <a href="%2$s">%2$s</a>' => '<b>Attention: Vous ne pouvez plus utiliser cet outil pour mettre à jour votre boutique.</b><br /><br />Vous avez déjà <b>PrestaShop version %1$s d\'installé.</b><br /><br />Si vous souhaitez utiliser la dernière version, merci de vous référer à notre documentation pour la mise à jour : <a href="%2$s">%2$s</a>',
 		'PrestaShop Wizard Installer' => 'Installation de PrestaShop',
-		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'PrestaShop peut vous accompagner si vous rencontrez un obstacle lors de l\'installation de votre boutique. Contactez notre équipe au %s et indiquez-nous l\'URL de votre boutique. Nous serons heureux de vous aider dans les dernières étapes de l\'installation !',
+		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'PrestaShop peut vous accompagner si vous avez besoin d\'aide pour finaliser l\'installation de votre boutique. Contactez notre équipe au %s et indiquez-nous l\'URL de votre boutique. Nous serons heureux de vous aider dans les dernières étapes de l\'installation !',
 		'The field %s is limited to %d characters' => 'Le champs %s est limité à %d caractères',
 		'shop name' => 'nom de la boutique',
 		'firstname' => 'prénom',
diff --git a/install-dev/langs/it/data/tab.xml b/install-dev/langs/it/data/tab.xml
index 393512476..cbf510160 100644
--- a/install-dev/langs/it/data/tab.xml
+++ b/install-dev/langs/it/data/tab.xml
@@ -1,105 +1,105 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Home"/>
-  <tab id="CMS_Pages" name="Pagine CMS"/>
-  <tab id="CMS_Categories" name="Categorie CMS"/>
-  <tab id="Combinations_Generator" name="Generatore di combinazioni"/>
-  <tab id="Search" name="Cerca"/>
-  <tab id="Login" name="Login"/>
-  <tab id="Shops" name="Negozi"/>
-  <tab id="Shop_URLs" name="Url Negozio"/>
-  <tab id="Catalog" name="Catalogo"/>
-  <tab id="Orders" name="Ordini"/>
-  <tab id="Customers" name="Clienti"/>
-  <tab id="Price_Rules" name="Regole Prezzi"/>
-  <tab id="Shipping" name="Spedizione"/>
-  <tab id="Localization" name="Localizzazione"/>
-  <tab id="Modules" name="Moduli"/>
-  <tab id="Preferences" name="Preferenze"/>
-  <tab id="Advanced_Parameters" name="Parametri Avanzati"/>
-  <tab id="Administration" name="Amministrazione"/>
-  <tab id="Stats" name="Statistiche"/>
-  <tab id="Stock" name="Magazzino"/>
-  <tab id="Products" name="Prodotti"/>
-  <tab id="Categories" name="Categorie"/>
-  <tab id="Monitoring" name="Monitoring"/>
-  <tab id="Attributes_and_Values" name="Attributi e Valori"/>
-  <tab id="Features" name="Caratteristiche"/>
-  <tab id="Manufacturers" name="Produttori"/>
-  <tab id="Suppliers" name="Fornitori"/>
-  <tab id="Image_Mapping" name="Mappatura Immagine"/>
-  <tab id="Tags" name="Tags"/>
-  <tab id="Attachments" name="Allegati"/>
-  <tab id="Orders_1" name="Ordini"/>
-  <tab id="Invoices" name="Fatture"/>
-  <tab id="Merchandise_Returns" name="Resi Prodotti"/>
-  <tab id="Delivery_Slips" name="Note di credito"/>
-  <tab id="Credit_Slips" name="Resi Clienti"/>
-  <tab id="Statuses" name="Stati Ordine"/>
-  <tab id="Order_Messages" name="Messaggi ordine"/>
-  <tab id="Customers_1" name="Clienti"/>
   <tab id="Addresses" name="Indirizzi"/>
-  <tab id="Groups" name="Gruppi"/>
-  <tab id="Shopping_Carts" name="Carrelli"/>
-  <tab id="Customer_Service" name="Servizio clienti"/>
-  <tab id="Contacts" name="Contatti"/>
-  <tab id="Titles" name="Genere"/>
-  <tab id="Outstanding" name="Insoluti"/>
-  <tab id="Cart_Rules" name="Regole Carrello"/>
-  <tab id="Catalog_Price_Rules" name="Regole catalogo prezzi"/>
-  <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Spedizione"/>
-  <tab id="Carriers" name="Corrieri"/>
-  <tab id="Price_Ranges" name="Range di prezzi"/>
-  <tab id="Weight_Ranges" name="Range di pesi"/>
-  <tab id="Localization_1" name="Localizzazione"/>
-  <tab id="Languages" name="Lingue"/>
-  <tab id="Zones" name="Zone"/>
-  <tab id="Countries" name="Nazioni"/>
-  <tab id="States" name="Stati"/>
-  <tab id="Currencies" name="Valute"/>
-  <tab id="Taxes" name="Tasse"/>
-  <tab id="Tax_Rules" name="Regole Tasse"/>
-  <tab id="Translations" name="Traduzioni"/>
-  <tab id="Modules_1" name="Moduli"/>
-  <tab id="Modules_Themes_Catalog" name="Catalogo moduli e temi"/>
-  <tab id="Positions" name="Posizioni"/>
-  <tab id="Payment" name="Pagamenti"/>
-  <tab id="General" name="Generale"/>
-  <tab id="Orders_2" name="Ordini"/>
-  <tab id="Products_1" name="Prodotti"/>
-  <tab id="Customers_2" name="Clienti"/>
-  <tab id="Themes" name="Temi"/>
-  <tab id="SEO_URLs" name="URL e SEO"/>
+  <tab id="Administration" name="Amministrazione"/>
+  <tab id="Advanced_Parameters" name="Parametri Avanzati"/>
+  <tab id="Attachments" name="Documenti allegati"/>
+  <tab id="Attributes_and_Values" name="Attributi e Valori"/>
+  <tab id="Carriers" name="Mezzi di spedizione"/>
+  <tab id="Cart_Rules" name="Regole carrello"/>
+  <tab id="Catalog" name="Catalogo"/>
+  <tab id="Catalog_Price_Rules" name="Regole Catalogo Prezzi"/>
+  <tab id="Categories" name="Categorie"/>
   <tab id="CMS" name="CMS"/>
-  <tab id="Images" name="Immagini"/>
-  <tab id="Store_Contacts" name="Contatti e Negozi"/>
-  <tab id="Search_1" name="Ricerca"/>
-  <tab id="Maintenance" name="Manutenzione"/>
-  <tab id="Geolocation" name="Geolocalizzazione"/>
-  <tab id="Configuration_Information" name="Informazioni configurazione"/>
-  <tab id="Performance" name="Performance"/>
-  <tab id="E-mail" name="E-mail"/>
-  <tab id="Multistore" name="Multi-negozio"/>
-  <tab id="CSV_Import" name="Import CSV"/>
-  <tab id="DB_Backup" name="Backup DB"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Logs" name="Logs"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Preferences_1" name="Preferenze"/>
-  <tab id="Quick_Access" name="Accesso Rapido"/>
-  <tab id="Employees" name="Impiegati"/>
-  <tab id="Profiles" name="Profili"/>
-  <tab id="Permissions" name="Permessi"/>
-  <tab id="Menus" name="Tabs"/>
-  <tab id="Stats_1" name="Statistiche"/>
-  <tab id="Search_Engines" name="Motori di ricerca"/>
-  <tab id="Referrers" name="Referenti"/>
-  <tab id="Warehouses" name="Magazzini"/>
-  <tab id="Stock_Management" name="Gestione Magazzino"/>
-  <tab id="Stock_Movement" name="Movimenti Magazzino"/>
-  <tab id="Instant_Stock_Status" name="Stato Magazzino"/>
-  <tab id="Stock_Coverage" name="Scorte"/>
-  <tab id="Supply_orders" name="Ordini fornitori"/>
+  <tab id="CMS_Categories" name="Categorie CMS"/>
+  <tab id="CMS_Pages" name="Pagine CMS"/>
+  <tab id="Combinations_Generator" name="Generatore di combinazioni"/>
   <tab id="Configuration" name="Configurazione"/>
+  <tab id="Configuration_Information" name="Informazioni"/>
+  <tab id="Contacts" name="Contatti"/>
+  <tab id="Countries" name="Nazione"/>
+  <tab id="Credit_Slips" name="Note di credito"/>
+  <tab id="CSV_Import" name="Importo CVS"/>
+  <tab id="Currencies" name="Valute"/>
+  <tab id="Customer_Service" name="Servizio clienti"/>
+  <tab id="Customers" name="Clienti"/>
+  <tab id="Customers_2" name="Clienti"/>
+  <tab id="Customers_1" name="Clienti"/>
+  <tab id="DB_Backup" name="Backup DB"/>
+  <tab id="Delivery_Slips" name="Note di Consegna"/>
+  <tab id="E-mail" name="E-mail"/>
+  <tab id="Employees" name="Dipendenti"/>
+  <tab id="Features" name="Caratt."/>
+  <tab id="General" name="Generale"/>
+  <tab id="Geolocation" name="Geolocalizzazione"/>
+  <tab id="Groups" name="Gruppi"/>
+  <tab id="Home" name="Home page"/>
+  <tab id="Image_Mapping" name="Mapping Immagine"/>
+  <tab id="Images" name="Immagini"/>
+  <tab id="Instant_Stock_Status" name="Stato dello stock Istantaneo"/>
+  <tab id="Invoices" name="Fatture"/>
+  <tab id="Languages" name="Lingue"/>
+  <tab id="Localization" name="Localizzazione"/>
+  <tab id="Localization_1" name="Localizzazione"/>
+  <tab id="Login" name="Login"/>
+  <tab id="Logs" name="Archivi"/>
+  <tab id="Maintenance" name="Manutenzione"/>
+  <tab id="Manufacturers" name="Produttori"/>
+  <tab id="Marketing" name="Marketing"/>
+  <tab id="Menus" name="Tabs"/>
+  <tab id="Merchandise_Returns" name="Restituzione prodotto"/>
+  <tab id="Modules_1" name="Moduli"/>
+  <tab id="Modules" name="Moduli"/>
+  <tab id="Modules_Themes_Catalog" name="Catalogo Moduli e temi"/>
+  <tab id="Monitoring" name="Monitoraggio"/>
+  <tab id="Multistore" name="Multi-negozio"/>
+  <tab id="Order_Messages" name="Messaggi predefiniti"/>
+  <tab id="Orders_2" name="Ordini"/>
+  <tab id="Orders" name="Ordini"/>
+  <tab id="Orders_1" name="Ordini"/>
+  <tab id="Outstanding" name="In sospeso"/>
+  <tab id="Payment" name="Pagamento"/>
+  <tab id="Performance" name="Prestazioni"/>
+  <tab id="Permissions" name="Permessi"/>
+  <tab id="Positions" name="Posizioni"/>
+  <tab id="Preferences_1" name="Preferenze"/>
+  <tab id="Preferences" name="Preferenze"/>
+  <tab id="Price_Ranges" name="Fasce di prezzi"/>
+  <tab id="Price_Rules" name="Regole Prezzi"/>
+  <tab id="Products_1" name="Prodotti"/>
+  <tab id="Products" name="Prodotti"/>
+  <tab id="Profiles" name="Profili"/>
+  <tab id="Quick_Access" name="Accesso veloce"/>
+  <tab id="Referrers" name="Affiliati"/>
+  <tab id="Search_1" name="Cerca"/>
+  <tab id="Search" name="Cerca"/>
+  <tab id="Search_Engines" name="Motori di ricerca"/>
+  <tab id="SEO_URLs" name="URL e SEO"/>
+  <tab id="Shipping" name="Spedizione"/>
+  <tab id="Shipping_1" name="Spedizione"/>
+  <tab id="Shop_URLs" name="URLs negozi"/>
+  <tab id="Shopping_Carts" name="Carrello"/>
+  <tab id="Shops" name="Negozi associati"/>
+  <tab id="SQL_Manager" name="Manager SQL"/>
+  <tab id="States" name="Stati"/>
+  <tab id="Stats" name="Statistiche"/>
+  <tab id="Stats_1" name="Statistiche"/>
+  <tab id="Statuses" name="Stati"/>
+  <tab id="Stock" name="Magazzino"/>
+  <tab id="Stock_Coverage" name="Copertura Stock"/>
+  <tab id="Stock_Management" name="Gestione dello Stock"/>
+  <tab id="Stock_Movement" name="Movimento magazzino"/>
+  <tab id="Store_Contacts" name="Contatti del negozio"/>
+  <tab id="Suppliers" name="Fornitori"/>
+  <tab id="Supply_orders" name="Ordini fornitura"/>
+  <tab id="Tags" name="Tag"/>
+  <tab id="Tax_Rules" name="Regole"/>
+  <tab id="Taxes" name="Tasse"/>
+  <tab id="Themes" name="Temi"/>
+  <tab id="Titles" name="Titoli"/>
+  <tab id="Translations" name="Traduzioni"/>
+  <tab id="Warehouses" name="Magazzino"/>
+  <tab id="Webservice" name="Webservice"/>
+  <tab id="Weight_Ranges" name="Fasce di pesi"/>
+  <tab id="Zones" name="Zone"/>
 </entity_tab>
diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php
index a6a048608..77e6eb468 100644
--- a/install-dev/langs/it/install.php
+++ b/install-dev/langs/it/install.php
@@ -214,11 +214,11 @@ return array(
 		'Cannot copy flag language "%s"' => 'Impossibile copiare la bandiera per la lingua "%s"',
 		'Must be alphanumeric string with at least 8 characters' => 'Deve essere una stringa alfanumerica di almeno 8 caratteri',
 		'Sign-up to the newsletter' => 'Mi abbono alla newsletter',
-		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Per usare PrestaShop, devi <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">creare un database</a> per riunire tutti i dati inerenti alle attività del tuo negozio.',
+		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Per usare PrestaShop, devi <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">creare un database</a> per riunire tutti i dati inerenti alle attività del tuo negozio.',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Compila i campi sottostanti per far sì che PrestaShop possa connettersi al tuo database.',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'La porta di default è 3306. Per usare un\'altra porta, digita il numero della porta alla fine del tuo indirizzo di server. Per esempio: "4242".',
 		'Test your database connection now!' => 'Verifica subito la connessione al tuo database!',
-		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Se si verificano problemi durante il processo di installazione, chiamaci allo %s. Uno dei nostri esperti sarà felice di aiutarti.',
+		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Se si verificano problemi durante il processo di installazione, chiamaci allo %s. Uno dei nostri esperti sarà felice di aiutarti.',
 		'PrestaShop Installation Assistant' => 'Assistente di Installazione PrestaShop',
 		'Contact us!' => 'Contattaci!',
 		'Installation Assistant' => 'Assistente di Installazione',
diff --git a/install-dev/langs/pl/data/tab.xml b/install-dev/langs/pl/data/tab.xml
index 7a511f653..beb217285 100644
--- a/install-dev/langs/pl/data/tab.xml
+++ b/install-dev/langs/pl/data/tab.xml
@@ -1,105 +1,105 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Strona główna"/>
-  <tab id="CMS_Pages" name="Strony CMS"/>
-  <tab id="CMS_Categories" name="Kategorie CMS"/>
-  <tab id="Combinations_Generator" name="Generator kombinacji atrybutów"/>
-  <tab id="Search" name="Wyszukiwarka"/>
-  <tab id="Login" name="Logowanie"/>
-  <tab id="Shops" name="Sklepy"/>
-  <tab id="Shop_URLs" name="Adresy URL sklepów"/>
-  <tab id="Catalog" name="Katalog"/>
-  <tab id="Orders" name="Zamówienia"/>
-  <tab id="Customers" name="Klienci"/>
-  <tab id="Price_Rules" name="Reguły cen"/>
-  <tab id="Shipping" name="Dostawa"/>
-  <tab id="Localization" name="Lokalizacja"/>
-  <tab id="Modules" name="Moduły"/>
-  <tab id="Preferences" name="Opcje"/>
-  <tab id="Advanced_Parameters" name="Opcje zaawansowane"/>
-  <tab id="Administration" name="Administracja"/>
-  <tab id="Stats" name="Statystyki"/>
-  <tab id="Stock" name="Magazyn"/>
-  <tab id="Products" name="Produkty"/>
-  <tab id="Categories" name="Kategorie"/>
-  <tab id="Monitoring" name="Monitoring"/>
-  <tab id="Attributes_and_Values" name="Atrybuty produktów"/>
-  <tab id="Features" name="Cechy"/>
-  <tab id="Manufacturers" name="Producenci"/>
-  <tab id="Suppliers" name="Dostawcy"/>
-  <tab id="Image_Mapping" name="Oznaczanie zdjęć"/>
-  <tab id="Tags" name="Tagi"/>
-  <tab id="Attachments" name="Załączniki"/>
-  <tab id="Orders_1" name="Zamówienia"/>
-  <tab id="Invoices" name="Faktury"/>
-  <tab id="Merchandise_Returns" name="Zwroty"/>
-  <tab id="Delivery_Slips" name="Listy przewozowe"/>
-  <tab id="Credit_Slips" name="Pokwitowania"/>
-  <tab id="Statuses" name="Statusy zamówień"/>
-  <tab id="Order_Messages" name="Wiadomości dla zamówień"/>
-  <tab id="Customers_1" name="Klienci"/>
   <tab id="Addresses" name="Adresy"/>
-  <tab id="Groups" name="Grupy"/>
-  <tab id="Shopping_Carts" name="Koszyki"/>
-  <tab id="Customer_Service" name="BOK"/>
-  <tab id="Contacts" name="Kontakty"/>
-  <tab id="Titles" name="Tytuły"/>
-  <tab id="Outstanding" name="Do załatwienia"/>
-  <tab id="Cart_Rules" name="Reguły cen koszyka"/>
-  <tab id="Catalog_Price_Rules" name="Reguły cen katalogu"/>
-  <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Dostawa"/>
-  <tab id="Carriers" name="Dostawcy"/>
-  <tab id="Price_Ranges" name="Zakresy cenowe"/>
-  <tab id="Weight_Ranges" name="Zakresy wagowe"/>
-  <tab id="Localization_1" name="Lokalizacja"/>
-  <tab id="Languages" name="Języki"/>
-  <tab id="Zones" name="Strefy"/>
-  <tab id="Countries" name="Kraje"/>
-  <tab id="States" name="Województwa / Stany"/>
-  <tab id="Currencies" name="Waluty"/>
-  <tab id="Taxes" name="Podatki"/>
-  <tab id="Tax_Rules" name="Reguły podatków"/>
-  <tab id="Translations" name="Tłumaczenia"/>
-  <tab id="Modules_1" name="Moduły"/>
-  <tab id="Modules_Themes_Catalog" name="Moduły i szablony - sklep"/>
-  <tab id="Positions" name="Pozycje modułów"/>
-  <tab id="Payment" name="Płatności"/>
-  <tab id="General" name="Podstawowe"/>
-  <tab id="Orders_2" name="Zamówienia"/>
-  <tab id="Products_1" name="Produkty"/>
-  <tab id="Customers_2" name="Klienci"/>
-  <tab id="Themes" name="Wygląd / Szablony"/>
-  <tab id="SEO_URLs" name="SEO"/>
+  <tab id="Administration" name="Administracja"/>
+  <tab id="Advanced_Parameters" name="Parametry zaawansowane"/>
+  <tab id="Attachments" name="Za&#x142;&#x105;czniki"/>
+  <tab id="Attributes_and_Values" name="Atrybuty i warto&#x15B;ci"/>
+  <tab id="Carriers" name="Spos&#xF3;b dostawy"/>
+  <tab id="Cart_Rules" name="Ustawienia koszyka"/>
+  <tab id="Catalog" name="Katalog"/>
+  <tab id="Catalog_Price_Rules" name="Regu&#x142;y cenowe katalogu"/>
+  <tab id="Categories" name="Kategorie"/>
   <tab id="CMS" name="CMS"/>
-  <tab id="Images" name="Zdjęcia"/>
-  <tab id="Store_Contacts" name="Informacje o sklepach"/>
-  <tab id="Search_1" name="Wyszukiwarka"/>
-  <tab id="Maintenance" name="Przerwa techniczna"/>
-  <tab id="Geolocation" name="Geolokalizacja"/>
-  <tab id="Configuration_Information" name="Informacje o konfiguracji"/>
-  <tab id="Performance" name="Wydajność"/>
-  <tab id="E-mail" name="E-mail"/>
-  <tab id="Multistore" name="Multi-store"/>
-  <tab id="CSV_Import" name="Import CSV"/>
-  <tab id="DB_Backup" name="Kopie zapasowe"/>
-  <tab id="SQL_Manager" name="Menadżer SQL"/>
-  <tab id="Logs" name="Dziennik zdarzeń"/>
-  <tab id="Webservice" name="API"/>
-  <tab id="Preferences_1" name="Opcje"/>
-  <tab id="Quick_Access" name="Szybki dostęp"/>
-  <tab id="Employees" name="Obsługa sklepu"/>
-  <tab id="Profiles" name="Profile"/>
-  <tab id="Permissions" name="Uprawnienia"/>
-  <tab id="Menus" name="Zakładki"/>
-  <tab id="Stats_1" name="Statystyki"/>
-  <tab id="Search_Engines" name="Wyszukiwarki"/>
-  <tab id="Referrers" name="Program sponsorski"/>
-  <tab id="Warehouses" name="Magazyny"/>
-  <tab id="Stock_Management" name="Magazyn"/>
-  <tab id="Stock_Movement" name="Ruchy w magazynie"/>
-  <tab id="Instant_Stock_Status" name="Dostępność towaru"/>
-  <tab id="Stock_Coverage" name="Raporty"/>
-  <tab id="Supply_orders" name="Zamówienia dostawców"/>
+  <tab id="CMS_Categories" name="Kategorie CMS'a"/>
+  <tab id="CMS_Pages" name="Strony CMS'a"/>
+  <tab id="Combinations_Generator" name="Generator kombinacji"/>
   <tab id="Configuration" name="Konfiguracja"/>
+  <tab id="Configuration_Information" name="Informacje konfiguracyjne"/>
+  <tab id="Contacts" name="Kontakty"/>
+  <tab id="Countries" name="Kraje"/>
+  <tab id="Credit_Slips" name="Credit Slips"/>
+  <tab id="CSV_Import" name="Import z pliku CSV"/>
+  <tab id="Currencies" name="Waluty"/>
+  <tab id="Customer_Service" name="Biuro Obs&#x142;ugi Klienta"/>
+  <tab id="Customers" name="Klienci"/>
+  <tab id="Customers_2" name="Klienci"/>
+  <tab id="Customers_1" name="Klienci"/>
+  <tab id="DB_Backup" name="Backup bady danych"/>
+  <tab id="Delivery_Slips" name="Listy przewozowe"/>
+  <tab id="E-mail" name="E-mail"/>
+  <tab id="Employees" name="Pracownicy"/>
+  <tab id="Features" name="Cechy"/>
+  <tab id="General" name="Ustawienia g&#x142;&#xF3;wne"/>
+  <tab id="Geolocation" name="Lokalizacja geograficzna"/>
+  <tab id="Groups" name="Grupy"/>
+  <tab id="Home" name="Strona g&#x142;&#xF3;wna"/>
+  <tab id="Image_Mapping" name="Image Mapping"/>
+  <tab id="Images" name="Obrazki"/>
+  <tab id="Instant_Stock_Status" name="Natychmiastowe stany magazynowe"/>
+  <tab id="Invoices" name="Faktury"/>
+  <tab id="Languages" name="J&#x119;zyki"/>
+  <tab id="Localization" name="Lokalizacja"/>
+  <tab id="Localization_1" name="Lokalizacja"/>
+  <tab id="Login" name="Nazwa u&#x17C;ytkowika"/>
+  <tab id="Logs" name="Logi"/>
+  <tab id="Maintenance" name="Obs&#x142;uga"/>
+  <tab id="Manufacturers" name="Producenci"/>
+  <tab id="Marketing" name="Marketing"/>
+  <tab id="Menus" name="Zak&#x142;adki"/>
+  <tab id="Merchandise_Returns" name="Zwroty produkt&#xF3;w"/>
+  <tab id="Modules_1" name="Modu&#x142;y"/>
+  <tab id="Modules" name="Modu&#x142;y"/>
+  <tab id="Modules_Themes_Catalog" name="Katalog Modu&#x142;&#xF3;w i Szablon&#xF3;w"/>
+  <tab id="Monitoring" name="Monitorowanie"/>
+  <tab id="Multistore" name="Zestawienie sklep&#xF3;w ?"/>
+  <tab id="Order_Messages" name="Tre&#x15B;&#x107; powiadomienia zam&#xF3;wie&#x144;"/>
+  <tab id="Orders_2" name="Zam&#xF3;wienia"/>
+  <tab id="Orders" name="Zam&#xF3;wienia"/>
+  <tab id="Orders_1" name="Zam&#xF3;wienia"/>
+  <tab id="Outstanding" name="Zaleg&#x142;y"/>
+  <tab id="Payment" name="P&#x142;atno&#x15B;&#x107;"/>
+  <tab id="Performance" name="Wydajno&#x15B;&#x107;"/>
+  <tab id="Permissions" name="Uprawnienia"/>
+  <tab id="Positions" name="Pozycje"/>
+  <tab id="Preferences_1" name="Preferencje"/>
+  <tab id="Preferences" name="Preferencje"/>
+  <tab id="Price_Ranges" name="Zakresy cen"/>
+  <tab id="Price_Rules" name="Regu&#x142;y ustalania cen"/>
+  <tab id="Products_1" name="Produkty"/>
+  <tab id="Products" name="Produkty"/>
+  <tab id="Profiles" name="Profile"/>
+  <tab id="Quick_Access" name="Szybki dost&#x119;p"/>
+  <tab id="Referrers" name="Sponsoruj&#x105;cy"/>
+  <tab id="Search_1" name="Szukaj"/>
+  <tab id="Search" name="Wyszukaj"/>
+  <tab id="Search_Engines" name="Wyszukiwarki"/>
+  <tab id="SEO_URLs" name="Dane URL i SEO"/>
+  <tab id="Shipping" name="Wysy&#x142;ka"/>
+  <tab id="Shipping_1" name="Wysy&#x142;ka"/>
+  <tab id="Shop_URLs" name="Adres URL sklepu"/>
+  <tab id="Shopping_Carts" name="Koszyk zakup&#xF3;w"/>
+  <tab id="Shops" name="Sklepy"/>
+  <tab id="SQL_Manager" name="Menad&#x17A;er SQL"/>
+  <tab id="States" name="Wojew&#xF3;dztwa lub regiony"/>
+  <tab id="Stats" name="Statystyki"/>
+  <tab id="Stats_1" name="Staystyki"/>
+  <tab id="Statuses" name="Statusy"/>
+  <tab id="Stock" name="Na magazynie"/>
+  <tab id="Stock_Coverage" name="Pokrycie stanu"/>
+  <tab id="Stock_Management" name="Zarz&#x105;dzanie magazynem"/>
+  <tab id="Stock_Movement" name="Wymiana zaopatrzenia"/>
+  <tab id="Store_Contacts" name="Adresy sklep&#xF3;w"/>
+  <tab id="Suppliers" name="Dostawcy"/>
+  <tab id="Supply_orders" name="Zam&#xF3;wienia zaopatrzenia"/>
+  <tab id="Tags" name="Tagi"/>
+  <tab id="Tax_Rules" name="Zasady ustalania podatk&#xF3;w"/>
+  <tab id="Taxes" name="Podatki"/>
+  <tab id="Themes" name="Tematy"/>
+  <tab id="Titles" name="Tytu&#x142;y osobowe"/>
+  <tab id="Translations" name="T&#x142;umaczenia"/>
+  <tab id="Warehouses" name="Hurtownie"/>
+  <tab id="Webservice" name="Us&#x142;ugi internetowe"/>
+  <tab id="Weight_Ranges" name="Zakres wag"/>
+  <tab id="Zones" name="Strefy"/>
 </entity_tab>
diff --git a/install-dev/langs/pl/install.php b/install-dev/langs/pl/install.php
index ac0afe668..d32708c8d 100644
--- a/install-dev/langs/pl/install.php
+++ b/install-dev/langs/pl/install.php
@@ -157,9 +157,9 @@ return array(
 		'By default, the PHP mail() function is used' => 'Domyślnie - PHP mail () funkcja jest używana.',
 		'SMTP server address:' => 'Adres serwera SMTP:',
 		'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop wysyła regularnie wskazówki dotyczące optymalizacji zarządzania sklepem. Jeśli nie chcesz ich otrzymywać, odznacz pole.',
-		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Aby korzystać z PrestaShop, musisz <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">stworzyć baze danych</a>, w celu zebrania wszystkich danych dotyczących funkcjonowania Twojego sklepu.',
+		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Aby korzystać z PrestaShop, musisz <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">stworzyć baze danych</a>, w celu zebrania wszystkich danych dotyczących funkcjonowania Twojego sklepu.',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Jeśli chcesz użyć innego portu niż port domyślny (3306), dodaj ":XX" do adresu Twojego serwera - gdzie XX oznacza numer portu.',
-		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Jeśli spotkałeś się z problemami podczas instalacji, skontaktuj się z naszym zespołem %s.',
+		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Jeśli spotkałeś się z problemami podczas instalacji, skontaktuj się z naszym zespołem %s.',
 		'PrestaShop Installation Assistant' => 'Asystent instalacji PrestaShop',
 		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Wyrażam chęć na udział w ulepszaniu oprogramowania PrestaShop - wysyłając anonimowe informacje dotyczące mojej konfiguracji.',
 		'To enjoy the many features that are offered by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Przed rozpoczęciem korzystania z funkcji oferowanych przez PrestaShop,zapoznaj się z warunkami licencji znajdującymi się poniżej. PrestaShop działa na licencji OSL 3.0, natomiast moduły i szablony są publikowane na licencji AFL 3.0.',
diff --git a/install-dev/langs/ru/data/tab.xml b/install-dev/langs/ru/data/tab.xml
index e6d9c8f35..3c835cde1 100644
--- a/install-dev/langs/ru/data/tab.xml
+++ b/install-dev/langs/ru/data/tab.xml
@@ -1,105 +1,105 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <tab id="Home" name="Home"/>
-  <tab id="CMS_Pages" name="CMS Pages"/>
-  <tab id="CMS_Categories" name="CMS Categories"/>
-  <tab id="Combinations_Generator" name="Combinations Generator"/>
-  <tab id="Search" name="Search"/>
-  <tab id="Login" name="Login"/>
-  <tab id="Shops" name="Shops"/>
-  <tab id="Shop_URLs" name="Shop URLs"/>
-  <tab id="Catalog" name="Catalog"/>
-  <tab id="Orders" name="Orders"/>
-  <tab id="Customers" name="Customers"/>
-  <tab id="Price_Rules" name="Price Rules"/>
-  <tab id="Shipping" name="Shipping"/>
-  <tab id="Localization" name="Localization"/>
-  <tab id="Modules" name="Modules"/>
-  <tab id="Preferences" name="Preferences"/>
-  <tab id="Advanced_Parameters" name="Advanced Parameters"/>
-  <tab id="Administration" name="Administration"/>
-  <tab id="Stats" name="Stats"/>
-  <tab id="Stock" name="Stock"/>
-  <tab id="Products" name="Products"/>
-  <tab id="Categories" name="Categories"/>
-  <tab id="Monitoring" name="Monitoring"/>
-  <tab id="Attributes_and_Values" name="Attributes and Values"/>
-  <tab id="Features" name="Features"/>
-  <tab id="Manufacturers" name="Manufacturers"/>
-  <tab id="Suppliers" name="Suppliers"/>
-  <tab id="Image_Mapping" name="Image Mapping"/>
-  <tab id="Tags" name="Tags"/>
-  <tab id="Attachments" name="Attachments"/>
-  <tab id="Orders_1" name="Orders"/>
-  <tab id="Invoices" name="Invoices"/>
-  <tab id="Merchandise_Returns" name="Merchandise Returns"/>
-  <tab id="Delivery_Slips" name="Delivery Slips"/>
-  <tab id="Credit_Slips" name="Credit Slips"/>
-  <tab id="Statuses" name="Statuses"/>
-  <tab id="Order_Messages" name="Order Messages"/>
-  <tab id="Customers_1" name="Customers"/>
-  <tab id="Addresses" name="Addresses"/>
-  <tab id="Groups" name="Groups"/>
-  <tab id="Shopping_Carts" name="Shopping Carts"/>
-  <tab id="Customer_Service" name="Customer Service"/>
-  <tab id="Contacts" name="Contacts"/>
-  <tab id="Titles" name="Titles"/>
-  <tab id="Outstanding" name="Outstanding"/>
-  <tab id="Cart_Rules" name="Cart Rules"/>
-  <tab id="Catalog_Price_Rules" name="Catalog Price Rules"/>
-  <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Shipping"/>
-  <tab id="Carriers" name="Carriers"/>
-  <tab id="Price_Ranges" name="Price Ranges"/>
-  <tab id="Weight_Ranges" name="Weight Ranges"/>
-  <tab id="Localization_1" name="Localization"/>
-  <tab id="Languages" name="Languages"/>
-  <tab id="Zones" name="Zones"/>
-  <tab id="Countries" name="Countries"/>
-  <tab id="States" name="States"/>
-  <tab id="Currencies" name="Currencies"/>
-  <tab id="Taxes" name="Taxes"/>
-  <tab id="Tax_Rules" name="Tax Rules"/>
-  <tab id="Translations" name="Translations"/>
-  <tab id="Modules_1" name="Modules"/>
-  <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
-  <tab id="Positions" name="Positions"/>
-  <tab id="Payment" name="Payment"/>
-  <tab id="General" name="General"/>
-  <tab id="Orders_2" name="Orders"/>
-  <tab id="Products_1" name="Products"/>
-  <tab id="Customers_2" name="Customers"/>
-  <tab id="Themes" name="Themes"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Images" name="Images"/>
-  <tab id="Store_Contacts" name="Store Contacts"/>
-  <tab id="Search_1" name="Search"/>
-  <tab id="Maintenance" name="Maintenance"/>
-  <tab id="Geolocation" name="Geolocation"/>
-  <tab id="Configuration_Information" name="Configuration Information"/>
-  <tab id="Performance" name="Performance"/>
-  <tab id="E-mail" name="E-mail"/>
-  <tab id="Multistore" name="Multistore"/>
-  <tab id="CSV_Import" name="CSV Import"/>
+  <tab id="Addresses" name="&#x410;&#x434;&#x440;&#x435;&#x441;&#x430;"/>
+  <tab id="Administration" name="&#x410;&#x434;&#x43C;&#x438;&#x43D;&#x438;&#x441;&#x442;&#x440;&#x430;&#x446;&#x438;&#x44F;"/>
+  <tab id="Advanced_Parameters" name="&#x41A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x44F;"/>
+  <tab id="Attachments" name="&#x417;&#x430;&#x433;&#x440;&#x443;&#x437;&#x438;&#x442;&#x44C;"/>
+  <tab id="Attributes_and_Values" name="&#x410;&#x442;&#x440;&#x438;&#x431;&#x443;&#x442;&#x44B; &#x438; &#x43A;&#x43E;&#x43C;&#x431;&#x438;&#x43D;&#x430;&#x446;&#x438;&#x438;"/>
+  <tab id="Carriers" name="&#x41A;&#x443;&#x440;&#x44C;&#x435;&#x440;&#x44B;"/>
+  <tab id="Cart_Rules" name="&#x41F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x430; &#x43A;&#x43E;&#x440;&#x437;&#x438;&#x43D;&#x44B;"/>
+  <tab id="Catalog" name="&#x41A;&#x430;&#x442;&#x430;&#x43B;&#x43E;&#x433;"/>
+  <tab id="Catalog_Price_Rules" name="&#x41F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x430; &#x43A;&#x430;&#x442;&#x430;&#x43B;&#x43E;&#x433;&#x430;"/>
+  <tab id="Categories" name="&#x43A;&#x430;&#x442;&#x435;&#x433;&#x43E;&#x440;&#x438;&#x438;"/>
+  <tab id="CMS" name="&#x421;&#x442;&#x440;&#x430;&#x43D;&#x438;&#x446;&#x44B;"/>
+  <tab id="CMS_Categories" name="&#x41A;&#x430;&#x442;&#x435;&#x433;&#x43E;&#x440;&#x438;&#x438; CMS"/>
+  <tab id="CMS_Pages" name="&#x421;&#x442;&#x440;&#x430;&#x43D;&#x438;&#x446;&#x44B; CMS"/>
+  <tab id="Combinations_Generator" name="&#x41A;&#x43E;&#x43C;&#x431;&#x438;&#x43D;&#x430;&#x446;&#x438;&#x438; &#x413;&#x435;&#x43D;&#x435;&#x440;&#x430;&#x442;&#x43E;&#x440;"/>
+  <tab id="Configuration" name="&#x41A;&#x43E;&#x43D;&#x444;&#x438;&#x433;&#x443;&#x440;&#x430;&#x446;&#x438;&#x44F;"/>
+  <tab id="Configuration_Information" name="&#x418;&#x43D;&#x444;&#x43E;&#x440;&#x43C;&#x430;&#x446;&#x438;&#x44F;"/>
+  <tab id="Contacts" name="&#x41A;&#x43E;&#x43D;&#x442;&#x430;&#x43A;&#x442;&#x44B;"/>
+  <tab id="Countries" name="&#x421;&#x442;&#x440;&#x430;&#x43D;&#x44B;"/>
+  <tab id="Credit_Slips" name="&#x41A;&#x440;&#x435;&#x434;&#x438;&#x442;&#x43D;&#x44B;&#x435; &#x441;&#x447;&#x435;&#x442;&#x430;"/>
+  <tab id="CSV_Import" name="&#x418;&#x43C;&#x43F;&#x43E;&#x440;&#x442; CSV"/>
+  <tab id="Currencies" name="&#x412;&#x430;&#x43B;&#x44E;&#x442;&#x430;"/>
+  <tab id="Customer_Service" name="&#x421;&#x43B;&#x443;&#x436;&#x431;&#x430; &#x43F;&#x43E;&#x434;&#x434;&#x435;&#x440;&#x436;&#x43A;&#x438;"/>
+  <tab id="Customers" name="&#x41A;&#x43B;&#x438;&#x435;&#x43D;&#x442;&#x44B;"/>
+  <tab id="Customers_2" name="&#x41A;&#x43B;&#x438;&#x435;&#x43D;&#x442;&#x44B;"/>
+  <tab id="Customers_1" name="&#x41A;&#x43B;&#x438;&#x435;&#x43D;&#x442;&#x44B;"/>
   <tab id="DB_Backup" name="DB Backup"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Logs" name="Logs"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Preferences_1" name="Preferences"/>
-  <tab id="Quick_Access" name="Quick Access"/>
-  <tab id="Employees" name="Employees"/>
-  <tab id="Profiles" name="Profiles"/>
-  <tab id="Permissions" name="Permissions"/>
-  <tab id="Menus" name="Menus"/>
-  <tab id="Stats_1" name="Stats"/>
-  <tab id="Search_Engines" name="Search Engines"/>
-  <tab id="Referrers" name="Referrers"/>
-  <tab id="Warehouses" name="Warehouses"/>
-  <tab id="Stock_Management" name="Stock Management"/>
-  <tab id="Stock_Movement" name="Stock Movement"/>
-  <tab id="Instant_Stock_Status" name="Instant Stock Status"/>
-  <tab id="Stock_Coverage" name="Stock Coverage"/>
-  <tab id="Supply_orders" name="Supply orders"/>
-  <tab id="Configuration" name="Configuration"/>
+  <tab id="Delivery_Slips" name="&#x421;&#x447;&#x435;&#x442;&#x430; &#x43D;&#x430; &#x434;&#x43E;&#x441;&#x442;&#x430;&#x432;&#x43A;&#x443;"/>
+  <tab id="E-mail" name="E-mail"/>
+  <tab id="Employees" name="&#x421;&#x43E;&#x442;&#x440;&#x443;&#x434;&#x43D;&#x438;&#x43A;&#x438;"/>
+  <tab id="Features" name="&#x421;&#x432;&#x43E;&#x439;&#x441;&#x442;&#x432;&#x430;"/>
+  <tab id="General" name="&#x41E;&#x431;&#x449;&#x438;&#x435; &#x43D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
+  <tab id="Geolocation" name="&#x413;&#x435;&#x43E;&#x43B;&#x43E;&#x43A;&#x430;&#x446;&#x438;&#x44F;"/>
+  <tab id="Groups" name="&#x413;&#x440;&#x443;&#x43F;&#x43F;&#x44B;"/>
+  <tab id="Home" name="&#x414;&#x43E;&#x43C;&#x43E;&#x439;"/>
+  <tab id="Image_Mapping" name="&#x41A;&#x430;&#x440;&#x442;&#x430; &#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43E;&#x43A;"/>
+  <tab id="Images" name="&#x438;&#x437;&#x43E;&#x431;&#x440;&#x430;&#x436;&#x435;&#x43D;&#x438;&#x44F;"/>
+  <tab id="Instant_Stock_Status" name="&#x422;&#x435;&#x43A;&#x443;&#x449;&#x435;&#x435; &#x441;&#x43E;&#x441;&#x442;&#x43E;&#x44F;&#x43D;&#x438;&#x435; &#x441;&#x43A;&#x43B;&#x430;&#x434;&#x430;"/>
+  <tab id="Invoices" name="&#x418;&#x43D;&#x432;&#x43E;&#x439;&#x441;&#x44B;"/>
+  <tab id="Languages" name="&#x42F;&#x437;&#x44B;&#x43A;&#x438;"/>
+  <tab id="Localization" name="&#x41B;&#x43E;&#x43A;&#x430;&#x43B;&#x438;&#x437;&#x430;&#x446;&#x438;&#x44F;"/>
+  <tab id="Localization_1" name="&#x41B;&#x43E;&#x43A;&#x430;&#x43B;&#x438;&#x437;&#x430;&#x446;&#x438;&#x44F;"/>
+  <tab id="Login" name="&#x41B;&#x43E;&#x433;&#x438;&#x43D;"/>
+  <tab id="Logs" name="&#x416;&#x443;&#x440;&#x43D;&#x430;&#x43B;&#x44B;"/>
+  <tab id="Maintenance" name="&#x41E;&#x431;&#x441;&#x43B;&#x443;&#x436;&#x438;&#x432;&#x430;&#x43D;&#x438;&#x435;"/>
+  <tab id="Manufacturers" name="&#x43F;&#x440;&#x43E;&#x438;&#x437;&#x432;&#x43E;&#x434;&#x438;&#x442;&#x435;&#x43B;&#x438;"/>
+  <tab id="Marketing" name="&#x41C;&#x430;&#x440;&#x43A;&#x435;&#x442;&#x438;&#x43D;&#x433;"/>
+  <tab id="Menus" name="&#x417;&#x430;&#x43A;&#x43B;&#x430;&#x434;&#x43A;&#x438;"/>
+  <tab id="Merchandise_Returns" name="&#x412;&#x43E;&#x437;&#x432;&#x440;&#x430;&#x442;&#x44B; &#x442;&#x43E;&#x432;&#x430;&#x440;&#x43E;&#x432;"/>
+  <tab id="Modules_1" name="&#x41C;&#x43E;&#x434;&#x443;&#x43B;&#x438;"/>
+  <tab id="Modules" name="&#x41C;&#x43E;&#x434;&#x443;&#x43B;&#x438;"/>
+  <tab id="Modules_Themes_Catalog" name="&#x41C;&#x43E;&#x434;&#x443;&#x43B;&#x438; &amp; &#x428;&#x430;&#x431;&#x43B;&#x43E;&#x43D;&#x44B;"/>
+  <tab id="Monitoring" name="&#x41C;&#x43E;&#x43D;&#x438;&#x442;&#x43E;&#x440;&#x438;&#x43D;&#x433;"/>
+  <tab id="Multistore" name="&#x41C;&#x443;&#x43B;&#x44C;&#x442;&#x438;-&#x43C;&#x430;&#x433;&#x430;&#x437;&#x438;&#x43D;"/>
+  <tab id="Order_Messages" name="&#x421;&#x43E;&#x43E;&#x431;&#x449;&#x435;&#x43D;&#x438;&#x44F;"/>
+  <tab id="Orders_2" name="&#x417;&#x430;&#x43A;&#x430;&#x437;&#x44B;"/>
+  <tab id="Orders" name="&#x417;&#x430;&#x43A;&#x430;&#x437;&#x44B;"/>
+  <tab id="Orders_1" name="&#x417;&#x430;&#x43A;&#x430;&#x437;&#x44B;"/>
+  <tab id="Outstanding" name="&#x41D;&#x435;&#x43E;&#x43F;&#x43B;&#x430;&#x447;&#x435;&#x43D;&#x43D;&#x44B;&#x439;(&#x435;)"/>
+  <tab id="Payment" name="&#x421;&#x43F;&#x43E;&#x441;&#x43E;&#x431; &#x43E;&#x43F;&#x43B;&#x430;&#x442;&#x44B;"/>
+  <tab id="Performance" name="&#x420;&#x435;&#x437;&#x443;&#x43B;&#x44C;&#x442;&#x430;&#x442;"/>
+  <tab id="Permissions" name="&#x41F;&#x440;&#x430;&#x432;&#x430;"/>
+  <tab id="Positions" name="&#x420;&#x430;&#x441;&#x43F;&#x43E;&#x43B;&#x43E;&#x436;&#x435;&#x43D;&#x438;&#x435;"/>
+  <tab id="Preferences_1" name="&#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
+  <tab id="Preferences" name="&#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
+  <tab id="Price_Ranges" name="&#x428;&#x43A;&#x430;&#x43B;&#x430; &#x446;&#x435;&#x43D;"/>
+  <tab id="Price_Rules" name="&#x426;&#x435;&#x43D;&#x43E;&#x432;&#x44B;&#x435; &#x43F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x430;"/>
+  <tab id="Products_1" name="&#x442;&#x43E;&#x432;&#x430;&#x440;&#x44B;"/>
+  <tab id="Products" name="&#x442;&#x43E;&#x432;&#x430;&#x440;&#x44B;"/>
+  <tab id="Profiles" name="&#x41F;&#x440;&#x43E;&#x444;&#x438;&#x43B;&#x438;"/>
+  <tab id="Quick_Access" name="&#x411;&#x44B;&#x441;&#x442;&#x440;&#x44B;&#x439; &#x434;&#x43E;&#x441;&#x442;&#x443;&#x43F;"/>
+  <tab id="Referrers" name="&#x420;&#x435;&#x444;&#x435;&#x440;&#x44B;"/>
+  <tab id="Search_1" name="&#x41F;&#x43E;&#x438;&#x441;&#x43A;"/>
+  <tab id="Search" name="&#x41F;&#x43E;&#x438;&#x441;&#x43A;"/>
+  <tab id="Search_Engines" name="&#x41F;&#x43E;&#x438;&#x441;&#x43A;&#x43E;&#x432;&#x44B;&#x435; &#x441;-&#x43C;&#x44B;"/>
+  <tab id="SEO_URLs" name="SEO &#x438; URLs"/>
+  <tab id="Shipping" name="&#x414;&#x43E;&#x441;&#x442;&#x430;&#x432;&#x43A;&#x430;"/>
+  <tab id="Shipping_1" name="&#x414;&#x43E;&#x441;&#x442;&#x430;&#x432;&#x43A;&#x430;"/>
+  <tab id="Shop_URLs" name="URL &#x43C;&#x430;&#x433;&#x430;&#x437;&#x438;&#x43D;&#x430;"/>
+  <tab id="Shopping_Carts" name="&#x41A;&#x43E;&#x440;&#x437;&#x438;&#x43D;&#x44B;"/>
+  <tab id="Shops" name="&#x41C;&#x430;&#x433;&#x430;&#x437;&#x438;&#x43D;&#x44B;"/>
+  <tab id="SQL_Manager" name="&#x41C;&#x435;&#x43D;&#x435;&#x434;&#x436;&#x435;&#x440; SQL"/>
+  <tab id="States" name="&#x41E;&#x431;&#x43B;&#x430;&#x441;&#x442;&#x44C;"/>
+  <tab id="Stats" name="&#x421;&#x442;&#x430;&#x442;&#x438;&#x441;&#x442;&#x438;&#x43A;&#x430;"/>
+  <tab id="Stats_1" name="&#x421;&#x442;&#x430;&#x442;&#x438;&#x441;&#x442;&#x438;&#x43A;&#x430;"/>
+  <tab id="Statuses" name="&#x421;&#x442;&#x430;&#x442;&#x443;&#x441;&#x44B;"/>
+  <tab id="Stock" name="&#x417;&#x430;&#x43F;&#x430;&#x441;"/>
+  <tab id="Stock_Coverage" name="&#x41F;&#x43E;&#x43A;&#x440;&#x44B;&#x442;&#x438;&#x435; &#x437;&#x430;&#x43F;&#x430;&#x441;&#x43E;&#x432;"/>
+  <tab id="Stock_Management" name="&#x423;&#x43F;&#x440;&#x430;&#x432;&#x43B;&#x435;&#x43D;&#x438;&#x435; &#x441;&#x43A;&#x43B;&#x430;&#x434;&#x43E;&#x43C;"/>
+  <tab id="Stock_Movement" name="&#x414;&#x432;&#x438;&#x436;&#x435;&#x43D;&#x438;&#x435; &#x442;&#x43E;&#x432;&#x430;&#x440;&#x43E;&#x432;"/>
+  <tab id="Store_Contacts" name="&#x41A;&#x43E;&#x43D;&#x442;&#x430;&#x43A;&#x442;&#x44B; &#x43C;&#x430;&#x433;&#x430;&#x437;&#x438;&#x43D;&#x430;"/>
+  <tab id="Suppliers" name="&#x43F;&#x43E;&#x441;&#x442;&#x430;&#x432;&#x449;&#x438;&#x43A;&#x438;"/>
+  <tab id="Supply_orders" name="&#x417;&#x430;&#x43A;&#x430;&#x437;&#x44B; &#x43F;&#x43E;&#x441;&#x442;&#x430;&#x432;&#x43A;&#x438;"/>
+  <tab id="Tags" name="&#x41C;&#x435;&#x442;&#x43A;&#x438;"/>
+  <tab id="Tax_Rules" name="&#x41D;&#x430;&#x43B;&#x43E;&#x433;&#x438;"/>
+  <tab id="Taxes" name="&#x41D;&#x430;&#x43B;&#x43E;&#x433;&#x438;"/>
+  <tab id="Themes" name="&#x428;&#x430;&#x431;&#x43B;&#x43E;&#x43D;&#x44B;"/>
+  <tab id="Titles" name="&#x424;&#x43E;&#x440;&#x43C;&#x44B; &#x43E;&#x431;&#x440;&#x430;&#x449;&#x435;&#x43D;&#x438;&#x44F;"/>
+  <tab id="Translations" name="&#x41F;&#x435;&#x440;&#x435;&#x432;&#x43E;&#x434;&#x44B;"/>
+  <tab id="Warehouses" name="&#x421;&#x43A;&#x43B;&#x430;&#x434;&#x44B;"/>
+  <tab id="Webservice" name="WEB &#x441;&#x43B;&#x443;&#x436;&#x431;&#x44B;"/>
+  <tab id="Weight_Ranges" name="&#x428;&#x43A;&#x430;&#x43B;&#x430; &#x432;&#x435;&#x441;&#x430;"/>
+  <tab id="Zones" name="&#x417;&#x43E;&#x43D;&#x44B;"/>
 </entity_tab>
diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index 01ab96d28..eefaef775 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -142,7 +142,7 @@ return array(
 		'Send me a test email!' => 'Отправить тестовое сообщение',
 		'Next' => 'Далее',
 		'Back' => 'Назад',
-		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Если во время установки у Вас возникли проблемы, позвоните нашей команде %s и наши эксперты помогут Вам.',
+		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Если во время установки у Вас возникли проблемы, позвоните нашей команде %s и наши эксперты помогут Вам.',
 		'Official forum' => 'Официальный форум',
 		'Support' => 'Поддержка',
 		'Documentation' => 'Документация',
@@ -209,7 +209,7 @@ return array(
 		'Installation Assistant' => 'Помощник установки',
 		'License Agreements' => 'Лицензионное соглшение',
 		'Print my login information' => 'Распечатать информацию о моем аккаунте',
-		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Для использования PrestaShop, Вам следует <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">создать базу данных </a>, чтобы сгруппровать информацию Вашего магазина.',
+		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Для использования PrestaShop, Вам следует <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">создать базу данных </a>, чтобы сгруппровать информацию Вашего магазина.',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Заполните поля ниже, чтобы  PrestaShop смог уствновить соединение с Вашей с базой данных ',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Порт по умолчанию: 3306. Если Вы используете другой порт, то введите номер порта в конце адреса Вашего сервера. пример: ":4242".',
 		'Continue the installation in:' => 'Продолжить установку:',
diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml
index c67b110e7..ab9b6377c 100644
--- a/install-dev/theme/views/configure.phtml
+++ b/install-dev/theme/views/configure.phtml
@@ -158,7 +158,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	<!-- Newsletter -->
 	<div class="field clearfix" id="contentInfosNotification">
 		<div class="contentinput">
-			<input type="checkbox" name="send_informations" id="infosNotification" class="aligned" style="vertical-align:middle" <?php if ($this->session->send_informations): ?>checked="checked"<?php endif; ?> />
+			<input type="checkbox" name="send_informations" id="infosNotification" class="aligned" style="vertical-align:middle" <?php if ($this->session->send_informations === null || $this->session->send_informations): ?>checked="checked"<?php endif; ?> />
 			<label for="infosNotification"><?php echo $this->l('Sign-up to the newsletter') ?></label>
 			<br/>
 			<span id="resultInfosNotification" class="result aligned"></span>
diff --git a/install-dev/theme/views/database.phtml b/install-dev/theme/views/database.phtml
index fdfbc664c..8dae7d7a9 100644
--- a/install-dev/theme/views/database.phtml
+++ b/install-dev/theme/views/database.phtml
@@ -4,7 +4,7 @@
 <div id="dbPart">
 	<h2><?php echo $this->l('Configure your database by filling out the following fields:') ?></h2>
 	<p>
-		<?php echo $this->l('To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop" target="_blank">create a database</a> to collect all of your store’s data-related activities.') ?>
+		<?php echo $this->l('To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.') ?>
 		<br />
 		<?php echo $this->l('Please complete the fields below in order for PrestaShop to connect to your database. ') ?>
 	</p>
diff --git a/install-dev/theme/views/footer.phtml b/install-dev/theme/views/footer.phtml
index f07434609..8e765ad3a 100644
--- a/install-dev/theme/views/footer.phtml
+++ b/install-dev/theme/views/footer.phtml
@@ -16,7 +16,7 @@
 </div>
 </form>
 <div id="phone_help">
-	<?php echo $this->l('If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.', $this->getPhone()) ?>
+	<?php echo $this->l('If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.', $this->getPhone()) ?>
 </div>
 </div><!-- div id="container" -->
 
diff --git a/install-dev/theme/views/process.phtml b/install-dev/theme/views/process.phtml
index 2406cdbc7..f0eecb7fa 100644
--- a/install-dev/theme/views/process.phtml
+++ b/install-dev/theme/views/process.phtml
@@ -75,9 +75,9 @@ var process_steps = <?php echo Tools::jsonEncode($this->process_steps) ?>;
 </div>
 
 <?php if (@fsockopen('addons.prestashop.com', 80, $errno, $errst, 3)): ?>
-	<iframe src="http://addons.prestashop.com/psinstall1541.php?version=2&lang=<?php echo $this->language->getLanguageIso() ?>&email=<?php echo $this->session->admin_email ?>&activity=<?php echo $this->session->shop_activity ?>&country=<?php echo $this->session->shop_country ?>" scrolling="no" id="prestastore">
+	<iframe src="https://addons.prestashop.com/psinstall1541.php?version=2&lang=<?php echo $this->language->getLanguageIso() ?>&email=<?php echo $this->session->admin_email ?>&activity=<?php echo $this->session->shop_activity ?>&country=<?php echo $this->session->shop_country ?>" scrolling="no" id="prestastore">
 		<p>Your browser does not support iframes.</p>
 	</iframe>
 <?php endif; ?>
 
-<?php $this->displayTemplate('footer') ?>
\ No newline at end of file
+<?php $this->displayTemplate('footer') ?>
diff --git a/pdf/invoice.tax-tab.tpl b/pdf/invoice.tax-tab.tpl
index bcc6d4b67..685bbbd5f 100755
--- a/pdf/invoice.tax-tab.tpl
+++ b/pdf/invoice.tax-tab.tpl
@@ -22,6 +22,8 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+
+{if $tax_exempt || ((isset($product_tax_breakdown) && $product_tax_breakdown|@count > 0) || (isset($ecotax_tax_breakdown) && $ecotax_tax_breakdown|@count > 0))}
 <!--  TAX DETAILS -->
 <table style="width: 100%">
 	<tr>
@@ -41,56 +43,56 @@
 				</tr>
 
 				{if isset($product_tax_breakdown)}
-				{foreach $product_tax_breakdown as $rate => $product_tax_infos}
-				<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
-				 <td style="width: 30%">
-					{if !isset($pdf_product_tax_written)}
-						{l s='Products' pdf='true'}
-						{assign var=pdf_product_tax_written value=1}
+					{foreach $product_tax_breakdown as $rate => $product_tax_infos}
+					<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
+					 <td style="width: 30%">
+						{if !isset($pdf_product_tax_written)}
+							{l s='Products' pdf='true'}
+							{assign var=pdf_product_tax_written value=1}
+						{/if}
+					</td>
+					 <td style="width: 20%; text-align: right;">{$rate} %</td>
+					{if !$use_one_after_another_method}
+					 <td style="width: 20%; text-align: right;">
+						 {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl}
+					 </td>
+					{/if}
+					 <td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount}</td>
+					</tr>
+					{/foreach}
 					{/if}
-				</td>
-				 <td style="width: 20%; text-align: right;">{$rate} %</td>
-				{if !$use_one_after_another_method}
-				 <td style="width: 20%; text-align: right;">
-					 {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl}
-				 </td>
-				{/if}
-				 <td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount}</td>
-				</tr>
-				{/foreach}
-				{/if}
 
-				{if isset($shipping_tax_breakdown)}
-				{foreach $shipping_tax_breakdown as $shipping_tax_infos}
-				<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
-				 <td style="width: 30%">
-					{if !isset($pdf_shipping_tax_written)}
-						{l s='Shipping' pdf='true'}
-						{assign var=pdf_shipping_tax_written value=1}
+					{if isset($shipping_tax_breakdown)}
+					{foreach $shipping_tax_breakdown as $shipping_tax_infos}
+					<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
+					 <td style="width: 30%">
+						{if !isset($pdf_shipping_tax_written)}
+							{l s='Shipping' pdf='true'}
+							{assign var=pdf_shipping_tax_written value=1}
+						{/if}
+					 </td>
+					 <td style="width: 20%; text-align: right;">{$shipping_tax_infos.rate} %</td>
+					{if !$use_one_after_another_method}
+						 <td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl}</td>
 					{/if}
-				 </td>
-				 <td style="width: 20%; text-align: right;">{$shipping_tax_infos.rate} %</td>
- 				{if !$use_one_after_another_method}
-					 <td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl}</td>
-				{/if}
-				 <td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}</td>
-				</tr>
-				{/foreach}
+					 <td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount}</td>
+					</tr>
+					{/foreach}
 				{/if}
 
 				{if isset($ecotax_tax_breakdown)}
-				{foreach $ecotax_tax_breakdown as $ecotax_tax_infos}
-					{if $ecotax_tax_infos.ecotax_tax_excl > 0}
-					<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
-						<td style="width: 30%">{l s='Ecotax' pdf='true'}</td>
-						<td style="width: 20%; text-align: right;">{$ecotax_tax_infos.rate  } %</td>
-						{if !$use_one_after_another_method}
-							<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}</td>
+					{foreach $ecotax_tax_breakdown as $ecotax_tax_infos}
+						{if $ecotax_tax_infos.ecotax_tax_excl > 0}
+						<tr style="line-height:6px;background-color:{cycle values='#FFF,#DDD'};">
+							<td style="width: 30%">{l s='Ecotax' pdf='true'}</td>
+							<td style="width: 20%; text-align: right;">{$ecotax_tax_infos.rate  } %</td>
+							{if !$use_one_after_another_method}
+								<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl}</td>
+							{/if}
+							<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}</td>
+						</tr>
 						{/if}
-						<td style="width: 20%; text-align: right;">{if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)}</td>
-					</tr>
-					{/if}
-				{/foreach}
+					{/foreach}
 				{/if}
 			</table>
 			{/if}
@@ -98,4 +100,4 @@
 	</tr>
 </table>
 <!--  / TAX DETAILS -->
-
+{/if}
\ No newline at end of file
diff --git a/themes/default/css/comparator.css b/themes/default/css/comparator.css
index 5d537272a..44af9522a 100644
--- a/themes/default/css/comparator.css
+++ b/themes/default/css/comparator.css
@@ -40,7 +40,7 @@ table#product_comparison {
 	margin-bottom:10px;
 	padding-left:10px;
 	color:#0088cc;
-	background:url(../../img/arrow_right_1.png) no-repeat 0 4px transparent;
+	background:url(../img/arrow_right_1.png) no-repeat 0 4px transparent;
 }
 
 .prices_container {height:50px}
@@ -68,7 +68,7 @@ table#product_comparison {
 	padding-right:16px;
    font-weight:bold;
 	text-align:right;
-	background:url(../../img/icon/delete.gif) no-repeat 100% 1px transparent;
+	background:url(../img/icon/delete.gif) no-repeat 100% 1px transparent;
 }
 
 .ajax_add_to_cart_button {
@@ -82,7 +82,7 @@ table#product_comparison {
    height: 26px;
    left: -12px;
    width: 26px;
-	background: url(../../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
+	background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
 }
 
 
diff --git a/themes/default/history.tpl b/themes/default/history.tpl
index 71f6261ce..335e6a6e8 100644
--- a/themes/default/history.tpl
+++ b/themes/default/history.tpl
@@ -28,7 +28,7 @@
 {include file="$tpl_dir./errors.tpl"}
 
 <h1>{l s='Order history'}</h1>
-<p>{l s='Here are the orders you\'ve placed since your account was created.'}.</p>
+<p>{l s='Here are the orders you\'ve placed since your account was created.'}</p>
 
 {if $slowValidation}<p class="warning">{l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'}</p>{/if}
 
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index db284f6ae..53c76983c 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -541,7 +541,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 				<div class="block_content">
 					<ul>
 					{foreach from=$accessories item=accessory name=accessories_list}
-						{if ($accessory.allow_oosp || $accessory.quantity_all_versions > 0) AND $accessory.available_for_order AND !isset($restricted_country_mode)}
+						{if ($accessory.allow_oosp || $accessory.quantity_all_versions > 0 || $accessory.quantity > 0) AND $accessory.available_for_order AND !isset($restricted_country_mode)}
 							{assign var='accessoryLink' value=$link->getProductLink($accessory.id_product, $accessory.link_rewrite, $accessory.category)}
 							<li class="ajax_block_product{if $smarty.foreach.accessories_list.first} first_item{elseif $smarty.foreach.accessories_list.last} last_item{else} item{/if} product_accessories_description">
 								<p class="s_title_block">
@@ -645,4 +645,4 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 		{include file="$tpl_dir./product-list.tpl" products=$packItems}
 	</div>
 {/if}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/translations/br.gzip b/translations/br.gzip
index 3b2a8f6a6..dcb511add 100644
Binary files a/translations/br.gzip and b/translations/br.gzip differ
diff --git a/translations/de.gzip b/translations/de.gzip
index 35db3980d..2d53f7837 100644
Binary files a/translations/de.gzip and b/translations/de.gzip differ
diff --git a/translations/en.gzip b/translations/en.gzip
new file mode 100644
index 000000000..fba173918
Binary files /dev/null and b/translations/en.gzip differ
diff --git a/translations/es.gzip b/translations/es.gzip
index c551a7aec..fd1c8c88d 100644
Binary files a/translations/es.gzip and b/translations/es.gzip differ
diff --git a/translations/fr.gzip b/translations/fr.gzip
index f3ca648a6..e92f607db 100644
Binary files a/translations/fr.gzip and b/translations/fr.gzip differ
diff --git a/translations/it.gzip b/translations/it.gzip
index fb602139d..a2d334b13 100644
Binary files a/translations/it.gzip and b/translations/it.gzip differ
diff --git a/translations/pl.gzip b/translations/pl.gzip
index ef7e5efd5..bef8219ce 100644
Binary files a/translations/pl.gzip and b/translations/pl.gzip differ
diff --git a/translations/ru.gzip b/translations/ru.gzip
index b2d8e5c51..0a6469ad9 100644
Binary files a/translations/ru.gzip and b/translations/ru.gzip differ