diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index bb91f96b5..a03e40fab 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -16,13 +16,14 @@
 - bMancone
 - bumbu
 - Burhan
-- Cédric Mouleyre
 - Caleydon Media
 - cam.lafit
 - Captain FLAM
 - Captain-FLAM
 - ccauw
+- Cédric Mouleyre
 - ChristopheBoucaut
+- CINS
 - cippest
 - cmouleyre
 - Corentin Delcourt
@@ -34,42 +35,50 @@
 - David Gasperoni
 - Davy Rolink
 - djfm
+- dlage
 - dMetzger
 - (d)oekia
 - Dragan Skrbic
-- DrÿSs'
 - dreammeup
 - DrySs
+- DrÿSs
+- DrÿSs'
 - dSevere
 - Edouard Gaulué
 - emily-d
 - Fabio Chelly
 - fBrignoli
 - fram
+- Francois Gaillard
 - François Gaillard
+- Fran?s Gaillard
 - fSerny
 - Gabriel Schwardy
 - gBrunier
 - gCharmes
 - gPoulain
+- gr4devel
 - Grégoire Bélorgey
 - Gregory Roussac
 - gRoussac
 - Guillaume DELOINCE
+- ha99y
 - hAitmansour
 - Ha!*!*y
 - indesign47
 - inem0o
 - ivancasasempere
-- Jérôme Nadaud
 - jBreux
+- jeckyl
 - jeromenadaud
 - Jerome Nadaud
+- Jérôme Nadaud
 - jessylenne
 - jmCollin
 - jObregon
 - Jonathan Danse
 - joseantgv
+- Julien
 - Kevin Granger
 - kpodemski
 - Krystian Podemski
@@ -77,8 +86,11 @@
 - lCherifi
 - ldecoker
 - lLefevre
+- LOIC ROSSET ltd
+- makk1ntosh
 - marcinsz101
 - Marco Cervellin
+- matiasiglesias
 - Mats Rynge
 - MatthieuB
 - Maxence
@@ -101,32 +113,39 @@
 - PhpMadman
 - Pierre
 - Piotr Kaczor
-- Piotr Moćko
+- Piotr Mocko
 - PrestaEdit
 - prestarocket
+- Prestaspirit
 - pxls
-- Rémi Gaillard
 - Raphaël Malié
 - raulgundin
+- Rémi Gaillard
 - rGaillard
 - Rimas Kudelis
 - rMalie
 - rMontagne
+- romainberger
 - root
 - runningz
-- Sébastien
-- Sébastien Bocahu
+- sagaradonis
 - Samy Rabih
 - Sarah Lorenzini
 - Seb
+- Sébastien
+- Sébastien Bocahu
 - Seynaeve
 - Shagshag
+- sjousse
 - sLorenzini
+- smartdatasoft
+- soufyan
 - soware
 - Staging
 - sThiebaut
 - Sylvain WITMEYER
 - tDidierjean
+- unknown
 - vAugagneur
 - vChabot
 - Vincent Augagneur
@@ -138,3 +157,5 @@
 - Xavier
 - Xavier POITAU
 - Yoozio
+- zimmi1
+
diff --git a/admin-dev/index.php b/admin-dev/index.php
index f5fcc246d..33da0908a 100644
--- a/admin-dev/index.php
+++ b/admin-dev/index.php
@@ -27,6 +27,9 @@
 $timer_start = microtime(true);
 define('_PS_ADMIN_DIR_', getcwd());
 
+if (!defined('PS_ADMIN_DIR'))
+	define('PS_ADMIN_DIR', _PS_ADMIN_DIR_);
+
 require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 require(_PS_ADMIN_DIR_.'/functions.php');
 
diff --git a/admin-dev/init.php b/admin-dev/init.php
index 441433a2a..74e960149 100644
--- a/admin-dev/init.php
+++ b/admin-dev/init.php
@@ -49,9 +49,12 @@ try
 	AdminTab::$currentIndex = $currentIndex;
 
 	$iso = $context->language->iso_code;
-	include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
-	include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
-	include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
+	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php'))
+		include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
+	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php'))
+		include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
+	if (file_exists(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'))
+		include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
 
 	/* Server Params */
 	$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
index e2503c9a6..96908c212 100755
--- a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
@@ -58,7 +58,7 @@
 		</ul>
 	</fieldset>
 	<h2>{l s='Members of this customer group'}</h2>
-	<p>{l s='Limited to the 100th first customers.'} {l s='Please use filters to narrow your search.'}</p>
+	<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
 	{$customerList}
 
-{/block}
\ No newline at end of file
+{/block}
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index c867b6c6d..09a50329f 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -59,7 +59,7 @@
 				{if count($files_to_import)}
 					<select name="csv">
 						{foreach $files_to_import AS $filename}
-							<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename}</option>
+							<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'htmlall':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				{/if}
@@ -67,20 +67,31 @@
 				<a href="#upload_file_import" id="upload_file_import_link" class="button"><img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />{l s='Upload'}</a>
 			</div>
 			<div style="width:50%; margin: 0 auto;">
-				<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">{l s='Click to view our sample import csv files.'}</a>
-				<ul id="sample_files_import" style="display:none">
-					<li><a href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a></li>
-					<li><a href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a></li>
-					<li><a href="../docs/csv_import/combinations_import.csv">{l s='Sample Combinations file'}</a></li>
-					<li><a href="../docs/csv_import/customers_import.csv">{l s='Sample Customers file'}</a></li>
-					<li><a href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a></li>
-					<li><a href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a></li>
-					<li><a href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a></li>
-					{if $PS_ADVANCED_STOCK_MANAGEMENT}
-						<li><a href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a></li>
-						<li><a href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a></li>
-					{/if}
-				</ul>
+				<div style="width:50%; display: inline-block; float :left;">
+					<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">{l s='Click to view our sample import csv files.'}</a>
+					<ul id="sample_files_import" style="display:none;">
+						<li><a class="_blank" href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/combinations_import.csv">{l s='Sample Combinations file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/customers_import.csv">{l s='Sample Customers file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/addresses_import.csv">{l s='Sample Addresses file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/manufacturers_import.csv">{l s='Sample Manufacturers file'}</a></li>
+						<li><a class="_blank" href="../docs/csv_import/suppliers_import.csv">{l s='Sample Suppliers file'}</a></li>
+						{if $PS_ADVANCED_STOCK_MANAGEMENT}
+							<li><a class="_blank" href="../docs/csv_import/supply_orders_import.csv">{l s='Supply Orders sample file'}</a></li>
+							<li><a class="_blank" href="../docs/csv_import/supply_orders_details_import.csv">{l s='Supply Orders Details sample file'}</a></li>
+						{/if}
+					</ul>
+				</div>
+				<div style="width:50%; float:left;">
+					<a href="#" onclick="$('#csv_files_import').slideToggle(); return false;">{l s='Click to view your csv files.'}</a>
+					<ul id="csv_files_import" style="display:none;">
+							{foreach $files_to_import AS $filename}
+								<li><a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}">{$filename}</a>&nbsp;&nbsp;
+<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}&delete=1"><img src="../img/admin/delete.gif" /></a></li>
+							{/foreach}
+					</ul>
+				</div>
 				<div class="clear">&nbsp;</div>
 			</div>
 			<label class="clear">{l s='What kind of entity would you like to import?'} </label>
@@ -108,12 +119,12 @@
 			</div>
 			<label class="clear">{l s='Field separator'} </label>
 			<div class="margin-form">
-				<input type="text" size="2" value=";" name="separator"/>
+				<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'htmlall':'UTF-8'}{else};{/if}" name="separator"/>
 				{l s='e.g. '}"1<span class="bold" style="color: red">;</span>Ipod<span class="bold" style="color: red">;</span>129.90<span class="bold" style="color: red">;</span>5"
 			</div>
 			<label class="clear">{l s='Multiple value separator'} </label>
 			<div class="margin-form">
-				<input type="text" size="2" value="," name="multiple_value_separator"/>
+				<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'htmlall':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
 				{l s='e.g. '}"Ipod;red.jpg<span class="bold" style="color: red">,</span>blue.jpg<span class="bold" style="color: red">,</span>green.jpg;129.90"
 			</div>
 			<label for="truncate" class="clear">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import?'} </label>
@@ -205,7 +216,7 @@
 			else
 			{
 				$(".import_supply_orders_details").hide();
-				$('input[name=multiple_value_separator]').val(',');
+				$('input[name=multiple_value_separator]').val('{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected}{else},{/if}');
 			}
 			if ($("#entity > option:selected").val() == 1)
 				$("label[for=match_ref], #match_ref, label[for=regenerate], #regenerate").show();
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
index a7c20b5d8..97abf07a2 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
@@ -25,7 +25,7 @@
 {extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
 	<script type="text/javascript">
-		var errorEmpty = '{l s='Please name your matching configuration to save.' js='1'}';
+		var errorEmpty = '{l s='Please name your matching configuration to save.' js=1}';
 		var token = '{$token}';
 		var current = 0;
 		function showTable(nb)
@@ -126,4 +126,4 @@
 		</table>
 	</form>
 	</div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index c1fd0afff..34a5d7cec 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -38,6 +38,11 @@
 	var defaults_order_state = new Array();
 	var customization_errors = false;
 	var pic_dir = '{$pic_dir}';
+	var currency_format = 5;
+	var currency_sign = '';
+	var currency_blank = false;
+	var priceDisplayPrecision = 2;
+	
 	{foreach from=$defaults_order_state key='module' item='id_order_state'}
 		defaults_order_state['{$module}'] = '{$id_order_state}';
 	{/foreach}
@@ -505,7 +510,6 @@
 				}
 				displaySummary(res);
 				resetBind();
-				updateCurrencySign();
 			}
 		});
 	}
@@ -652,11 +656,12 @@
 			var id_product = Number(this.id_product);
 			var id_product_attribute = Number(this.id_product_attribute);
 			cart_quantity[Number(this.id_product)+'_'+Number(this.id_product_attribute)+'_'+Number(this.id_customization)] = this.cart_quantity;
-			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" size="7" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="'+this.price+'" />&nbsp;<span class="currency_sign"></span></td><td>';
+			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" size="7" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="' + formatCurrency(parseFloat(this.price.replace(',', '.')), currency_format, currency_sign, currency_blank) + '" /></td><td>';
 			cart_content += (!this.id_customization ? '<div style="float:left;"><a href="#" class="increaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><img src="../img/admin/up.gif" /></a><br /><a href="#" class="decreaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'"><img src="../img/admin/down.gif" /></a></div>' : '');
 			cart_content += (!this.id_customization ? '<div style="float:left;"><input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" class="cart_quantity" size="2" value="'+this.cart_quantity+'" />' : '');
 			cart_content += (!this.id_customization ? '<a href="#" class="delete_product" rel="delete_'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><img src="../img/admin/delete.gif" /></a></div>' : '');
-			cart_content += '</td><td>'+this.total+'&nbsp;<span class="currency_sign"></span></td></tr>';
+			cart_content += '</td><td>' + formatCurrency(parseFloat(this.total.replace(',', '.')), currency_format, currency_sign, currency_blank) + '</td></tr>';
+			
 			if (this.id_customization && this.id_customization != 0)
 			{
 				$.each(this.customized_datas[this.id_product][this.id_product_attribute][id_address_delivery], function() {
@@ -712,6 +717,11 @@
 
 	function displaySummary(jsonSummary)
 	{
+		currency_format = jsonSummary.currency.format;
+		currency_sign = jsonSummary.currency.sign;
+		currency_blank = jsonSummary.currency.blank;
+		priceDisplayPrecision = jsonSummary.currency.decimals ? 2 : 0;
+	
 		updateCartProducts(jsonSummary.summary.products, jsonSummary.summary.gift_products, jsonSummary.cart.id_address_delivery);
 		updateCartVouchers(jsonSummary.summary.discounts);
 		updateAddressesList(jsonSummary.addresses, jsonSummary.cart.id_address_delivery, jsonSummary.cart.id_address_invoice);
@@ -737,20 +747,19 @@
 			$('#free_shipping').removeAttr('checked');
 
 		$('#gift_message').html(jsonSummary.cart.gift_message);
-		if(!changed_shipping_price)
-			$('#shipping_price').html('<b>'+jsonSummary.summary.total_shipping+'</b>');
+		if (!changed_shipping_price)
+			$('#shipping_price').html('<b>' + formatCurrency(parseFloat(jsonSummary.summary.total_shipping), currency_format, currency_sign, currency_blank) + '</b>');
 		shipping_price_selected_carrier = jsonSummary.summary.total_shipping;
-
-		$('#total_vouchers').html(jsonSummary.summary.total_discounts_tax_exc);
-		$('#total_shipping').html(jsonSummary.summary.total_shipping_tax_exc);
-		$('#total_taxes').html(jsonSummary.summary.total_tax);
-		$('#total_without_taxes').html(jsonSummary.summary.total_price_without_tax);
-		$('#total_with_taxes').html(jsonSummary.summary.total_price);
-		$('#total_products').html(jsonSummary.summary.total_products);
+		
+		$('#total_vouchers').html(formatCurrency(parseFloat(jsonSummary.summary.total_discounts_tax_exc.replace(',', '.')), currency_format, currency_sign, currency_blank));
+		$('#total_shipping').html(formatCurrency(parseFloat(jsonSummary.summary.total_shipping_tax_exc.replace(',', '.')), currency_format, currency_sign, currency_blank));
+		$('#total_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_tax.replace(',', '.')), currency_format, currency_sign, currency_blank));
+		$('#total_without_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_price_without_tax.replace(',', '.')), currency_format, currency_sign, currency_blank));
+		$('#total_with_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_price.replace(',', '.')), currency_format, currency_sign, currency_blank));
+		$('#total_products').html(formatCurrency(parseFloat(jsonSummary.summary.total_products.replace(',', '.')), currency_format, currency_sign, currency_blank));
 		id_currency = jsonSummary.cart.id_currency;
 		$('#id_currency option').removeAttr('selected');
 		$('#id_currency option[value="'+id_currency+'"]').attr('selected', true);
-		updateCurrencySign();
 		id_lang = jsonSummary.cart.id_lang;
 		$('#id_lang option').removeAttr('selected');
 		$('#id_lang option[value="'+id_lang+'"]').attr('selected', true);
@@ -778,21 +787,21 @@
 				qty: qty,
 				id_customer: id_customer,
 				id_cart: id_cart,
-				},
+			},
 			success : function(res)
 			{
-					displaySummary(res);
-					var errors = '';
-					if(res.errors.length)
-					{
-						$.each(res.errors, function() {
-							errors += this+'<br />';
-						});
-						$('#products_err').show();
-					}
-					else
-						$('#products_err').hide();
-					$('#products_err').html(errors);
+				displaySummary(res);
+				var errors = '';
+				if (res.errors.length)
+				{
+					$.each(res.errors, function() {
+						errors += this + '<br />';
+					});
+					$('#products_err').show();
+				}
+				else
+					$('#products_err').hide();
+				$('#products_err').html(errors);
 			}
 		});
 	}
@@ -888,11 +897,6 @@
 		});
 	}
 
-	function updateCurrencySign()
-	{
-		$('.currency_sign').html(currencies[id_currency]);
-	}
-
 	function sendMailToCustomer()
 	{
 		$.ajax({
@@ -1008,7 +1012,7 @@
 	<label>{l s='Search customers'}</label>
 	<div class="margin-form">
 		<input type="text" id="customer" value="" />
-		<p>{l s='Search a customer by tapping the first letters of his/her name'}</p>
+		<p>{l s='Search a customer by typing the first letters of his/her name'}</p>
 		<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
 			<img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span>
 		</a>
@@ -1023,7 +1027,7 @@
 		<div class="margin-form">
 			<input type="hidden" value="" id="id_cart" name="id_cart" />
 			<input type="text" id="product" value="" />
-			<p>{l s='Search a product by tapping the first letters of his/her name.'}</p>
+			<p>{l s='Search a product by typing the first letters of his/her name.'}</p>
 		</div>
 		<div id="products_found">
 			<div id="product_list">
@@ -1208,7 +1212,7 @@
 				</select>
 			</p>
 			<p>
-				<label for="shipping_price">{l s='Shipping price'}</label> <span id="shipping_price"  name="shipping_price"></span>&nbsp;<span class="currency_sign"></span>&nbsp;
+				<label for="shipping_price">{l s='Shipping price'}</label> <span id="shipping_price"  name="shipping_price"></span>
 			</p>
 			<p>
 				<label for="free_shipping">{l s='Free shipping'}</label>
@@ -1232,12 +1236,12 @@
 	<div id="send_email_feedback"></div>
 	<div id="cart_summary" style="clear:both;float:left;">
 		<ul>
-			<li><span class="total_cart">{l s='Total products'}</span><span id="total_products"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total vouchers'}</span><span id="total_vouchers"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total shipping'}</span><span id="total_shipping"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total taxes'}</span><span id="total_taxes"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total without taxes'}</span><span id="total_without_taxes"></span><span class="currency_sign"></span></li>
-			<li><span class="total_cart">{l s='Total with taxes'}</span><span id="total_with_taxes"></span><span class="currency_sign"></span></li>
+			<li><span class="total_cart">{l s='Total products'}</span><span id="total_products"></span></li>
+			<li><span class="total_cart">{l s='Total vouchers'}</span><span id="total_vouchers"></span></li>
+			<li><span class="total_cart">{l s='Total shipping'}</span><span id="total_shipping"></span></li>
+			<li><span class="total_cart">{l s='Total taxes'}</span><span id="total_taxes"></span></li>
+			<li><span class="total_cart">{l s='Total without taxes'}</span><span id="total_without_taxes"></span></li>
+			<li><span class="total_cart">{l s='Total with taxes'}</span><span id="total_with_taxes"></span></li>
 		</ul>
 	</div>
 	<div class="order_message_right">
diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
index 5e8d4e00d..98e1aeda6 100755
--- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
@@ -41,7 +41,7 @@
 				<div class="margin-form">
 					<select id="id_category" name="id_category">
 						{foreach from=$categories item='category'}
-						<option value="{$category.id_category}">{$category.name}</option>
+						<option value="{$category.id_category|intval}">({$category.id_category|intval}) {$category.name}</option>
 						{/foreach}
 					</select>
 					<a class="button bt-icon" href="#" id="add_condition_category">
diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
index 98bc9ef4b..90ccc6ef2 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
@@ -54,7 +54,7 @@ $(document).ready(function() {
 </div>
 
 <div class="margin-form">
-<input type="submit" id="_form_submit_btn" value="{l s='Save'}" name="submitChangestate" class="button" style="display: none;">
+<input type="submit" id="{$table}_form_submit_btn" value="{l s='Save'}" name="submitChangestate" class="button" style="display: none;">
 </div>
 {/if}
 {/block}
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index ed77b5c40..8543ee688 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -192,7 +192,7 @@
 									{/if}
 								{elseif $input.type == 'radio'}
 									{foreach $input.values as $value}
-										<input type="radio"	name="{$input.name}"id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
+										<input type="radio" name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
 												{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
 												{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
 										<label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}">
diff --git a/classes/Cart.php b/classes/Cart.php
index 964b83e26..d363905dd 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -430,7 +430,7 @@ class CartCore extends ObjectModel
 						product_shop.`available_for_order`, product_shop.`price`, product_shop.`active`, product_shop.`unity`, product_shop.`unit_price_ratio`, 
 						stock.`quantity` AS quantity_available, p.`width`, p.`height`, p.`depth`, stock.`out_of_stock`, p.`weight`,
 						p.`date_add`, p.`date_upd`, IFNULL(stock.quantity, 0) as quantity, pl.`link_rewrite`, cl.`link_rewrite` AS category,
-						CONCAT(cp.`id_product`, IFNULL(cp.`id_product_attribute`, 0), IFNULL(cp.`id_address_delivery`, 0)) AS unique_id, cp.id_address_delivery,
+						CONCAT(LPAD(cp.`id_product`, 10, 0), LPAD(IFNULL(cp.`id_product_attribute`, 0), 10, 0), IFNULL(cp.`id_address_delivery`, 0)) AS unique_id, cp.id_address_delivery,
 						product_shop.`wholesale_price`, product_shop.advanced_stock_management, ps.product_supplier_reference supplier_reference');
 
 		// Build FROM
@@ -1677,6 +1677,7 @@ class CartCore extends ObjectModel
 				$warehouse_count_by_address[$product['id_address_delivery']][$warehouse['id_warehouse']]++;
 			}
 		}
+		unset($product);
 
 		arsort($warehouse_count_by_address);
 
@@ -1694,9 +1695,12 @@ class CartCore extends ObjectModel
 			$id_warehouse = 0;
 			foreach ($warehouse_count_by_address[$product['id_address_delivery']] as $id_war => $val)
 			{
-				$product['carrier_list'] = array_merge($product['carrier_list'], Carrier::getAvailableCarrierList(new Product($product['id_product']), $id_war, $product['id_address_delivery'], null, $this));
-				if (in_array((int)$id_war, $product['warehouse_list']) && $id_warehouse == 0)
-					$id_warehouse = (int)$id_war;
+				if (in_array((int)$id_war, $product['warehouse_list']))
+				{
+					$product['carrier_list'] = array_merge($product['carrier_list'], Carrier::getAvailableCarrierList(new Product($product['id_product']), $id_war, $product['id_address_delivery'], null, $this));
+					if (!$id_warehouse)
+						$id_warehouse = (int)$id_war;
+				}
 			}
 
 			if (!isset($grouped_by_warehouse[$product['id_address_delivery']]['in_stock'][$id_warehouse]))
@@ -1715,6 +1719,7 @@ class CartCore extends ObjectModel
 
 			$grouped_by_warehouse[$product['id_address_delivery']][$key][$id_warehouse][] = $product;
 		}
+		unset($product);
 
 		// Step 3 : grouped product from grouped_by_warehouse by available carriers
 		$grouped_by_carriers = array();
@@ -1733,7 +1738,6 @@ class CartCore extends ObjectModel
 				{
 					if (!isset($grouped_by_carriers[$id_address_delivery][$key][$id_warehouse]))
 						$grouped_by_carriers[$id_address_delivery][$key][$id_warehouse] = array();
-
 					foreach ($product_list as $product)
 					{
 						$package_carriers_key = implode(',', $product['carrier_list']);
@@ -1798,7 +1802,6 @@ class CartCore extends ObjectModel
 									);
 								$package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['carrier_list'] =
 									array_intersect($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['carrier_list'], $data['carrier_list']);
-
 								$package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['product_list'] =
 									array_merge($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['product_list'], $data['product_list']);
 
diff --git a/classes/Category.php b/classes/Category.php
index a5fea0fbd..f787cce56 100644
--- a/classes/Category.php
+++ b/classes/Category.php
@@ -107,8 +107,8 @@ class CategoryCore extends ObjectModel
 			'date_upd' => 			array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
 
 			// Lang fields
-			'name' => 				array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 64),
-			'link_rewrite' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 64),
+			'name' => 				array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 128),
+			'link_rewrite' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 128),
 			'description' => 		array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
 			'meta_title' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
 			'meta_description' => 	array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
diff --git a/classes/Currency.php b/classes/Currency.php
index bf9cca614..af07ba30d 100644
--- a/classes/Currency.php
+++ b/classes/Currency.php
@@ -188,8 +188,9 @@ class CurrencyCore extends ObjectModel
 			4 => array('left' => '', 'right' => &$formated_strings['right']),
 			5 => array('left' => '', 'right' => &$formated_strings['right'])
 		);
-
-		return ($formats[$this->format][$side]);
+		if (isset($formats[$this->format][$side]))
+			return ($formats[$this->format][$side]);
+		return $this->sign;
 	}
 
 	/**
diff --git a/classes/FeatureValue.php b/classes/FeatureValue.php
index 9ad101f95..97b07476e 100644
--- a/classes/FeatureValue.php
+++ b/classes/FeatureValue.php
@@ -128,34 +128,44 @@ class FeatureValueCore extends ObjectModel
 				return $tab['value'];
 	}
 
-	public static function addFeatureValueImport($id_feature, $name)
+	public static function addFeatureValueImport($id_feature, $value, $id_product = null, $id_lang = null)
 	{
-		$rq = Db::getInstance()->executeS('
-			SELECT fv.`id_feature_value`
-			FROM '._DB_PREFIX_.'feature_value fv
-			LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl
-				ON (fvl.`id_feature_value` = fv.`id_feature_value`)
-			WHERE `value` = \''.pSQL($name).'\'
-				AND fv.`id_feature` = '.(int)$id_feature.'
-			GROUP BY fv.`id_feature_value` LIMIT 1
-		');
-
-		if (!isset($rq[0]['id_feature_value']) || !$id_feature_value = (int)$rq[0]['id_feature_value'])
+		if (!is_null($id_product) && $id_product)
 		{
-			// Feature doesn't exist, create it
-			$feature_value = new FeatureValue();
+			$id_feature_value = Db::getInstance()->getValue('
+				SELECT `id_feature_value`
+				FROM '._DB_PREFIX_.'feature_product
+				WHERE `id_feature` = '.(int)$id_feature.'
+				AND `id_product` = '.(int)$id_product);
 
-			$languages = Language::getLanguages();
-			foreach ($languages as $language)
-				$feature_value->value[$language['id_lang']] = strval($name);
-
-			$feature_value->id_feature = (int)$id_feature;
-			$feature_value->custom = 1;
-			$feature_value->add();
-
-			return (int)$feature_value->id;
+			if ($id_feature_value && !is_null($id_lang) && $id_lang)
+				Db::getInstance()->execute('
+				UPDATE '._DB_PREFIX_.'feature_value_lang 
+				SET `value` = \''.pSQL($value).'\' 
+				WHERE `id_feature_value` = '.(int)$id_feature_value.' 
+				AND `id_lang` = '.(int)$id_lang);
 		}
-		return (int)$id_feature_value;
+		else
+			$id_feature_value = Db::getInstance()->getValue('
+				SELECT fv.`id_feature_value`
+				FROM '._DB_PREFIX_.'feature_value fv
+				LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.`id_feature_value` = fv.`id_feature_value`)
+				WHERE `value` = \''.pSQL($value).'\'
+				AND fv.`id_feature` = '.(int)$id_feature.'
+				GROUP BY fv.`id_feature_value`');
+
+		if ($id_feature_value)
+			return (int)$id_feature_value;
+
+		// Feature doesn't exist, create it
+		$feature_value = new FeatureValue();
+		$feature_value->id_feature = (int)$id_feature;
+		$feature_value->custom = 0;
+		foreach (Language::getLanguages() as $language)
+			$feature_value->value[$language['id_lang']] = $value;
+		$feature_value->add();
+
+		return (int)$feature_value->id;
 	}
 
 	public function add($autodate = true, $nullValues = false)
diff --git a/classes/GroupReduction.php b/classes/GroupReduction.php
index 599342844..e258d88fa 100644
--- a/classes/GroupReduction.php
+++ b/classes/GroupReduction.php
@@ -137,6 +137,7 @@ class GroupReductionCore extends ObjectModel
 			SELECT `reduction`
 			FROM `'._DB_PREFIX_.'product_group_reduction_cache`
 			WHERE `id_product` = '.(int)$id_product.' AND `id_group` = '.(int)$id_group);
+		// Should return string (decimal in database) and not a float
 		return self::$reduction_cache[$id_product.'-'.$id_group];
 	}
 
diff --git a/classes/Language.php b/classes/Language.php
index 8aa65596d..ce3762ab2 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -688,26 +688,28 @@ class LanguageCore extends ObjectModel
 		if (Language::getIdByIso($iso_code))
 			return true;
 
+		// Initialize the language
 		$lang = new Language();
 		$lang->iso_code = $iso_code;
+		$lang->language_code = $iso_code;
 		$lang->active = true;
 
+		// If the language pack has not been provided, retrieve it from prestashop.com
 		if (!$lang_pack)
 			$lang_pack = Tools::jsonDecode(Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='._PS_VERSION_.'&iso_lang='.$iso_code));
 
+		// If a language pack has been found or provided, prefill the language object with the value
 		if ($lang_pack)
-		{
-			if (isset($lang_pack->name)
-				&& isset($lang_pack->version)
-				&& isset($lang_pack->iso_code))
-					$lang->name = $lang_pack->name;
-		}
-		elseif ($params_lang !== null && is_array($params_lang))
+			foreach (get_object_vars($lang_pack) as $key => $value)
+				if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
+					$lang->$key = $value;
+
+		// Use the values given in parameters to override the data retrieved automatically
+		if ($params_lang !== null && is_array($params_lang))
 			foreach ($params_lang as $key => $value)
-				$lang->$key = $value;
-		else
-			return false;
-		
+				if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
+					$lang->$key = $value;
+
 		if (!$lang->add(true, false, $only_add))
 			return false;
 
@@ -725,7 +727,7 @@ class LanguageCore extends ObjectModel
 		}
 		else
 			Language::_copyNoneFlag((int)$lang->id);
-	
+
 		$files_copy = array(
 			'/en.jpg',
 			'/en-default-'.ImageType::getFormatedName('thickbox').'.jpg',
@@ -735,7 +737,7 @@ class LanguageCore extends ObjectModel
 			'/en-default-'.ImageType::getFormatedName('small').'.jpg',
 			'/en-default-'.ImageType::getFormatedName('scene').'.jpg'
 		);
-		
+
 		foreach (array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_) as $to)
 			foreach ($files_copy as $file)
 				@copy(dirname(__FILE__).'/../img/l'.$file, $to.str_replace('/en', '/'.$iso_code, $file));
diff --git a/classes/Product.php b/classes/Product.php
index a5eb361ec..1e9d38356 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -1368,8 +1368,8 @@ class ProductCore extends ObjectModel
 			}
 
 			$product_supplier->product_supplier_reference = pSQL($supplier_reference);
-			$product_supplier->product_supplier_price_te = (float)$price;
-			$product_supplier->id_currency = (int)$id_currency;
+			$product_supplier->product_supplier_price_te = !is_null($price) ? (float)$price : (float)$product_supplier->product_supplier_price_te;
+			$product_supplier->id_currency = !is_null($id_currency) ? (int)$id_currency : (int)$product_supplier->id_currency;
 			$product_supplier->save();
 		}
 	}
@@ -2509,7 +2509,7 @@ class ProductCore extends ObjectModel
 		$id_state = 0;
 		$zipcode = 0;
 
-		if (!$id_address)
+		if (!$id_address && Validate::isLoadedObject($cur_cart))
 			$id_address = $cur_cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')};
 
 		if ($id_address)
@@ -2720,8 +2720,7 @@ class ProductCore extends ObjectModel
 		if ($use_group_reduction)
 		{
 			$reduction_from_category = GroupReduction::getValueForProduct($id_product, $id_group);
-
-			if (!empty($reduction_from_category) && (float)$reduction_from_category == 0)
+			if ($reduction_from_category !== false)
 				$price -= $price * (float)$reduction_from_category;
 			else // apply group reduction if there is no group reduction for this category
 				$price *= ((100 - Group::getReductionByIdGroup($id_group)) / 100);
@@ -3160,8 +3159,9 @@ class ProductCore extends ObjectModel
 				LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (p.`id_manufacturer`= m.`id_manufacturer`)
 				'.Product::sqlStock('p', 0).'
 				WHERE `id_product_1` = '.(int)$this->id.
-				($active ? ' AND product_shop.`active` = 1' : '').'
+				($active ? ' AND product_shop.`active` = 1 AND product_shop.`visibility` != \'none\'' : '').'
 				GROUP BY product_shop.id_product';
+
 		if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql))
 			return false;
 		foreach ($result as &$row)
diff --git a/classes/ProductSale.php b/classes/ProductSale.php
index 2f8166a4d..2e6d2973c 100644
--- a/classes/ProductSale.php
+++ b/classes/ProductSale.php
@@ -103,7 +103,7 @@ class ProductSaleCore
 				LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`)
 				'.Product::sqlStock('p').'
 				WHERE product_shop.`active` = 1
-					AND p.`visibility` != \'none\'
+					AND product_shop.`visibility` != \'none\'
 					AND p.`id_product` IN (
 						SELECT cp.`id_product`
 						FROM `'._DB_PREFIX_.'category_group` cg
@@ -156,7 +156,7 @@ class ProductSaleCore
 					ON cl.`id_category` = product_shop.`id_category_default`
 					AND cl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('cl').'
 				WHERE product_shop.`active` = 1
-					AND p.`visibility` != \'none\'
+					AND product_shop.`visibility` != \'none\'
 					AND p.`id_product` IN (
 						SELECT cp.`id_product`
 						FROM `'._DB_PREFIX_.'category_group` cg
diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php
index 27475c771..11e67f1f5 100644
--- a/classes/SpecificPrice.php
+++ b/classes/SpecificPrice.php
@@ -169,7 +169,8 @@ class SpecificPriceCore extends ObjectModel
 
 	    $priority = SpecificPrice::getPriority($id_product);
 	    foreach (array_reverse($priority) as $k => $field)
-			$select .= ' IF (`'.bqSQL($field).'` = '.(int)$$field.', '.pow(2, $k + 1).', 0) + ';
+			if (!empty($field))
+				$select .= ' IF (`'.bqSQL($field).'` = '.(int)$$field.', '.pow(2, $k + 1).', 0) + ';
 
 	    return rtrim($select, ' +').') AS `score`';
 	}
@@ -228,7 +229,7 @@ class SpecificPriceCore extends ObjectModel
 					(`to` = \'0000-00-00 00:00:00\' OR \''.$now.'\' <= `to`)
 				)
 				AND id_cart IN (0, '.(int)$id_cart.')'.
-				(($real_quantity != 0 && !Configuration::get('PS_QTY_DISCOUNT_ON_COMBINATION')) ? ' AND IF(`from_quantity` > 1, `from_quantity`, 0) <= IF(id_product_attribute=0,'.(int)$quantity.' ,'.(int)$real_quantity.')' : 'AND `from_quantity` <= '.(int)$real_quantity).'
+				(($real_quantity != 0 && !Configuration::get('PS_QTY_DISCOUNT_ON_COMBINATION')) ? ' AND IF(`from_quantity` > 1, `from_quantity`, 0) <= IF(id_product_attribute=0,'.(int)$quantity.' ,'.(int)$real_quantity.')' : 'AND `from_quantity` <= '.max(1, (int)$real_quantity)).'
 				ORDER BY `id_product_attribute` DESC, `from_quantity` DESC, `id_specific_price_rule` ASC, `score` DESC');
 		}
 		return self::$_specificPriceCache[$key];
@@ -301,7 +302,7 @@ class SpecificPriceCore extends ObjectModel
 			if (!isset($last_quantity[(int)$specific_price['id_product_attribute']]))
 				 $last_quantity[(int)$specific_price['id_product_attribute']] = $specific_price['from_quantity'];
 			elseif ($last_quantity[(int)$specific_price['id_product_attribute']] == $specific_price['from_quantity'])
-		        break;
+		        continue;
 
 			$last_quantity[(int)$specific_price['id_product_attribute']] = $specific_price['from_quantity'];
             if ($specific_price['from_quantity'] > 1)
diff --git a/classes/SpecificPriceRule.php b/classes/SpecificPriceRule.php
index 99b9f674d..9213b7cff 100755
--- a/classes/SpecificPriceRule.php
+++ b/classes/SpecificPriceRule.php
@@ -183,7 +183,7 @@ class SpecificPriceRuleCore extends ObjectModel
 
 		if ($conditions_group)
 		{
-			$where .= ' AND (';
+			$where .= ' AND ((';
 			foreach ($conditions_group as $id_condition_group => $condition_group)
 			{
 				$fields = array(
@@ -235,7 +235,7 @@ class SpecificPriceRuleCore extends ObjectModel
 				
 				$where = rtrim($where, ' AND ').') OR (';
 			}
-			$where = rtrim($where, 'OR (');
+			$where = rtrim($where, 'OR (').')';
 		}
 		if ($products && count($products))
 			$where .= ' AND p.id_product IN ('.implode(', ', array_map('intval', $products)).')';
@@ -267,7 +267,7 @@ class SpecificPriceRuleCore extends ObjectModel
 	public static function applyRuleToProduct($id_rule, $id_product, $id_product_attribute = null)
 	{
 		$rule = new SpecificPriceRule((int)$id_rule);
-		if (!Validate::isLoadedObject($rule))
+		if (!Validate::isLoadedObject($rule) || !$id_product)
 			return false;
 
 		$specific_price = new SpecificPrice();
diff --git a/classes/Tag.php b/classes/Tag.php
index 5386ff895..3b57de7b2 100644
--- a/classes/Tag.php
+++ b/classes/Tag.php
@@ -40,7 +40,7 @@ class TagCore extends ObjectModel
 		'primary' => 'id_tag',
 		'fields' => array(
 			'id_lang' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
-			'name' => 		array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true),
+			'name' => 		array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 32),
 		),
 	);
 
@@ -100,22 +100,24 @@ class TagCore extends ObjectModel
 	 		$tag_list = array_filter(array_unique(array_map('trim', preg_split('#\\'.$separator.'#', $tag_list, null, PREG_SPLIT_NO_EMPTY))));
 
 	 	$list = array();
-		foreach ($tag_list as $tag)
-		{
-	 	 	if (!Validate::isGenericName($tag))
-	 	 		return false;
-			$tag_obj = new Tag(null, trim($tag), (int)$id_lang);
-
-			/* Tag does not exist in database */
-			if (!Validate::isLoadedObject($tag_obj))
+		if (is_array($tag_list))
+			foreach ($tag_list as $tag)
 			{
-				$tag_obj->name = trim($tag);
-				$tag_obj->id_lang = (int)$id_lang;
-				$tag_obj->add();
+		 	 	if (!Validate::isGenericName($tag))
+		 	 		return false;
+				$tag = trim(substr($tag, 0, self::$definition['fields']['name']['size']));
+				$tag_obj = new Tag(null, $tag, (int)$id_lang);
+	
+				/* Tag does not exist in database */
+				if (!Validate::isLoadedObject($tag_obj))
+				{
+					$tag_obj->name = $tag;
+					$tag_obj->id_lang = (int)$id_lang;
+					$tag_obj->add();
+				}
+				if (!in_array($tag_obj->id, $list))
+					$list[] = $tag_obj->id;
 			}
-			if (!in_array($tag_obj->id, $list))
-				$list[] = $tag_obj->id;
-		}
 		$data = '';
 		foreach ($list as $tag)
 			$data .= '('.(int)$tag.','.(int)$id_product.'),';
diff --git a/classes/Tools.php b/classes/Tools.php
index 3634d61a4..1d18ccefb 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -494,6 +494,20 @@ class ToolsCore
 		if (($is_negative = ($price < 0)))
 			$price *= -1;
 		$price = Tools::ps_round($price, $c_decimals);
+
+		/*
+		* If the language is RTL and the selected currency format contains spaces as thousands separator
+		* then the number will be printed in reverse since the space is interpreted as separating words.
+		* To avoid this we replace the currency format containing a space with the one containing a comma (,) as thousand
+		* separator when the language is RTL.
+		*
+		* TODO: This is not ideal, a currency format should probably be tied to a language, not to a currency.
+		*/
+		if(($c_format == 2) && ($context->language->is_rtl == 1))
+		{
+			$c_format = 4;
+		}
+
 		switch ($c_format)
 		{
 			/* X 0,000.00 */
@@ -512,9 +526,9 @@ class ToolsCore
 			case 4:
 				$ret = number_format($price, $c_decimals, '.', ',').$blank.$c_char;
 				break;
-			/* 0 000.00 X  Added for the switzerland currency */
+			/* 0'000.00 X  Added for the switzerland currency */
 			case 5:
-				$ret = number_format($price, $c_decimals, '.', ' ').$blank.$c_char;
+				$ret = number_format($price, $c_decimals, '.', "'").$blank.$c_char;
 				break;
 		}
 		if ($is_negative)
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 9031a3558..2c0284773 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -654,7 +654,7 @@ class AdminControllerCore extends Controller
 			'export_content' => $content
 			)
 		);
-			
+
 		$this->layout = 'layout-export.tpl';
 	}
 
@@ -2112,6 +2112,7 @@ class AdminControllerCore extends Controller
 	 */
 	public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false)
 	{
+
 		if (!isset($this->list_id))
 			$this->list_id = $this->table;
 
@@ -2166,12 +2167,20 @@ class AdminControllerCore extends Controller
 			$order_by = $this->fields_list[$order_by]['order_key'];
 
 		/* Determine offset from current page */
+
+		
 		if ((isset($_POST['submitFilter'.$this->list_id]) ||
 		isset($_POST['submitFilter'.$this->list_id.'_x']) ||
 		isset($_POST['submitFilter'.$this->list_id.'_y'])) &&
 		!empty($_POST['submitFilter'.$this->list_id]) &&
 		is_numeric($_POST['submitFilter'.$this->list_id]))
 			$start = ((int)$_POST['submitFilter'.$this->list_id] - 1) * $limit;
+		elseif (empty($start) && isset($this->context->cookie->{$this->list_id.'_start'}) && Tools::isSubmit('export'.$this->table))
+			$start = $this->context->cookie->{$this->list_id.'_start'};
+		else
+			$start = 0;
+
+		$this->context->cookie->{$this->list_id.'_start'} = $start;
 
 		/* Cache */
 		$this->_lang = (int)$id_lang;
@@ -2241,8 +2250,6 @@ class AdminControllerCore extends Controller
 				$having_clause .= $this->_having.' ';
 		}
 
-
-
 		$this->_listsql = '
 		SELECT SQL_CALC_FOUND_ROWS
 		'.($this->_tmpTableFilter ? ' * FROM (SELECT ' : '');
@@ -2464,8 +2471,27 @@ class AdminControllerCore extends Controller
 					$this->errors[$field] = $error;
 		}
 
+
 		/* Overload this method for custom checking */
 		$this->_childValidation();
+
+		/* Checking for multilingual fields validity */
+		if (isset($rules['validateLang']) && is_array($rules['validateLang']))
+			foreach ($rules['validateLang'] as $field_lang => $function)
+				foreach ($languages as $language)
+					if (($value = Tools::getValue($field_lang.'_'.$language['id_lang'])) !== false && !empty($value))
+					{
+						if (Tools::strtolower($function) == 'iscleanhtml' && Configuration::get('PS_ALLOW_HTML_IFRAME'))
+							$res = Validate::$function($value, true);
+						else
+							$res = Validate::$function($value);
+						if (!$res)
+							$this->errors[$field_lang.'_'.$language['id_lang']] = sprintf(
+								Tools::displayError('The %1$s field (%2$s) is invalid.'),
+								call_user_func(array($class_name, 'displayFieldName'), $field_lang, $class_name),
+								$language['name']
+							);
+					}
 	}
 
 	/**
diff --git a/classes/controller/ModuleFrontController.php b/classes/controller/ModuleFrontController.php
index f2db4a085..437fad571 100644
--- a/classes/controller/ModuleFrontController.php
+++ b/classes/controller/ModuleFrontController.php
@@ -60,7 +60,7 @@ class ModuleFrontControllerCore extends FrontController
 		elseif (Tools::file_exists_cache($this->getTemplatePath().$template))
 			$this->template = $this->getTemplatePath().$template;
 		else
-			throw new PrestaShopException("Template '$template'' not found");
+			throw new PrestaShopException("Template '$template' not found");
 	}
 
 	/**
diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index 826502bc0..123974da1 100755
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -27,7 +27,7 @@
 class HelperCore
 {
 	public $currentIndex;
-	public $table;
+	public $table = 'configuration';
 	public $identifier;
 	public $token;
 	public $toolbar_btn;
diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php
index 3aa90447f..06505ecd0 100644
--- a/classes/helper/HelperForm.php
+++ b/classes/helper/HelperForm.php
@@ -37,8 +37,6 @@ class HelperFormCore extends Helper
 
 	/** @var array values of form fields */
 	public $fields_value = array();
-
-	public $table = 'configuration';
 	public $name_controller = '';
 
 	/** @var string if not null, a title will be added on that list */
diff --git a/classes/module/Module.php b/classes/module/Module.php
index 96e883d19..9ddea6f73 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1730,7 +1730,7 @@ abstract class ModuleCore
 	{
 		Tools::enableCache();
 		if ($cache_id === null)
-			$cache_id = Module::getCacheId($this->name);
+			$cache_id = $this->name;
 		Tools::clearCache(Context::getContext()->smarty, $this->getTemplatePath($template), $cache_id, $compile_id);
 		Tools::restoreCacheSettings();
 	}
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index 31614f2c5..4e4e0d2ab 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -243,7 +243,7 @@ class OrderInvoiceCore extends ObjectModel
 		WHERE od.`id_order` = '.(int)$this->id_order.'
 		AND od.`id_order_invoice` = '.(int)$this->id.'
 		AND od.`tax_computation_method` = '.(int)TaxCalculator::ONE_AFTER_ANOTHER_METHOD
-		);
+		) || Configuration::get('PS_INVOICE_TAXES_BREAKDOWN');
 	}
 
 	/**
@@ -301,7 +301,7 @@ class OrderInvoiceCore extends ObjectModel
 		{
 			// sum by order details in order to retrieve real taxes rate
 			$taxes_infos = Db::getInstance()->executeS('
-			SELECT odt.`id_order_detail`, t.`rate` AS `name`, SUM(od.`total_price_tax_excl`) AS total_price_tax_excl, SUM(t.`rate`) AS rate, SUM(`total_amount`) AS `total_amount`, od.`ecotax`, od.`ecotax_tax_rate`, od.`product_quantity`
+			SELECT odt.`id_order_detail`, t.`rate` AS `name`, od.`total_price_tax_excl` AS total_price_tax_excl, SUM(t.`rate`) AS rate, SUM(`total_amount`) AS `total_amount`, od.`ecotax`, od.`ecotax_tax_rate`, od.`product_quantity`
 			FROM `'._DB_PREFIX_.'order_detail_tax` odt
 			LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = odt.`id_tax`)
 			LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = odt.`id_order_detail`)
diff --git a/classes/order/OrderPayment.php b/classes/order/OrderPayment.php
index 7d2d71bd8..8d0b3b9d8 100644
--- a/classes/order/OrderPayment.php
+++ b/classes/order/OrderPayment.php
@@ -49,7 +49,7 @@ class OrderPaymentCore extends ObjectModel
 			'id_currency' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'amount' => 			array('type' => self::TYPE_FLOAT, 'validate' => 'isNegativePrice', 'required' => true),
 			'payment_method' => 	array('type' => self::TYPE_STRING, 'validate' => 'isGenericName'),
-			'conversion_rate' => 	array('type' => self::TYPE_INT, 'validate' => 'isFloat'),
+			'conversion_rate' => 	array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
 			'transaction_id' => 	array('type' => self::TYPE_STRING, 'validate' => 'isAnything', 'size' => 254),
 			'card_number' => 		array('type' => self::TYPE_STRING, 'validate' => 'isAnything', 'size' => 254),
 			'card_brand' => 		array('type' => self::TYPE_STRING, 'validate' => 'isAnything', 'size' => 254),
diff --git a/classes/pdf/HTMLTemplateDeliverySlip.php b/classes/pdf/HTMLTemplateDeliverySlip.php
index b5ea014fe..7a3c2cdc5 100755
--- a/classes/pdf/HTMLTemplateDeliverySlip.php
+++ b/classes/pdf/HTMLTemplateDeliverySlip.php
@@ -90,7 +90,7 @@ class HTMLTemplateDeliverySlipCore extends HTMLTemplate
 	 */
 	public function getFilename()
 	{
-		return Configuration::get('PS_DELIVERY_PREFIX', Context::getContext()->language->id, null, $this->order->id_shop).sprintf('%06d', $this->order->invoice_number).'.pdf';
+		return Configuration::get('PS_DELIVERY_PREFIX', Context::getContext()->language->id, null, $this->order->id_shop).sprintf('%06d', $this->order->delivery_number).'.pdf';
 	}
 }
 
diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php
index 2dca1bdb3..5e4ec0b3f 100644
--- a/classes/webservice/WebserviceRequest.php
+++ b/classes/webservice/WebserviceRequest.php
@@ -1187,7 +1187,7 @@ class WebserviceRequestCore
 				else
 				{
 					$object = new $this->resourceConfiguration['retrieveData']['className']();
-					if ($object->isMultiShopField($this->resourceConfiguration['fields'][$fieldName]['sqlId']))
+					if ($object->isMultiShopField($this->resourceConfiguration['fields'][$fieldName]['sqlId']) || $fieldName == 'id')
 						$table_alias = 'multi_shop_'.$this->resourceConfiguration['retrieveData']['table'];
 					else
 						$table_alias = '';
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index 80d665edb..2ddc03360 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -264,7 +264,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 			'input' => array(
 				array(
 					'type' => 'select',
-					'label' => $this->l('Attribute type:'),
+					'label' => $this->l('Attribute group:'),
 					'name' => 'id_attribute_group',
 					'required' => true,
 					'options' => array(
@@ -272,7 +272,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 						'id' => 'id_attribute_group',
 						'name' => 'name'
 					),
-					'desc' => $this->l('Choose the type of the attribute')
+					'desc' => $this->l('Choose the group of the attribute')
 				),
 				array(
 					'type' => 'text',
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index b4c5bf35c..32e01834a 100755
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -684,18 +684,21 @@ class AdminCartsControllerCore extends AdminController
 					$free_shipping = true;
 					break;
 				}
-		return array('summary' => $this->getCartSummary(),
-						'delivery_option_list' => $this->getDeliveryOptionList(),
-						'cart' => $this->context->cart,
-						'addresses' => $this->context->customer->getAddresses((int)$this->context->cart->id_lang),
-						'id_cart' => $id_cart,
-						'order_message' => $message_content,
-						'link_order' => $this->context->link->getPageLink(
-							'order', false,
-							(int)$this->context->cart->id_lang,
-							'step=3&recover_cart='.$id_cart.'&token_cart='.md5(_COOKIE_KEY_.'recover_cart_'.$id_cart)),
-						'free_shipping' => (int)$free_shipping
-						);
+		return array(
+			'summary' => $this->getCartSummary(),
+			'delivery_option_list' => $this->getDeliveryOptionList(),
+			'cart' => $this->context->cart,
+			'currency' => new Currency($this->context->cart->id_currency),
+			'addresses' => $this->context->customer->getAddresses((int)$this->context->cart->id_lang),
+			'id_cart' => $id_cart,
+			'order_message' => $message_content,
+			'link_order' => $this->context->link->getPageLink(
+				'order', false,
+				(int)$this->context->cart->id_lang,
+				'step=3&recover_cart='.$id_cart.'&token_cart='.md5(_COOKIE_KEY_.'recover_cart_'.$id_cart)
+			),
+			'free_shipping' => (int)$free_shipping
+		);
 	}
 
 	public function initToolbar()
diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php
index bf8690b64..0d7c7fc4f 100644
--- a/controllers/admin/AdminCurrenciesController.php
+++ b/controllers/admin/AdminCurrenciesController.php
@@ -151,7 +151,7 @@ class AdminCurrenciesControllerCore extends AdminController
 							array('key' => 2, 'name' => '0 000,00X ('.$this->l('as with Euros').')'),
 							array('key' => 3, 'name' => 'X0.000,00'),
 							array('key' => 4, 'name' => '0,000.00X'),
-							array('key' => 5, 'name' => '0 000.00X') // Added for the switzerland currency
+							array('key' => 5, 'name' => '0\'000.00X') // Added for the switzerland currency
 						),
 						'name' => 'name',
 						'id' => 'key'
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 06dc11148..11ff2d8c2 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -293,6 +293,7 @@ class AdminImportControllerCore extends AdminController
 			case $this->entities[$this->l('Addresses')]:
 				//Overwrite required_fields
 				$this->required_fields = array(
+					'alias',
 					'lastname',
 					'firstname',
 					'address1',
@@ -307,7 +308,7 @@ class AdminImportControllerCore extends AdminController
 					'id' => array('label' => $this->l('ID')),
 					'alias' => array('label' => $this->l('Alias *')),
 					'active' => array('label' => $this->l('Active  (0/1)')),
-					'customer_email' => array('label' => $this->l('Customer email')),
+					'customer_email' => array('label' => $this->l('Customer email *')),
 					'id_customer' => array('label' => $this->l('Customer ID:')),
 					'manufacturer' => array('label' => $this->l('Manufacturer')),
 					'supplier' => array('label' => $this->l('Supplier')),
@@ -316,7 +317,7 @@ class AdminImportControllerCore extends AdminController
 					'firstname' => array('label' => $this->l('First Name *')),
 					'address1' => array('label' => $this->l('Address 1 *')),
 					'address2' => array('label' => $this->l('Address 2')),
-					'postcode' => array('label' => $this->l('Postal code / Zipcode*')),
+					'postcode' => array('label' => $this->l('Postal code / Zipcode *')),
 					'city' => array('label' => $this->l('City *')),
 					'country' => array('label' => $this->l('Country *')),
 					'state' => array('label' => $this->l('State')),
@@ -426,7 +427,7 @@ class AdminImportControllerCore extends AdminController
 					
 			}
 
-		$this->separator = strval(trim(Tools::getValue('separator', ';')));
+		$this->separator = substr(strval(trim(Tools::getValue('separator', ';'))), 0, 1);
 
 		if (is_null(Tools::getValue('multiple_value_separator')) || trim(Tools::getValue('multiple_value_separator')) == '')
 			$this->multiple_value_separator = ',';
@@ -469,14 +470,26 @@ class AdminImportControllerCore extends AdminController
 		if (isset($this->entities[$this->l(Tools::ucfirst(Tools::getValue('import_type')))]))
 		{
 			$entity_selected = $this->entities[$this->l(Tools::ucfirst(Tools::getValue('import_type')))];
-			$this->context->cookie->entity_selected = $entity_selected;
+			$this->context->cookie->entity_selected = (int)$entity_selected;
 		}
 		elseif (isset($this->context->cookie->entity_selected))
 			$entity_selected = (int)$this->context->cookie->entity_selected;
-		
+
 		$csv_selected = '';
 		if (isset($this->context->cookie->csv_selected))
-			$csv_selected = pSQL($this->context->cookie->csv_selected);
+			$csv_selected = base64_decode($this->context->cookie->csv_selected);
+
+		$id_lang_selected = '';
+		if (isset($this->context->cookie->iso_lang_selected) && $this->context->cookie->iso_lang_selected)
+			$id_lang_selected = (int)Language::getIdByIso(base64_decode($this->context->cookie->iso_lang_selected));
+
+		$separator_selected = '';
+		if (isset($this->context->cookie->separator_selected) && $this->context->cookie->separator_selected)
+			$separator_selected = base64_decode($this->context->cookie->separator_selected);
+
+		$multiple_value_separator_selected = '';
+		if (isset($this->context->cookie->multiple_value_separator_selected) && $this->context->cookie->multiple_value_separator_selected)
+			$multiple_value_separator_selected = base64_decode($this->context->cookie->multiple_value_separator_selected);
 
 		$this->tpl_form_vars = array(
 			'module_confirmation' => (Tools::getValue('import')) && (isset($this->warnings) && !count($this->warnings)),
@@ -484,9 +497,11 @@ class AdminImportControllerCore extends AdminController
 			'entities' => $this->entities,
 			'entity_selected' => $entity_selected,
 			'csv_selected' => $csv_selected,
+			'separator_selected' => $separator_selected,
+			'multiple_value_separator_selected' => $multiple_value_separator_selected,
 			'files_to_import' => $files_to_import,
 			'languages' => Language::getLanguages(false),
-			'id_language' => $this->context->language->id,
+			'id_language' => ($id_lang_selected) ? $id_lang_selected : $this->context->language->id,
 			'available_fields' => $this->getAvailableFields(),
 			'truncateAuthorized' => (Shop::isFeatureActive() && $this->context->employee->isSuperAdmin()) || !Shop::isFeatureActive(),
 			'PS_ADVANCED_STOCK_MANAGEMENT' => Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'),
@@ -511,10 +526,11 @@ class AdminImportControllerCore extends AdminController
 		for ($i = 0; $i < $nb_table; $i++)
 			$data[$i] = $this->generateContentTable($i, $nb_column, $handle, $this->separator);
 
-		if ($entity_selected = (int)Tools::getValue('entity'))
-			$this->context->cookie->entity_selected = $entity_selected;
-		if ($csv_selected = Tools::getValue('csv'))
-			$this->context->cookie->csv_selected = $csv_selected;
+		$this->context->cookie->entity_selected = (int)Tools::getValue('entity');
+		$this->context->cookie->iso_lang_selected = base64_encode(Tools::getValue('iso_lang'));
+		$this->context->cookie->separator_selected = base64_encode(Tools::getValue('separator'));
+		$this->context->cookie->multiple_value_separator_selected = base64_encode(Tools::getValue('multiple_value_separator'));
+		$this->context->cookie->csv_selected = base64_encode(Tools::getValue('csv'));
 
 		$this->tpl_view_vars = array(
 			'import_matchs' => Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'import_match'),
@@ -574,17 +590,12 @@ class AdminImportControllerCore extends AdminController
 		for ($i = 0; $i < $nb_column; $i++)
 			if (MAX_COLUMNS * (int)$current_table <= $i && (int)$i < MAX_COLUMNS * ((int)$current_table + 1))
 				$html .= '<th style="width: '.(900 / MAX_COLUMNS).'px; vertical-align: top; padding: 4px">
-							<select onchange="askFeatureName(this, '.$i.');"
-								style="width: '.(900 / MAX_COLUMNS).'px;"
+							<select style="width: '.(900 / MAX_COLUMNS).'px;"
 								id="type_value['.$i.']"
 								name="type_value['.$i.']"
 								class="type_value">
 								'.$this->getTypeValuesOptions($i).'
 							</select>
-							<div id="features_'.$i.'" style="display: none;">
-								<input style="width: 90px" type="text" name="" id="feature_name_'.$i.'">
-								<input type="button" value="ok" onclick="replaceFeature($(\'#feature_name_'.$i.'\').attr(\'name\'), '.$i.');">
-							</div>
 						</th>';
 		$html .= '</tr>';
 
@@ -670,7 +681,8 @@ class AdminImportControllerCore extends AdminController
 			$fd = fopen($uniqid_path, 'r');
 			$tab = fgetcsv($fd, MAX_LINE_SIZE, $separator);
 			fclose($fd);
-			unlink($uniqid_path);
+			if (file_exists($uniqid_path))
+				@unlink($uniqid_path);
 		}
 
 		if (empty($tab) || (!is_array($tab)))
@@ -868,6 +880,9 @@ class AdminImportControllerCore extends AdminController
 		$this->receiveTab();
 		$handle = $this->openCsvFile();
 		$default_language_id = (int)Configuration::get('PS_LANG_DEFAULT');
+		$id_lang = Language::getIdByIso(Tools::getValue('iso_lang'));
+		if (!Validate::isUnsignedId($id_lang))
+			$id_lang = $default_language_id;
 		AdminImportController::setLocale();
 		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++)
 		{
@@ -914,8 +929,8 @@ class AdminImportControllerCore extends AdminController
 					$category_to_create = new Category();
 					$category_to_create->name = AdminImportController::createMultiLangField($category->parent);
 					$category_to_create->active = 1;
-					$category_link_rewrite = Tools::link_rewrite($category_to_create->name[$default_language_id]);
-					$category_to_create->link_rewrite = $category_link_rewrite;
+					$category_link_rewrite = Tools::link_rewrite($category_to_create->name[$id_lang]);
+					$category_to_create->link_rewrite = AdminImportController::createMultiLangField($category_link_rewrite);
 					$category_to_create->id_parent = Configuration::get('PS_HOME_CATEGORY'); // Default parent is home for unknown category to create
 					if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true &&
 						($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add())
@@ -925,7 +940,7 @@ class AdminImportControllerCore extends AdminController
 						$this->errors[] = sprintf(
 							Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 							$category_to_create->name[$default_language_id],
-							(isset($category_to_create->id) ? $category_to_create->id : 'null')
+							(isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
 						);
 						$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 							Db::getInstance()->getMsgError();
@@ -958,7 +973,7 @@ class AdminImportControllerCore extends AdminController
 				$this->warnings[] = sprintf(
 					Tools::displayError('Rewrite link for %1$s (ID: %2$s) was re-written as %3$s.'),
 					$bak,
-					(isset($info['id']) ? $info['id'] : 'null'),
+					(isset($info['id']) && !empty($info['id']))? $info['id'] : 'null',
 					$category->link_rewrite[$default_language_id]
 				);
 			$res = false;
@@ -1006,8 +1021,8 @@ class AdminImportControllerCore extends AdminController
 			{
 				$this->errors[] = sprintf(
 					Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
-					(isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'),
-					(isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID')
+					(isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
+					(isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
 				);
 				$error_tmp = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').Db::getInstance()->getMsgError();
 				if ($error_tmp != '')
@@ -1051,6 +1066,9 @@ class AdminImportControllerCore extends AdminController
 		$this->receiveTab();
 		$handle = $this->openCsvFile();
 		$default_language_id = (int)Configuration::get('PS_LANG_DEFAULT');
+		$id_lang = Language::getIdByIso(Tools::getValue('iso_lang'));
+		if (!Validate::isUnsignedId($id_lang))
+			$id_lang = $default_language_id;
 		AdminImportController::setLocale();
 		$shop_ids = Shop::getCompleteListOfShopsID();
 		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++)
@@ -1061,13 +1079,23 @@ class AdminImportControllerCore extends AdminController
 
 			if (Tools::getValue('forceIDs') && isset($info['id']) && (int)$info['id'])
 				$product = new Product((int)$info['id']);
-			else
+			elseif (Tools::getValue('match_ref') && array_key_exists('reference', $info))
 			{
-				if (array_key_exists('id', $info) && (int)$info['id'] && Product::existsInDatabase((int)$info['id'], 'product'))
-					$product = new Product((int)$info['id']);
-				else
-					$product = new Product();
+					$datas = Db::getInstance()->getRow('
+						SELECT p.`id_product`
+						FROM `'._DB_PREFIX_.'product` p
+						'.Shop::addSqlAssociation('product', 'p').'
+						WHERE p.`reference` = "'.pSQL($info['reference']).'"
+					');
+					if (isset($datas['id_product']) && $datas['id_product'])
+						$product = new Product((int)$datas['id_product']);
+					else
+						$product = new Product();
 			}
+			elseif (array_key_exists('id', $info) && (int)$info['id'] && Product::existsInDatabase((int)$info['id'], 'product'))
+					$product = new Product((int)$info['id']);
+			else
+				$product = new Product();
 
 			if (array_key_exists('id', $info) && (int)$info['id'] && Product::existsInDatabase((int)$info['id'], 'product'))
 			{
@@ -1132,7 +1160,7 @@ class AdminImportControllerCore extends AdminController
 						$this->errors[] = sprintf(
 							Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 							$manufacturer->name,
-							(isset($manufacturer->id) ? $manufacturer->id : 'null')
+							(isset($manufacturer->id) && !empty($manufacturer->id))? $manufacturer->id : 'null'
 						);
 						$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 							Db::getInstance()->getMsgError();
@@ -1163,7 +1191,7 @@ class AdminImportControllerCore extends AdminController
 						$this->errors[] = sprintf(
 							Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 							$supplier->name,
-							(isset($supplier->id) ? $supplier->id : 'null')
+							(isset($supplier->id) && !empty($supplier->id))? $supplier->id : 'null'
 						);
 						$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 							Db::getInstance()->getMsgError();
@@ -1209,7 +1237,7 @@ class AdminImportControllerCore extends AdminController
 								$this->errors[] = sprintf(
 									Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 									$category_to_create->name[$default_language_id],
-									(isset($category_to_create->id) ? $category_to_create->id : 'null')
+									(isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
 								);
 								$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 									Db::getInstance()->getMsgError();
@@ -1241,7 +1269,7 @@ class AdminImportControllerCore extends AdminController
 								$this->errors[] = sprintf(
 									Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 									$category_to_create->name[$default_language_id],
-									(isset($category_to_create->id) ? $category_to_create->id : 'null')
+									(isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
 								);
 								$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 									Db::getInstance()->getMsgError();
@@ -1252,14 +1280,14 @@ class AdminImportControllerCore extends AdminController
 			}
 
 			$product->id_category_default = isset($product->id_category[0]) ? (int)$product->id_category[0] : '';
-
-			$link_rewrite = (is_array($product->link_rewrite) && count($product->link_rewrite)) ? trim($product->link_rewrite[$default_language_id]) : '';
+	
+			$link_rewrite = (is_array($product->link_rewrite) && isset($product->link_rewrite[$id_lang])) ? trim($product->link_rewrite[$id_lang]) : '';
 
 			$valid_link = Validate::isLinkRewrite($link_rewrite);
 
-			if ((isset($product->link_rewrite[$default_language_id]) && empty($product->link_rewrite[$default_language_id])) || !$valid_link)
+			if ((isset($product->link_rewrite[$id_lang]) && empty($product->link_rewrite[$id_lang])) || !$valid_link)
 			{
-				$link_rewrite = Tools::link_rewrite($product->name[$default_language_id]);
+				$link_rewrite = Tools::link_rewrite($product->name[$id_lang]);
 				if ($link_rewrite == '')
 					$link_rewrite = 'friendly-url-autogeneration-failed';
 			}
@@ -1267,18 +1295,20 @@ class AdminImportControllerCore extends AdminController
 			if (!$valid_link)
 				$this->warnings[] = sprintf(
 					Tools::displayError('Rewrite link for %1$s (ID: %2$s) was re-written as %3$s.'),
-					$product->name[$default_language_id],
-					(isset($info['id']) ? $info['id'] : 'null'),
+					$product->name[$id_lang],
+					(isset($info['id']) && !empty($info['id']))? $info['id'] : 'null',
 					$link_rewrite
 				);
 
-			$product->link_rewrite = AdminImportController::createMultiLangField($link_rewrite);
+			if (!Tools::getValue('match_ref') || !(is_array($product->link_rewrite) && count($product->link_rewrite) && !empty($product->link_rewrite[$id_lang])))
+				$product->link_rewrite = AdminImportController::createMultiLangField($link_rewrite);
 
 			// replace the value of separator by coma
 			if ($this->multiple_value_separator != ',')
-				foreach ($product->meta_keywords as &$meta_keyword)
-					if (!empty($meta_keyword))
-						$meta_keyword = str_replace($this->multiple_value_separator, ',', $meta_keyword);
+				if (is_array($product->meta_keywords))
+					foreach ($product->meta_keywords as &$meta_keyword)
+						if (!empty($meta_keyword))
+							$meta_keyword = str_replace($this->multiple_value_separator, ',', $meta_keyword);
 
 			// Convert comma into dot for all floating values
 			foreach (Product::$definition['fields'] as $key => $array)
@@ -1304,7 +1334,7 @@ class AdminImportControllerCore extends AdminController
 						SELECT product_shop.`date_add`, p.`id_product`
 						FROM `'._DB_PREFIX_.'product` p
 						'.Shop::addSqlAssociation('product', 'p').'
-						WHERE p.`reference` = "'.$product->reference.'"
+						WHERE p.`reference` = "'.pSQL($product->reference).'"
 					');
 					$product->id = (int)$datas['id_product'];
 					$product->date_add = pSQL($datas['date_add']);
@@ -1350,8 +1380,8 @@ class AdminImportControllerCore extends AdminController
 			{
 				$this->errors[] = sprintf(
 					Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
-					(isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'),
-					(isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID')
+					(isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
+					(isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
 				);
 				$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 					Db::getInstance()->getMsgError();
@@ -1360,7 +1390,7 @@ class AdminImportControllerCore extends AdminController
 			else
 			{
 				// Product supplier
-				if (isset($product->id_supplier) && isset($product->supplier_reference))
+				if (isset($product->id_supplier) && property_exists($product, 'supplier_reference'))
 				{
 					$id_product_supplier = ProductSupplier::getIdByProductAndSupplier((int)$product->id, 0, (int)$product->id_supplier);
 					if ($id_product_supplier)
@@ -1377,31 +1407,67 @@ class AdminImportControllerCore extends AdminController
 				}
 
 				// SpecificPrice (only the basic reduction feature is supported by the import)
-				if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0))
-				{
-					$specific_price = new SpecificPrice();
-					$specific_price->id_product = (int)$product->id;
-					// @todo multishop specific price import
-					$specific_price->id_shop = $this->context->shop->id;
-					$specific_price->id_currency = 0;
-					$specific_price->id_country = 0;
-					$specific_price->id_group = 0;
-					$specific_price->price = -1;
-					$specific_price->id_customer = 0;
-					$specific_price->from_quantity = 1;
-					$specific_price->reduction = (isset($info['reduction_price']) && $info['reduction_price']) ? $info['reduction_price'] : $info['reduction_percent'] / 100;
-					$specific_price->reduction_type = (isset($info['reduction_price']) && $info['reduction_price']) ? 'amount' : 'percentage';
-					$specific_price->from = (isset($info['reduction_from']) && Validate::isDate($info['reduction_from'])) ? $info['reduction_from'] : '0000-00-00 00:00:00';
-					$specific_price->to = (isset($info['reduction_to']) && Validate::isDate($info['reduction_to']))  ? $info['reduction_to'] : '0000-00-00 00:00:00';
-					if (!$specific_price->add())
-						$this->addProductWarning(Tools::safeOutput($info['name']), $product->id, $this->l('Discount is invalid'));
-				}
+				if (!Shop::isFeatureActive())
+					$info['shop'] = 1;
+				elseif (!isset($info['shop']) || empty($info['shop']))
+					$info['shop'] = implode($this->multiple_value_separator, Shop::getContextListShopID());
+	
+				// Get shops for each attributes
+				$info['shop'] = explode($this->multiple_value_separator, $info['shop']);
+					
+				$id_shop_list = array();
+				foreach ($info['shop'] as $shop)
+					if (!is_numeric($shop))
+						$id_shop_list[] = (int)Shop::getIdByName($shop);
+					else
+						$id_shop_list[] = $shop;
+
+					if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0))
+						foreach($id_shop_list as $id_shop)
+						{
+							$specific_price = SpecificPrice::getSpecificPrice($product->id, $id_shop, 0, 0, 0, 1, 0, 0, 0, 0);
+
+							if (is_array($specific_price))
+								$specific_price = new SpecificPrice((int)$specific_price['id_specific_price']);
+							else
+								$specific_price = new SpecificPrice();
+							$specific_price->id_product = (int)$product->id;
+							$specific_price->id_specific_price_rule = 0;
+							$specific_price->id_shop = $id_shop;
+							$specific_price->id_currency = 0;
+							$specific_price->id_country = 0;
+							$specific_price->id_group = 0;
+							$specific_price->price = -1;
+							$specific_price->id_customer = 0;
+							$specific_price->from_quantity = 1;
+							$specific_price->reduction = (isset($info['reduction_price']) && $info['reduction_price']) ? $info['reduction_price'] : $info['reduction_percent'] / 100;
+							$specific_price->reduction_type = (isset($info['reduction_price']) && $info['reduction_price']) ? 'amount' : 'percentage';
+							$specific_price->from = (isset($info['reduction_from']) && Validate::isDate($info['reduction_from'])) ? $info['reduction_from'] : '0000-00-00 00:00:00';
+							$specific_price->to = (isset($info['reduction_to']) && Validate::isDate($info['reduction_to']))  ? $info['reduction_to'] : '0000-00-00 00:00:00';
+							if (!$specific_price->save())
+								$this->addProductWarning(Tools::safeOutput($info['name']), $product->id, $this->l('Discount is invalid'));
+						}
 
 				if (isset($product->tags) && !empty($product->tags))
 				{
+					if (isset($product->id) && $product->id)
+					{
+						$tags = Tag::getProductTags($product->id);
+						if (is_array($tags) && count($tags))
+						{
+							if (!empty($product->tags))
+								$product->tags = explode($this->multiple_value_separator, $product->tags);
+							if (is_array($product->tags) && count($product->tags))
+							{
+								foreach ($product->tags as $key => $tag)
+									$product->tags[$key] = trim($tag);
+								$tags[$id_lang] = $product->tags;
+								$product->tags = $tags;
+							}
+						}
+					}
 					// Delete tags for this id product, for no duplicating error
 					Tag::deleteTagsForProduct($product->id);
-
 					if (!is_array($product->tags))
 					{
 						$product->tags = AdminImportController::createMultiLangField($product->tags);
@@ -1493,7 +1559,7 @@ class AdminImportControllerCore extends AdminController
 						if(!empty($feature_name) && !empty($feature_value))
 						{
 							$id_feature = Feature::addFeatureImport($feature_name, $position);
-							$id_feature_value = FeatureValue::addFeatureValueImport($id_feature, $feature_value);
+							$id_feature_value = FeatureValue::addFeatureValueImport($id_feature, $feature_value, $product->id, $id_lang);
 							Product::addFeatureProductImport($product->id, $id_feature, $id_feature_value);
 						}
 					}
@@ -1754,8 +1820,9 @@ class AdminImportControllerCore extends AdminController
 											null,
 											$id_shop_list
 										);
-	
 										$id_product_attribute_update = true;
+										if (isset($info['supplier_reference']) && !empty($info['supplier_reference']))
+											$product->addSupplierReference($product->id_supplier, $id_product_attribute, $info['supplier_reference']);
 									}
 								}
 							}
@@ -1781,8 +1848,10 @@ class AdminImportControllerCore extends AdminController
 								(int)$info['minimal_quantity'],
 								$id_shop_list
 							);
+							if (isset($info['supplier_reference']) && !empty($info['supplier_reference']))
+								$product->addSupplierReference($product->id_supplier, $id_product_attribute, $info['supplier_reference']);
 						}
-	
+
 						// fills our attributes array, in order to add the attributes to the product_attribute afterwards
 						if(isset($attributes[$group.'_'.$attribute]))
 							$attributes_to_add[] = (int)$attributes[$group.'_'.$attribute];
@@ -1957,7 +2026,7 @@ class AdminImportControllerCore extends AdminController
 				$this->errors[] = sprintf(
 					Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 					$info['email'],
-					(isset($info['id']) ? $info['id'] : 'null')
+					(isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
 				);
 				$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 					Db::getInstance()->getMsgError();
@@ -2054,7 +2123,7 @@ class AdminImportControllerCore extends AdminController
 							Tools::displayError('%1$s does not exist in database %2$s (ID: %3$s) cannot be saved'),
 							Db::getInstance()->getMsgError(),
 							$address->customer_email,
-							(isset($info['id']) ? $info['id'] : 'null')
+							(isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
 						);
 				}
 				else
@@ -2103,7 +2172,7 @@ class AdminImportControllerCore extends AdminController
 					$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
 						Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 						$manufacturer->name,
-						(isset($manufacturer->id) ? $manufacturer->id : 'null')
+						(isset($manufacturer->id) && !empty($manufacturer->id))? $manufacturer->id : 'null'
 					);
 					$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 						Db::getInstance()->getMsgError();
@@ -2124,7 +2193,7 @@ class AdminImportControllerCore extends AdminController
 					$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
 						Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 						$supplier->name,
-						(isset($supplier->id) ? $supplier->id : 'null')
+						(isset($supplier->id) && !empty($supplier->id))? $supplier->id : 'null'
 					);
 					$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 						Db::getInstance()->getMsgError();
@@ -2153,7 +2222,7 @@ class AdminImportControllerCore extends AdminController
 							$this->errors[] = sprintf(
 								Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 								$info['alias'],
-								(isset($info['id']) ? $info['id'] : 'null')
+								(isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
 							);
 					}
 				}
@@ -2170,7 +2239,7 @@ class AdminImportControllerCore extends AdminController
 				$this->errors[] = sprintf(
 					Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
 					$info['alias'],
-					(isset($info['id']) ? $info['id'] : 'null')
+					(isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
 				);
 				$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 					Db::getInstance()->getMsgError();
@@ -2240,8 +2309,8 @@ class AdminImportControllerCore extends AdminController
 			{
 				$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
 					Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
-					(isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'),
-					(isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID')
+					(isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
+					(isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
 				);
 				$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
 					Db::getInstance()->getMsgError();
@@ -2287,8 +2356,8 @@ class AdminImportControllerCore extends AdminController
 				if (!$res)
 					$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
 						Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
-						(isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'),
-						(isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID')
+						(isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
+						(isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
 					);
 				else
 				{
@@ -2546,13 +2615,9 @@ class AdminImportControllerCore extends AdminController
 
 	protected static function usortFiles($a, $b)
 	{
-		$a = strrev(substr(strrev($a), 0, 14));
-		$b = strrev(substr(strrev($b), 0, 14));
-
 		if ($a == $b)
 			return 0;
-
-		return ($a < $b) ? 1 : -1;
+		return ($b < $a) ? 1 : -1;
 	}
 
 	protected function openCsvFile()
@@ -2597,37 +2662,37 @@ class AdminImportControllerCore extends AdminController
 						unlink(_PS_CAT_IMG_DIR_.$d);
 				break;
 			case $this->entities[$this->l('Products')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_shop');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_shop');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_carrier');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'cart_product');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'compare_product');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_shop`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_shop`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_carrier`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'cart_product`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'compare_product`');
 				if (count(Db::getInstance()->executeS('SHOW TABLES LIKE \''._DB_PREFIX_.'favorite_product\' '))) //check if table exist
-					Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'favorite_product');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attachment');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_country_tax');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_download');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_group_reduction_cache');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_sale');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_supplier');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'scene_products');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'warehouse_product_location');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock_available');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock_mvt');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customization');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customization_field');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supply_order_detail');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact');
+					Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'favorite_product`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attachment`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_country_tax`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_download`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_group_reduction_cache`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_sale`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_supplier`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'scene_products`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'warehouse_product_location`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock_available`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'stock_mvt`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customization`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customization_field`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supply_order_detail`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact`');
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute`');
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_shop`');
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_combination`');
@@ -2638,7 +2703,7 @@ class AdminImportControllerCore extends AdminController
 				break;
 			case $this->entities[$this->l('Combinations')]:
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute`');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact`');
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_lang`');
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group`');
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group_lang`');
@@ -2648,26 +2713,26 @@ class AdminImportControllerCore extends AdminController
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_shop`');
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_combination`');
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_image`');
-				Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'stock_available` WHERE id_product_attribute !=0');
+				Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'stock_available` WHERE id_product_attribute != 0');
 				break;
 			case $this->entities[$this->l('Customers')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer`');
 				break;
 			case $this->entities[$this->l('Addresses')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address`');
 				break;
 			case $this->entities[$this->l('Manufacturers')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_shop');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_shop`');
 				foreach (scandir(_PS_MANU_IMG_DIR_) as $d)
 					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
 						unlink(_PS_MANU_IMG_DIR_.$d);
 				break;
 			case $this->entities[$this->l('Suppliers')]:
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang');
-				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_shop');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang`');
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_shop`');
 				foreach (scandir(_PS_SUPP_IMG_DIR_) as $d)
 					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
 						unlink(_PS_SUPP_IMG_DIR_.$d);
@@ -2696,6 +2761,7 @@ class AdminImportControllerCore extends AdminController
 
 		if (Tools::isSubmit('submitFileUpload'))
 		{
+			$path = _PS_ADMIN_DIR_.'/import/'.date('Ymdhis').'-';
 			if (isset($_FILES['file']) && !empty($_FILES['file']['error']))
 			{
 				switch ($_FILES['file']['error'])
@@ -2721,13 +2787,18 @@ class AdminImportControllerCore extends AdminController
 					break;
 				}
 			}
-			else if (!file_exists($_FILES['file']['tmp_name']) ||
-				!@move_uploaded_file($_FILES['file']['tmp_name'], _PS_ADMIN_DIR_.'/import/'.date('Ymdhis').'-'.$_FILES['file']['name']))
+			elseif (!preg_match('/.*\.csv$/i', $_FILES['file']['name']))
+				$this->errors[] = Tools::displayError('The extension of your file should be .csv.');
+			elseif (!file_exists($_FILES['file']['tmp_name']) ||
+				!@move_uploaded_file($_FILES['file']['tmp_name'], $path.$_FILES['file']['name']))
 				$this->errors[] = $this->l('An error occurred while uploading / copying the file.');
 			else
+			{
+				@chmod($path.$_FILES['file']['name'], 0664);
 				Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=18');
+			}
 		}
-		else if (Tools::getValue('import'))
+		elseif (Tools::getValue('import'))
 		{
 			// Check if the CSV file exist
 			if (Tools::getValue('csv'))
@@ -2791,7 +2862,41 @@ class AdminImportControllerCore extends AdminController
 			else
 				$this->errors[] = $this->l('You must upload a file in order to proceed to the next step');
 		}
-
+		elseif ($filename = Tools::getValue('csvfilename'))
+		{
+			$filename = base64_decode($filename);
+			$file =  _PS_ADMIN_DIR_.'/import/'.basename($filename);
+			if (realpath(dirname($file)) != _PS_ADMIN_DIR_.'/import')
+				exit();
+			if (!empty($filename))
+			{
+				$bName = basename($filename);
+				if ($delete = Tools::getValue('delete') && file_exists($file))
+					@unlink($file);
+				elseif (file_exists($file))
+				{
+					$bName = explode('.', $bName);
+					$bName = strtolower($bName[count($bName) - 1]);
+					$mimeTypes = array('csv' => 'text/csv');
+	
+					if (isset($mimeTypes[$bName]))
+						$mimeType = $mimeTypes[$bName];
+					else
+						$mimeType = 'application/octet-stream';
+					if (ob_get_level()) 
+						ob_end_clean();
+	
+					header('Content-Transfer-Encoding: binary');
+					header('Content-Type: '.$mimeType);
+					header('Content-Length: '.filesize($file));
+					header('Content-Disposition: attachment; filename="'.$filename.'"');
+					$fp = fopen($file, 'rb');
+					while (is_resource($fp) && !feof($fp))
+						echo fgets($fp, 16384);
+					exit;
+				}
+			}	
+		}
 		parent::postProcess();
 	}
 
diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php
index 834f3e329..9e979f076 100644
--- a/controllers/admin/AdminInvoicesController.php
+++ b/controllers/admin/AdminInvoicesController.php
@@ -42,6 +42,12 @@ class AdminInvoicesControllerCore extends AdminController
 						'cast' => 'intval',
 						'type' => 'bool'
 					),
+					'PS_INVOICE_TAXES_BREAKDOWN' => array(
+						'title' => $this->l('Enable the breakdown of taxes on the invoice:'),
+						'desc' => $this->l('Show a breakdown of taxes by tax rate on the invoice when there are several taxes combined'),
+						'cast' => 'intval',
+						'type' => 'bool'
+					),
 					'PS_INVOICE_PREFIX' => array(
 						'title' => $this->l('Invoice prefix:'),
 						'desc' => $this->l('Prefix used for invoice name (e.g. IN00001)'),
diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php
index 5a4dc1255..b9db383c1 100644
--- a/controllers/admin/AdminLogsController.php
+++ b/controllers/admin/AdminLogsController.php
@@ -35,7 +35,7 @@ class AdminLogsControllerCore extends AdminController
 
 		$this->fields_list = array(
 			'id_log' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
-			'employee' => array('title' => $this->l('Employee'), 'align' => 'center', 'width' => 100),
+			'employee' => array('title' => $this->l('Employee'), 'align' => 'center', 'width' => 100, 'havingFilter' => true),
 			'severity' => array('title' => $this->l('Severity (1-4)'), 'align' => 'center', 'width' => 50),
 			'message' => array('title' => $this->l('Message')),
 			'object_type' => array('title' => $this->l('Object type'), 'width' => 75),
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 7bdda3762..9cc74bcff 100755
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -23,6 +23,200 @@ International Registred Trademark & Property of PrestaShop SA
 
 Release Notes for PrestaShop 1.5
 --------------------------------
+####################################
+#   v1.5.6.0 - (2013-10-07)  #
+####################################
+
+	Fixed bugs:
+
+	[-] Installer : added the missing default tab in the employee
+	[-] INSTALLER : Fix bug #PSCFV-8289 bad orders vouchers total after update
+	[-] INSTALLER: Wrong SQL query for PS_LEGACY_IMAGES to 0
+	[-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT
+	[-] INSTALLER : Fix infinite loop when order message has additional ampersand
+	[-] INSTALLER : Fix fatal error in upgrade, could not load configuration class
+	[-] INSTALLER : no update value in fix_download_product_feature_active
+	[-] INSTALLER : Fix fatal error when upgrading
+
+	[-] FO : isVirtualCart was forced to false
+	[-] FO: Fix display of quantity discounts on product pages if the customer is allowable for multiple discount for the same quantity #PSCFV-10580
+	[-] FO: packages should be splitted with advanced stock management when carrier is not associated to multiple warehouse
+	[-] FO : Fix #PSCFV-10480 again, css fix
+	[-] FO : Fix #PSCFV-10480 again css fix
+	[-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page
+	[-] FO: Fix #PSCFV-10461
+	[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
+	[-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop
+	[-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396
+	[-] FO : 301 Redirect /iso_lang to /iso_lang/ url
+	[-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address
+	[-] FO: Fix SSL links on domain_ssl instead domain
+	[-] FO : fixed chinese search with multiple symbols #PSCFV-10322
+	[-] FO : Partial fix of adding gift on cart rule on the same entity in the cart rule
+	[-] FO : Fix bug #PSCFV-10118 quantity not updated when cart rules give the same product as gift
+	[-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed
+	[-] FO : FixBug when route id is empty
+
+	[-] BO : Bug fix - Modules confirmation messages
+	[-] BO : Retro compat, PS_ADMIN_DIR not defined //bad commit sorry
+	[-] BO : Employee's default_tab may not exists, switching to AdminOrders
+	[-] BO : Retro compat, PS_ADMIN_DIR not defined
+	[-] BO : AdminImport add combinations available fields
+	[-] BO : AdminImport add adresses required fields
+	[-] BO : Fix bug #PSCFV-9323 supplier_reference can be unset
+	[-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot
+	[-] BO : Fix bug #PSCFV-10064, could not import deature in multilang, thanks @E.Bigfoot
+	[-] BO : Remove dead code in AdminImport
+	[-] BO : FixBug #PSCFV-10558 - Invalid HTML markup.
+	[-] BO : Fix bug #PSCFV-8389 duplicates is SpecificPrice table
+	[-] BO : AdminImport, tables are not truncated
+	[-] BO : managed decimal format in BO orders
+	[-] BO : Fix bug #PSCFV-5060 could not import supplier_combinations in combinations import
+	[-] BO : Fix #PSCFV-6482 could not import tags in deiffrent languages
+	[-] BO : fixed currency format on order creation
+	[-] Bo : Fix again #PSCFV-10474 again, not deleting start page after import
+	[-] Bo : Fix again #PSCFV-10474 coul not export more than 300 products
+	[-] BO: Fix total without tax in breakdown taxes when taxes are combined #PSCFV-10394 on the invoices
+	[-] BO: translation mismatch    Here is a form to edit the values ​​in the group, we do not need here "attribute type".
+	[-] BO : AdminImport, not matching by ref for updating
+	[-] BO: Fix #PSCFV-10488 filter by employee on logs tab
+	[-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list
+	[-] BO : Could not import empty linkrewrite for products and not matching refs
+	[-] BO : Sort import files in select
+	[-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop
+	[-] BO : Fix #PSCFV-10501 Remove fatal error
+	[-] BO : Fix bug #PSCFV-9675 could not import non existent parent category
+	[-] BO : Bad entity pre selected in AdminImport
+	[-] BO : Fix bug #PSCFV-10483, could not import other language product link_rewrite
+	[-] BO: Fix data validation when iframe is allowed on some entities like CMS
+	[-] BO : Fix Bug For new Fancy Box events
+	[-] BO : fixed the redirection to a 404 page when loging in in the updater
+	[-] BO : Bad input radio names
+	[-] BO : Issue with domready on adminImport
+	[-] BO : do not reaffect import_type for categories
+	[-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935
+	[-] BO : Fix proces and save buttons for Modules and AdminControllers
+	[-] Bo : Modules 'save' button not active
+	[-] BO : Fix bug #PSCFV-8214 import entity pre selected
+	[-] BO : Fix bugPSCFV-10249 images copy when unix path
+	[-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error
+	[-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link
+	[-] BO : Could not order in AdminStatuses by ID or template
+	[-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed
+	[-] BO : quote badly decoded in customerThreads
+	[-] BO : Fix Bug #PSCFV-10331 check all from list
+	[-] BO : Customer message twice encoded
+	[-] BO : Fix bug, orders states not ordered by order state name
+	[-] BO : Bug fix - Encoding & tips of the day
+	[-] BO : Do not copy link_rewrite from title if cms already has one
+	[-] BO : Small changes when creating vouchers in back office orders
+	[-] BO: Fix out of stock creation with multishop and stock sharing
+	[-] BO: Fix preview url with multishop
+	[-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta
+	[-] BO : FixBug PSCFV-10331 - Tax rules Pagination
+	[-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_
+	[-] BO : ini_get('safe_mode') can return false
+	[-] BO : AdminModulesController - Bug fix, $params was not set
+	[-] BO : Fix #PSCFV-9906 could not register search engines keywords
+	[-] BO : Fix pull request #665
+	[-] BO : Fix error returned when first import of a localisation pack
+	[-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes
+	[-] BO: Fix fatal error on customer edition when email is not valid
+	[-] BO : fixed bug when try to add jquery from  ajax.googleapis.com in BO
+	[-] BO : FixBug Url rewrite preview when user have a different language from shop
+	[-] BO : fixed bug with multistore context on carrier wizard
+
+	[-] Classes : Bug fix - FrontController, mobile & JS minifier fixed
+
+	[-] CORE : #PSCFV-10389 Avoid eventual empty Specific Price Rule
+	[-] CORE : Fix bug #PSCFV-10179 Duplicate specific price records when updating a product
+	[-] CORE : Cart rules not ordered by priority for PaymentModule
+	[-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules
+	[-] CORE : Could not add too long tags
+	[-] CORE : Missing tag max size
+	[-] CORE : Partial fix for #PSCFV-10482 getCacheId is different in back office
+	[-] CORE : Fix bug #PSCFV-10471 Cart item count problem, unique_id grouping error for id_product and id_product_attribute
+	[-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request https://github.com/kpodemski/kp-PrestaShop/commit/361ebc72e09d00463bb7a7b7af670e3235ab6a5a
+	[-] Core: Set a remote addr with php-cli #PSCFV-10372
+	[-] CORE : Could not add several cart rules
+	[-] CORE : Fix bug #PSCFV-10040 Notice: Undefined index: unifunc && Fatal error: Function name must be a string on some PHP version with empty cache folder and smarty cache enabled
+	[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
+	[-] CORE : Remove PHP Warning:  file_put_contents on modules config.xml
+	[-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment
+
+	[-] MO : Blocklayered - Fix empty fancy box after template edit
+	[-] MO : FixBug #10460 - UTF8 bug on accented URL
+	[-] MO : Blockcart, wrong tbody
+	[-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name
+	[-] MO : FixBug #PNM-1683 - Treeview problem
+	[-] MO: Fix time of smarty cache invalidation
+	[-] MO : PNM-1715 - Bug fix accented chars & ajax-cart
+	[-] MO : Editorial could not delete image
+	[-] MO : Fixed a bug when displaying textures    Corrections links texture image in the blocklayered
+	[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
+	[-] MO : Statsdata, exception on duplicate entry
+	[-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache
+	[-] MO : fix bug #PSCFV-9906 again, bad url parsing
+	[-] MO: Fix blocklayered sort by quantity #PSCFV-10300
+
+	[-] WS: Fix order by on id field on multishop entities
+	[-] WS: Fix entities retrieve for some cases
+	[-] WS: 404 error should be returned if a multishop entity does not exists #PSCFV-10229
+	[-] WS: Bad xlink for tax_rules_group in product
+
+	[-] PDF : Report of https://github.com/enumag/PrestaShop/commit/9c939cceadebd58ad390fb4f108816e3c17c0275
+
+	[-] LO: Argeninian localization
+
+	Improved/changed features:
+
+	[*] Project : Orders should rely only on ps_order_cart_rule
+
+	[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
+
+	[*] FO: Allow to enable SSL on all the pages
+	[*] FO : removed extra slash and point
+
+	[*] BO : AdminImport, retrieve separators and lang selected
+	[*] BO : Add category id in AdminSpecificPriceRule
+	[*] BO: Allow to breakdown the taxes when they are computed
+	[*] BO : AdminImport, remove csv files
+	[*] BO : Adminimport, check csv download path
+	[*] BO : Add csv file download in AdminImport
+	[*] BO : improved automatic language creation
+	[*] BO : Set import entity in cookie (#PSCFV-8214)
+	[*] BO: sort modules name in Stats
+
+	[*] CORE : Increasing the length of link_rewrite & name in Category.php    In database this fields have varchar(128) so let's give the user full size of fields
+	[*] CORE : bad else if in getTemplatePath
+	[*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3
+	[*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists()
+
+	[*] MO : MailAlerts : Add SQL update script for v2.5
+	[*] MO : MailAlerts : multishop/multilang full compatibility    Customers will receive alerts based on the real context of the moment they subscribed to the alert (sho, theme & language)    SQL update table : `ps_mailalert_customer_oos`    =========================================    ALTER TABLE `ps_mailalert_customer_oos`    ADD `id_lang` INT( 10 ) UNSIGNED NOT NULL ,    DROP PRIMARY KEY ,    ADD PRIMARY KEY ( `id_customer` , `customer_email` , `id_product` , `id_product_attribute` , `id_shop` ) ;
+
+	[*] LO : Removed 'Miss' from the default genders because too country specific
+	[*] LO : Use single quote as thousands separator for CHF currency
+
+	Added Features:
+
+	[+] FO : add getManufacturer() to ManufacturerControllerCore    Add getManufacturer() to ManufacturerControllerCore to access the protected manufacturer instance of the controller.
+
+	[+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier
+	[+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController
+	[+] BO : Improve mod rewrite check
+
+	[+] MO : add link to all manufacturer page and the feature to show All Suppliers
+	[+] MO : add the option to show all Manufacturer    Add the option to show all Manufacturer in blocktopmenu module.
+	[+] MO : Mailalerts - Add Total tax paid to order confirmation
+
+	[+] TR : Added Indonesian installer
+
+	[+] LO : Completed Traditional Chinese Installer
+	[+] LO :  Added Bengali installer
+	[+] LO: Added Traditional Chinese installer
+
+
 ####################################
 #   v1.5.5.0 - (2013-08-22)  #
 ####################################
diff --git a/docs/csv_import/addresses_import.csv b/docs/csv_import/addresses_import.csv
index 2ba8be1ca..60f603f4a 100644
--- a/docs/csv_import/addresses_import.csv
+++ b/docs/csv_import/addresses_import.csv
@@ -1,4 +1,4 @@
-"id";"Alias*";"Active (0/1)";"Customer e-mail";"Customer ID";"Manufacturer";"Supplier";"Company";"Lastname*";"Firstname*";"Address 1*";"Address 2";"Postcode* / Zipcode*";"City*";"Country*";"State";"Other";"Phone";"Mobile Phone";"VAT number"
+"id";"Alias*";"Active (0/1)";"Customer e-mail*";"Customer ID";"Manufacturer";"Supplier";"Company";"Lastname*";"Firstname*";"Address 1*";"Address 2";"Postcode* / Zipcode*";"City*";"Country*";"State";"Other";"Phone";"Mobile Phone";"VAT number"
 1;"My Adress";1;"pub@prestashop.com";1;;;;"Doe";"John";"16, Main street";"2nd floor";75000;"PARIS ";"France";;;140138844;;
 2;"My work";1;"pub@prestashop.com";1;;;"My Company";"Doe";"John";"535, Baker street";;13000;"Marseile";"France";;;235445588;;
 3;"My work";0;;;"Apple Computer, Inc";;;"Jobs";"Steve";"1 Infinite Loop";;95014;"CUPERTINO";"United States";"California";;"(800) 275-2273";;
diff --git a/docs/csv_import/combinations_import.csv b/docs/csv_import/combinations_import.csv
index b00f5fccb..aa0b6853a 100644
--- a/docs/csv_import/combinations_import.csv
+++ b/docs/csv_import/combinations_import.csv
@@ -1,2 +1,4 @@
-1; Capacity:select:0, Color:color:1; 16Go:0, Bleu:1
-1; Capacity:select:0, Color:color:1; 16Go:0, Red:1
+Id_product*;Group*;Attribute*;Supplier_reference;Reference;Ean13;Upc;Wholesale price;Impact on price;Ecotax;Quantity;Minimal quantity;Impact on weight;Default (0 = No, 1 = Yes);Image position;Image URL;Delete existing images (0 = No, 1 = Yes);ID / Name of shop
+1;Capacity:select:0, Color:color:1;16Go:0, Bleu:1;Ref suppplier 1;Ref 1;1234567891234;123456789123;0;None;0.000000;10;1;None;0;1;http://youdomain.com/img.jpg;0;1
+1;Capacity:select:0, Color:color:1;16Go:0, Red:1;Ref suppplier 2;Ref 2;1234567891235;123456789124;0;None;0.000000;10;1;None;0;2;http://youdomain.com/img.jpg;0;1
+
diff --git a/docs/readme_de.txt b/docs/readme_de.txt
index 829309cc7..87be3bcf3 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.5.0
-VERSION: 1.5.5.0
+NAME: Prestashop 1.5.6.0
+VERSION: 1.5.6.0
 
 VORBEREITUNG
 ===========
diff --git a/docs/readme_en.txt b/docs/readme_en.txt
index 52e111108..385f01d04 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.5.0
-VERSION: 1.5.5.0
+NAME: Prestashop 1.5.6.0
+VERSION: 1.5.6.0
 
 PREPARATION
 ===========
diff --git a/docs/readme_es.txt b/docs/readme_es.txt
index c67c99b47..51c52b1c3 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.5.0
-VERSION: 1.5.5.0
+NAME: Prestashop 1.5.6.0
+VERSION: 1.5.6.0
 
 PREPARACI�N
 ===========
diff --git a/docs/readme_fr.txt b/docs/readme_fr.txt
index 9f03d88eb..4fd3accf0 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.5.0
-VERSION: 1.5.5.0
+NAME: Prestashop 1.5.6.0
+VERSION: 1.5.6.0
 
 PREPARATION
 ===========
diff --git a/docs/readme_it.txt b/docs/readme_it.txt
index cb9f844f6..3238253a7 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.5.0
-VERSION: 1.5.5.0
+NAME: Prestashop 1.5.6.0
+VERSION: 1.5.6.0
 
 PREPARAZIONE
 ===========
diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml
index 828538b0e..4bd4ca704 100644
--- a/install-dev/data/xml/configuration.xml
+++ b/install-dev/data/xml/configuration.xml
@@ -689,7 +689,7 @@ Country</value>
       <value>7700</value>
     </configuration>
     <configuration id="PS_VERSION_DB" name="PS_VERSION_DB">
-      <value>1.5.5.0</value>
+      <value>1.5.6.0</value>
     </configuration>
     <configuration id="PS_BASE_DISTANCE_UNIT" name="PS_BASE_DISTANCE_UNIT">
       <value>m</value>
@@ -701,7 +701,7 @@ Country</value>
       <value>localhost</value>
     </configuration>
     <configuration id="PS_INSTALL_VERSION" name="PS_INSTALL_VERSION">
-      <value>1.5.5.0</value>
+      <value>1.5.6.0</value>
     </configuration>
     <configuration id="PS_SHOP_NAME" name="PS_SHOP_NAME">
       <value>PrestaShop</value>
diff --git a/install-dev/data/xml/gender.xml b/install-dev/data/xml/gender.xml
index 10d061514..8b0cf795b 100644
--- a/install-dev/data/xml/gender.xml
+++ b/install-dev/data/xml/gender.xml
@@ -6,6 +6,5 @@
   <entities>
     <gender id="1" type="0"/>
     <gender id="2" type="1"/>
-    <gender id="3" type="1"/>
   </entities>
 </entity_gender>
diff --git a/install-dev/data/xml/state.xml b/install-dev/data/xml/state.xml
index ccb4f4bdb..c0b15a93a 100644
--- a/install-dev/data/xml/state.xml
+++ b/install-dev/data/xml/state.xml
@@ -804,145 +804,145 @@
     <state id="YO" id_country="ID" id_zone="Asia" iso_code="YO" tax_behavior="0" active="1">
       <name>Yogyakarta</name>
     </state>
-    <state id="23" id_country="JP" id_zone="Asia" iso_code="23" tax_behavior="0" active="1">
+    <state id="JP-23" id_country="JP" id_zone="Asia" iso_code="23" tax_behavior="0" active="1">
       <name>Aichi</name>
     </state>
-    <state id="05" id_country="JP" id_zone="Asia" iso_code="05" tax_behavior="0" active="1">
+    <state id="JP-05" id_country="JP" id_zone="Asia" iso_code="05" tax_behavior="0" active="1">
       <name>Akita</name>
     </state>
-    <state id="02" id_country="JP" id_zone="Asia" iso_code="02" tax_behavior="0" active="1">
+    <state id="JP-02" id_country="JP" id_zone="Asia" iso_code="02" tax_behavior="0" active="1">
       <name>Aomori</name>
     </state>
-    <state id="12" id_country="JP" id_zone="Asia" iso_code="12" tax_behavior="0" active="1">
+    <state id="JP-12" id_country="JP" id_zone="Asia" iso_code="12" tax_behavior="0" active="1">
       <name>Chiba</name>
     </state>
-    <state id="38" id_country="JP" id_zone="Asia" iso_code="38" tax_behavior="0" active="1">
+    <state id="JP-38" id_country="JP" id_zone="Asia" iso_code="38" tax_behavior="0" active="1">
       <name>Ehime</name>
     </state>
-    <state id="18" id_country="JP" id_zone="Asia" iso_code="18" tax_behavior="0" active="1">
+    <state id="JP-18" id_country="JP" id_zone="Asia" iso_code="18" tax_behavior="0" active="1">
       <name>Fukui</name>
     </state>
-    <state id="40" id_country="JP" id_zone="Asia" iso_code="40" tax_behavior="0" active="1">
+    <state id="JP-40" id_country="JP" id_zone="Asia" iso_code="40" tax_behavior="0" active="1">
       <name>Fukuoka</name>
     </state>
-    <state id="07" id_country="JP" id_zone="Asia" iso_code="07" tax_behavior="0" active="1">
+    <state id="JP-07" id_country="JP" id_zone="Asia" iso_code="07" tax_behavior="0" active="1">
       <name>Fukushima</name>
     </state>
-    <state id="21" id_country="JP" id_zone="Asia" iso_code="21" tax_behavior="0" active="1">
+    <state id="JP-21" id_country="JP" id_zone="Asia" iso_code="21" tax_behavior="0" active="1">
       <name>Gifu</name>
     </state>
-    <state id="10" id_country="JP" id_zone="Asia" iso_code="10" tax_behavior="0" active="1">
+    <state id="JP-10" id_country="JP" id_zone="Asia" iso_code="10" tax_behavior="0" active="1">
       <name>Gunma</name>
     </state>
-    <state id="34" id_country="JP" id_zone="Asia" iso_code="34" tax_behavior="0" active="1">
+    <state id="JP-34" id_country="JP" id_zone="Asia" iso_code="34" tax_behavior="0" active="1">
       <name>Hiroshima</name>
     </state>
-    <state id="01" id_country="JP" id_zone="Asia" iso_code="01" tax_behavior="0" active="1">
+    <state id="JP-01" id_country="JP" id_zone="Asia" iso_code="01" tax_behavior="0" active="1">
       <name>Hokkaido</name>
     </state>
-    <state id="28" id_country="JP" id_zone="Asia" iso_code="28" tax_behavior="0" active="1">
+    <state id="JP-28" id_country="JP" id_zone="Asia" iso_code="28" tax_behavior="0" active="1">
       <name>Hyogo</name>
     </state>
-    <state id="08" id_country="JP" id_zone="Asia" iso_code="08" tax_behavior="0" active="1">
+    <state id="JP-08" id_country="JP" id_zone="Asia" iso_code="08" tax_behavior="0" active="1">
       <name>Ibaraki</name>
     </state>
-    <state id="17" id_country="JP" id_zone="Asia" iso_code="17" tax_behavior="0" active="1">
+    <state id="JP-17" id_country="JP" id_zone="Asia" iso_code="17" tax_behavior="0" active="1">
       <name>Ishikawa</name>
     </state>
-    <state id="03" id_country="JP" id_zone="Asia" iso_code="03" tax_behavior="0" active="1">
+    <state id="JP-03" id_country="JP" id_zone="Asia" iso_code="03" tax_behavior="0" active="1">
       <name>Iwate</name>
     </state>
-    <state id="37" id_country="JP" id_zone="Asia" iso_code="37" tax_behavior="0" active="1">
+    <state id="JP-37" id_country="JP" id_zone="Asia" iso_code="37" tax_behavior="0" active="1">
       <name>Kagawa</name>
     </state>
-    <state id="46" id_country="JP" id_zone="Asia" iso_code="46" tax_behavior="0" active="1">
+    <state id="JP-46" id_country="JP" id_zone="Asia" iso_code="46" tax_behavior="0" active="1">
       <name>Kagoshima</name>
     </state>
-    <state id="14" id_country="JP" id_zone="Asia" iso_code="14" tax_behavior="0" active="1">
+    <state id="JP-14" id_country="JP" id_zone="Asia" iso_code="14" tax_behavior="0" active="1">
       <name>Kanagawa</name>
     </state>
-    <state id="39" id_country="JP" id_zone="Asia" iso_code="39" tax_behavior="0" active="1">
+    <state id="JP-39" id_country="JP" id_zone="Asia" iso_code="39" tax_behavior="0" active="1">
       <name>Kochi</name>
     </state>
-    <state id="43" id_country="JP" id_zone="Asia" iso_code="43" tax_behavior="0" active="1">
+    <state id="JP-43" id_country="JP" id_zone="Asia" iso_code="43" tax_behavior="0" active="1">
       <name>Kumamoto</name>
     </state>
-    <state id="26" id_country="JP" id_zone="Asia" iso_code="26" tax_behavior="0" active="1">
+    <state id="JP-26" id_country="JP" id_zone="Asia" iso_code="26" tax_behavior="0" active="1">
       <name>Kyoto</name>
     </state>
-    <state id="24" id_country="JP" id_zone="Asia" iso_code="24" tax_behavior="0" active="1">
+    <state id="JP-24" id_country="JP" id_zone="Asia" iso_code="24" tax_behavior="0" active="1">
       <name>Mie</name>
     </state>
-    <state id="04" id_country="JP" id_zone="Asia" iso_code="04" tax_behavior="0" active="1">
+    <state id="JP-04" id_country="JP" id_zone="Asia" iso_code="04" tax_behavior="0" active="1">
       <name>Miyagi</name>
     </state>
-    <state id="45" id_country="JP" id_zone="Asia" iso_code="45" tax_behavior="0" active="1">
+    <state id="JP-45" id_country="JP" id_zone="Asia" iso_code="45" tax_behavior="0" active="1">
       <name>Miyazaki</name>
     </state>
-    <state id="20" id_country="JP" id_zone="Asia" iso_code="20" tax_behavior="0" active="1">
+    <state id="JP-20" id_country="JP" id_zone="Asia" iso_code="20" tax_behavior="0" active="1">
       <name>Nagano</name>
     </state>
-    <state id="42" id_country="JP" id_zone="Asia" iso_code="42" tax_behavior="0" active="1">
+    <state id="JP-42" id_country="JP" id_zone="Asia" iso_code="42" tax_behavior="0" active="1">
       <name>Nagasaki</name>
     </state>
-    <state id="29" id_country="JP" id_zone="Asia" iso_code="29" tax_behavior="0" active="1">
+    <state id="JP-29" id_country="JP" id_zone="Asia" iso_code="29" tax_behavior="0" active="1">
       <name>Nara</name>
     </state>
-    <state id="15" id_country="JP" id_zone="Asia" iso_code="15" tax_behavior="0" active="1">
+    <state id="JP-15" id_country="JP" id_zone="Asia" iso_code="15" tax_behavior="0" active="1">
       <name>Niigata</name>
     </state>
-    <state id="44" id_country="JP" id_zone="Asia" iso_code="44" tax_behavior="0" active="1">
+    <state id="JP-44" id_country="JP" id_zone="Asia" iso_code="44" tax_behavior="0" active="1">
       <name>Oita</name>
     </state>
-    <state id="33" id_country="JP" id_zone="Asia" iso_code="33" tax_behavior="0" active="1">
+    <state id="JP-33" id_country="JP" id_zone="Asia" iso_code="33" tax_behavior="0" active="1">
       <name>Okayama</name>
     </state>
-    <state id="47" id_country="JP" id_zone="Asia" iso_code="47" tax_behavior="0" active="1">
+    <state id="JP-47" id_country="JP" id_zone="Asia" iso_code="47" tax_behavior="0" active="1">
       <name>Okinawa</name>
     </state>
-    <state id="27" id_country="JP" id_zone="Asia" iso_code="27" tax_behavior="0" active="1">
+    <state id="JP-27" id_country="JP" id_zone="Asia" iso_code="27" tax_behavior="0" active="1">
       <name>Osaka</name>
     </state>
-    <state id="41" id_country="JP" id_zone="Asia" iso_code="41" tax_behavior="0" active="1">
+    <state id="JP-41" id_country="JP" id_zone="Asia" iso_code="41" tax_behavior="0" active="1">
       <name>Saga</name>
     </state>
-    <state id="11" id_country="JP" id_zone="Asia" iso_code="11" tax_behavior="0" active="1">
+    <state id="JP-11" id_country="JP" id_zone="Asia" iso_code="11" tax_behavior="0" active="1">
       <name>Saitama</name>
     </state>
-    <state id="25" id_country="JP" id_zone="Asia" iso_code="25" tax_behavior="0" active="1">
+    <state id="JP-25" id_country="JP" id_zone="Asia" iso_code="25" tax_behavior="0" active="1">
       <name>Shiga</name>
     </state>
-    <state id="32" id_country="JP" id_zone="Asia" iso_code="32" tax_behavior="0" active="1">
+    <state id="JP-32" id_country="JP" id_zone="Asia" iso_code="32" tax_behavior="0" active="1">
       <name>Shimane</name>
     </state>
-    <state id="22" id_country="JP" id_zone="Asia" iso_code="22" tax_behavior="0" active="1">
+    <state id="JP-22" id_country="JP" id_zone="Asia" iso_code="22" tax_behavior="0" active="1">
       <name>Shizuoka</name>
     </state>
-    <state id="09" id_country="JP" id_zone="Asia" iso_code="09" tax_behavior="0" active="1">
+    <state id="JP-09" id_country="JP" id_zone="Asia" iso_code="09" tax_behavior="0" active="1">
       <name>Tochigi</name>
     </state>
-    <state id="36" id_country="JP" id_zone="Asia" iso_code="36" tax_behavior="0" active="1">
+    <state id="JP-36" id_country="JP" id_zone="Asia" iso_code="36" tax_behavior="0" active="1">
       <name>Tokushima</name>
     </state>
-    <state id="13" id_country="JP" id_zone="Asia" iso_code="13" tax_behavior="0" active="1">
+    <state id="JP-13" id_country="JP" id_zone="Asia" iso_code="13" tax_behavior="0" active="1">
       <name>Tokyo</name>
     </state>
-    <state id="31" id_country="JP" id_zone="Asia" iso_code="31" tax_behavior="0" active="1">
+    <state id="JP-31" id_country="JP" id_zone="Asia" iso_code="31" tax_behavior="0" active="1">
       <name>Tottori</name>
     </state>
-    <state id="16" id_country="JP" id_zone="Asia" iso_code="16" tax_behavior="0" active="1">
+    <state id="JP-16" id_country="JP" id_zone="Asia" iso_code="16" tax_behavior="0" active="1">
       <name>Toyama</name>
     </state>
-    <state id="30" id_country="JP" id_zone="Asia" iso_code="30" tax_behavior="0" active="1">
+    <state id="JP-30" id_country="JP" id_zone="Asia" iso_code="30" tax_behavior="0" active="1">
       <name>Wakayama</name>
     </state>
-    <state id="06" id_country="JP" id_zone="Asia" iso_code="06" tax_behavior="0" active="1">
+    <state id="JP-06" id_country="JP" id_zone="Asia" iso_code="06" tax_behavior="0" active="1">
       <name>Yamagata</name>
     </state>
-    <state id="35" id_country="JP" id_zone="Asia" iso_code="35" tax_behavior="0" active="1">
+    <state id="JP-35" id_country="JP" id_zone="Asia" iso_code="35" tax_behavior="0" active="1">
       <name>Yamaguchi</name>
     </state>
-    <state id="19" id_country="JP" id_zone="Asia" iso_code="19" tax_behavior="0" active="1">
+    <state id="JP-19" id_country="JP" id_zone="Asia" iso_code="19" tax_behavior="0" active="1">
       <name>Yamanashi</name>
     </state>
   </entities>
diff --git a/install-dev/fixtures/apple/data/access.xml b/install-dev/fixtures/apple/data/access.xml
index 45126998a..e3bcb6357 100644
--- a/install-dev/fixtures/apple/data/access.xml
+++ b/install-dev/fixtures/apple/data/access.xml
@@ -170,7 +170,7 @@
     <access id="access_3_58" id_profile="Logistician" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_59" id_profile="Logistician" id_tab="Taxes" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_60" id_profile="Logistician" id_tab="Translations" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_61" id_profile="Logistician" id_tab="Modules_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_61" id_profile="Logistician" id_tab="Modules_1" view="1" add="0" edit="1" delete="0"/>
     <access id="access_3_62" id_profile="Logistician" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_63" id_profile="Logistician" id_tab="Positions" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_64" id_profile="Logistician" id_tab="Payment" view="0" add="0" edit="0" delete="0"/>
@@ -372,7 +372,7 @@
     <access id="access_5_58" id_profile="Salesman" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_59" id_profile="Salesman" id_tab="Taxes" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_60" id_profile="Salesman" id_tab="Translations" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_61" id_profile="Salesman" id_tab="Modules_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_61" id_profile="Salesman" id_tab="Modules_1" view="1" add="0" edit="1" delete="0"/>
     <access id="access_5_62" id_profile="Salesman" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_63" id_profile="Salesman" id_tab="Positions" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_64" id_profile="Salesman" id_tab="Payment" view="0" add="0" edit="0" delete="0"/>
diff --git a/install-dev/fixtures/apple/langs/bn/data/attribute.xml b/install-dev/fixtures/apple/langs/bn/data/attribute.xml
new file mode 100644
index 000000000..f27df851c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/attribute.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<entity_attribute>
+  <attribute id="2GB">
+    <name>2GB</name>
+  </attribute>
+  <attribute id="4GB">
+    <name>4GB</name>
+  </attribute>
+  <attribute id="Metal">
+    <name>Metal</name>
+  </attribute>
+  <attribute id="Blue">
+    <name>Blue</name>
+  </attribute>
+  <attribute id="Pink">
+    <name>Pink</name>
+  </attribute>
+  <attribute id="Green">
+    <name>Green</name>
+  </attribute>
+  <attribute id="Orange">
+    <name>Orange</name>
+  </attribute>
+  <attribute id="Optional_64GB_solid-state_drive">
+    <name>Optional 64GB solid-state drive</name>
+  </attribute>
+  <attribute id="80GB_Parallel_ATA_Drive_4200_rpm">
+    <name>80GB Parallel ATA Drive @ 4200 rpm</name>
+  </attribute>
+  <attribute id="1_60GHz_Intel_Core_2_Duo">
+    <name>1.60GHz Intel Core 2 Duo</name>
+  </attribute>
+  <attribute id="1_80GHz_Intel_Core_2_Duo">
+    <name>1.80GHz Intel Core 2 Duo</name>
+  </attribute>
+  <attribute id="80GB_20_000_Songs">
+    <name>80GB: 20,000 Songs</name>
+  </attribute>
+  <attribute id="160GB_40_000_Songs">
+    <name>160GB: 40,000 Songs</name>
+  </attribute>
+  <attribute id="Black">
+    <name>Black</name>
+  </attribute>
+  <attribute id="8GB">
+    <name>8GB</name>
+  </attribute>
+  <attribute id="16GB">
+    <name>16GB</name>
+  </attribute>
+  <attribute id="32GB">
+    <name>32GB</name>
+  </attribute>
+  <attribute id="Purple">
+    <name>Purple</name>
+  </attribute>
+  <attribute id="Yellow">
+    <name>Yellow</name>
+  </attribute>
+  <attribute id="Red">
+    <name>Red</name>
+  </attribute>
+</entity_attribute>
diff --git a/install-dev/fixtures/apple/langs/bn/data/attribute_group.xml b/install-dev/fixtures/apple/langs/bn/data/attribute_group.xml
new file mode 100644
index 000000000..221a81bc7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/attribute_group.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_attribute_group>
+  <attribute_group id="Disk_space">
+    <name>Disk space</name>
+    <public_name>Disk space</public_name>
+  </attribute_group>
+  <attribute_group id="Color">
+    <name>Color</name>
+    <public_name>Color</public_name>
+  </attribute_group>
+  <attribute_group id="ICU">
+    <name>ICU</name>
+    <public_name>Processor</public_name>
+  </attribute_group>
+</entity_attribute_group>
diff --git a/install-dev/fixtures/apple/langs/bn/data/attributegroup.xml b/install-dev/fixtures/apple/langs/bn/data/attributegroup.xml
new file mode 100644
index 000000000..977fceeb7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/attributegroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_attributegroup>
+	<attributegroup id="capacity">
+		<name><![CDATA[Disk space]]></name>
+	</attributegroup>
+	<attributegroup id="capacity_public">
+		<name><![CDATA[Disk space]]></name>
+	</attributegroup>
+	<attributegroup id="color">
+		<name><![CDATA[Color]]></name>
+	</attributegroup>
+	<attributegroup id="color_public">
+		<name><![CDATA[Color]]></name>
+	</attributegroup>
+	<attributegroup id="processor">
+		<name><![CDATA[ICU]]></name>
+	</attributegroup>
+	<attributegroup id="processor_public">
+		<name><![CDATA[Processor]]></name>
+	</attributegroup>
+</list_attributegroup>
diff --git a/install-dev/fixtures/apple/langs/bn/data/carrier.xml b/install-dev/fixtures/apple/langs/bn/data/carrier.xml
new file mode 100644
index 000000000..c59766e73
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/carrier.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<entity_carrier>
+  <carrier id="My_carrier" id_shop="1">
+    <delay>Delivery next day!</delay>
+  </carrier>
+</entity_carrier>
diff --git a/install-dev/fixtures/apple/langs/bn/data/category.xml b/install-dev/fixtures/apple/langs/bn/data/category.xml
new file mode 100644
index 000000000..eeae63831
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/category.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<entity_category>
+  <category id="iPods" id_shop="1">
+    <name>iPods</name>
+    <description>Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.</description>
+    <link_rewrite>music-ipods</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id="Accessories" id_shop="1">
+    <name>Accessories</name>
+    <description>Wonderful accessories for your iPod</description>
+    <link_rewrite>accessories-ipod</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id="Laptops" id_shop="1">
+    <name>Laptops</name>
+    <description>The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.</description>
+    <link_rewrite>laptops</link_rewrite>
+    <meta_title>Apple laptops</meta_title>
+    <meta_keywords>Apple laptops MacBook Air</meta_keywords>
+    <meta_description>Powerful and chic Apple laptops</meta_description>
+  </category>
+</entity_category>
diff --git a/install-dev/fixtures/apple/langs/bn/data/feature.xml b/install-dev/fixtures/apple/langs/bn/data/feature.xml
new file mode 100644
index 000000000..7682c6495
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/feature.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<entity_feature>
+  <feature id="Height">
+    <name>Height</name>
+  </feature>
+  <feature id="Width">
+    <name>Width</name>
+  </feature>
+  <feature id="Depth">
+    <name>Depth</name>
+  </feature>
+  <feature id="Weight">
+    <name>Weight</name>
+  </feature>
+  <feature id="Headphone">
+    <name>Headphone</name>
+  </feature>
+</entity_feature>
diff --git a/install-dev/fixtures/apple/langs/bn/data/feature_value.xml b/install-dev/fixtures/apple/langs/bn/data/feature_value.xml
new file mode 100644
index 000000000..d3a824d22
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/feature_value.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<entity_feature_value>
+  <feature_value id="Jack_stereo">
+    <value>Jack stereo</value>
+  </feature_value>
+  <feature_value id="Mini-jack_stereo">
+    <value>Mini-jack stereo</value>
+  </feature_value>
+  <feature_value id="2_75_in">
+    <value>2.75 in</value>
+  </feature_value>
+  <feature_value id="2_06_in">
+    <value>2.06 in</value>
+  </feature_value>
+  <feature_value id="49_2_g">
+    <value>49.2 g</value>
+  </feature_value>
+  <feature_value id="0_26_in">
+    <value>0.26 in</value>
+  </feature_value>
+  <feature_value id="1_07_in">
+    <value>1.07 in</value>
+  </feature_value>
+  <feature_value id="1_62_in">
+    <value>1.62 in</value>
+  </feature_value>
+  <feature_value id="15_5_g">
+    <value>15.5 g</value>
+  </feature_value>
+  <feature_value id="0_41_in_clip_included">
+    <value>0.41 in (clip included)</value>
+  </feature_value>
+  <feature_value id="4_33_in">
+    <value>4.33 in</value>
+  </feature_value>
+  <feature_value id="2_76_in">
+    <value>2.76 in</value>
+  </feature_value>
+  <feature_value id="120g">
+    <value>120g</value>
+  </feature_value>
+  <feature_value id="0_31_in">
+    <value>0.31 in</value>
+  </feature_value>
+</entity_feature_value>
diff --git a/install-dev/fixtures/apple/langs/bn/data/featurevalue.xml b/install-dev/fixtures/apple/langs/bn/data/featurevalue.xml
new file mode 100644
index 000000000..d101bed96
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/featurevalue.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_featurevalue>
+	<featurevalue id="jack_stereo">
+		<value><![CDATA[Jack stereo]]></value>
+	</featurevalue>
+	<featurevalue id="mini_jack_stereo">
+		<value><![CDATA[Mini-jack stereo]]></value>
+	</featurevalue>
+	<featurevalue id="2.75in">
+		<value><![CDATA[2.75 in]]></value>
+	</featurevalue>
+	<featurevalue id="2.06in">
+		<value><![CDATA[2.06 in]]></value>
+	</featurevalue>
+	<featurevalue id="49.2g">
+		<value><![CDATA[49.2 g]]></value>
+	</featurevalue>
+	<featurevalue id="0.26in">
+		<value><![CDATA[0.26 in]]></value>
+	</featurevalue>
+	<featurevalue id="1.07in">
+		<value><![CDATA[1.07 in]]></value>
+	</featurevalue>
+	<featurevalue id="1.62in">
+		<value><![CDATA[1.62 in]]></value>
+	</featurevalue>
+	<featurevalue id="15.5g">
+		<value><![CDATA[15.5 g]]></value>
+	</featurevalue>
+	<featurevalue id="0.41in">
+		<value><![CDATA[0.41 in (clip included)]]></value>
+	</featurevalue>
+	<featurevalue id="4.33in">
+		<value><![CDATA[4.33 in]]></value>
+	</featurevalue>
+	<featurevalue id="2.76in">
+		<value><![CDATA[2.76 in]]></value>
+	</featurevalue>
+	<featurevalue id="120g">
+		<value><![CDATA[120g]]></value>
+	</featurevalue>
+	<featurevalue id="0.31in">
+		<value><![CDATA[0.31 in]]></value>
+	</featurevalue>
+</list_featurevalue>
diff --git a/install-dev/fixtures/apple/langs/bn/data/image.xml b/install-dev/fixtures/apple/langs/bn/data/image.xml
new file mode 100644
index 000000000..49a836dc3
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/image.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<entity_image>
+  <image id="MacBook_Air">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_1">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_2">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_3">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_4">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_SuperDrive">
+    <legend> MacBook Air SuperDrive</legend>
+  </image>
+  <image id="iPod_touch">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_1">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_2">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_3">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_4">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_5">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="housse-portefeuille-en-cuir">
+    <legend>housse-portefeuille-en-cuir</legend>
+  </image>
+  <image id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone">
+    <legend>Shure SE210 Sound-Isolating Earphones for iPod and iPhone</legend>
+  </image>
+  <image id="iPod_Nano">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_1">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_2">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_3">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_4">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_5">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_6">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_7">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_shuffle">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_1">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_2">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_3">
+    <legend>iPod shuffle</legend>
+  </image>
+</entity_image>
diff --git a/install-dev/fixtures/apple/langs/bn/data/index.php b/install-dev/fixtures/apple/langs/bn/data/index.php
new file mode 100644
index 000000000..fcb7f5c2b
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/fixtures/apple/langs/bn/data/manufacturer.xml b/install-dev/fixtures/apple/langs/bn/data/manufacturer.xml
new file mode 100644
index 000000000..f06ff9661
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/manufacturer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<entity_manufacturer>
+  <manufacturer id="Apple_Computer_Inc">
+    <description/>
+    <short_description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </manufacturer>
+  <manufacturer id="Shure_Incorporated">
+    <description/>
+    <short_description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </manufacturer>
+</entity_manufacturer>
diff --git a/install-dev/fixtures/apple/langs/bn/data/order_message.xml b/install-dev/fixtures/apple/langs/bn/data/order_message.xml
new file mode 100644
index 000000000..93ad3b501
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/order_message.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<entity_order_message>
+  <order_message id="Delay">
+    <name>Delay</name>
+    <message>Hi,
+
+Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.
+Please accept our apologies and rest assured that we are working hard to rectify this.
+
+Best regards,</message>
+  </order_message>
+</entity_order_message>
diff --git a/install-dev/fixtures/apple/langs/bn/data/ordermessage.xml b/install-dev/fixtures/apple/langs/bn/data/ordermessage.xml
new file mode 100644
index 000000000..e743f5d97
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/ordermessage.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_ordermessage>
+	<ordermessage id="delay">
+		<name><![CDATA[Delay]]></name>
+		<message><![CDATA[Hi,

Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.
Please accept our apologies and rest assured that we are working hard to rectify this.

Best regards,]]></message>
+	</ordermessage>
+</list_ordermessage>
diff --git a/install-dev/fixtures/apple/langs/bn/data/product.xml b/install-dev/fixtures/apple/langs/bn/data/product.xml
new file mode 100644
index 000000000..0c405b001
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/product.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<entity_product>
+  <product id="iPod_Nano" id_shop="1">
+    <description>&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Curved ahead of the curve.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass design and you won't want to put iPod nano down.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Great looks. And brains, too.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;The new Genius feature turns iPod nano into your own highly intelligent, personal DJ. It creates playlists by finding songs in your library that go great together.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Made to move with your moves.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;The accelerometer comes to iPod nano. Give it a shake to shuffle your music. Turn it sideways to view Cover Flow. And play games designed with your moves in mind.&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.&lt;/p&gt;</description_short>
+    <link_rewrite>ipod-nano</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod Nano</name>
+    <available_now>In stock</available_now>
+    <available_later/>
+  </product>
+  <product id="iPod_shuffle" id_shop="1">
+    <description>&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Instant attachment.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;Wear up to 500 songs on your sleeve. Or your belt. Or your gym shorts. iPod shuffle is a badge of musical devotion. Now in new, more brilliant colors.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Feed your iPod shuffle.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;iTunes is your entertainment superstore. It&#x2019;s your ultra-organized music collection and jukebox. And it&#x2019;s how you load up your iPod shuffle in one click.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Beauty and the beat.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;Intensely colorful anodized aluminum complements the simple design of iPod shuffle. Now in blue, green, pink, red, and original silver.&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;iPod shuffle, the world&#x2019;s most wearable music player, now clips on in more vibrant blue, green, pink, and red.&lt;/p&gt;</description_short>
+    <link_rewrite>ipod-shuffle</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod shuffle</name>
+    <available_now>In stock</available_now>
+    <available_later/>
+  </product>
+  <product id="MacBook_Air" id_shop="1">
+    <description>&lt;p&gt;MacBook Air is nearly as thin as your index finger. Practically every detail that could be streamlined has been. Yet it still has a 13.3-inch widescreen LED display, full-size keyboard, and large multi-touch trackpad. It&#x2019;s incomparably portable without the usual ultraportable screen and keyboard compromises.&lt;/p&gt;&lt;p&gt;The incredible thinness of MacBook Air is the result of numerous size- and weight-shaving innovations. From a slimmer hard drive to strategically hidden I/O ports to a lower-profile battery, everything has been considered and reconsidered with thinness in mind.&lt;/p&gt;&lt;p&gt;MacBook Air is designed and engineered to take full advantage of the wireless world. A world in which 802.11n Wi-Fi is now so fast and so available, people are truly living untethered &#x2014; buying and renting movies online, downloading software, and sharing and storing files on the web. &lt;/p&gt;</description>
+    <description_short>MacBook Air is ultrathin, ultraportable, and ultra unlike anything else. But you don&#x2019;t lose inches and pounds overnight. It&#x2019;s the result of rethinking conventions. Of multiple wireless innovations. And of breakthrough design. With MacBook Air, mobile computing suddenly has a new standard.</description_short>
+    <link_rewrite>macbook-air</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>MacBook Air</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="MacBook" id_shop="1">
+    <description>Every MacBook has a larger hard drive, up to 250GB, to store growing media collections and valuable data.&lt;br /&gt;&lt;br /&gt;The 2.4GHz MacBook models now include 2GB of memory standard &#x2014; perfect for running more of your favorite applications smoothly.</description>
+    <description_short>MacBook makes it easy to hit the road thanks to its tough polycarbonate case, built-in wireless technologies, and innovative MagSafe Power Adapter that releases automatically if someone accidentally trips on the cord.</description_short>
+    <link_rewrite>macbook</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>MacBook</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="iPod_touch" id_shop="1">
+    <description>&lt;h3&gt;Five new hands-on applications&lt;/h3&gt;&#xD;
+&lt;p&gt;View rich HTML email with photos as well as PDF, Word, and Excel attachments. Get maps, directions, and real-time traffic information. Take notes and read stock and weather reports.&lt;/p&gt;&#xD;
+&lt;h3&gt;Touch your music, movies, and more&lt;/h3&gt;&#xD;
+&lt;p&gt;The revolutionary Multi-Touch technology built into the gorgeous 3.5-inch display lets you pinch, zoom, scroll, and flick with your fingers.&lt;/p&gt;&#xD;
+&lt;h3&gt;Internet in your pocket&lt;/h3&gt;&#xD;
+&lt;p&gt;With the Safari web browser, see websites the way they were designed to be seen and zoom in and out with a tap.&lt;sup&gt;2&lt;/sup&gt; And add Web Clips to your Home screen for quick access to favorite sites.&lt;/p&gt;&#xD;
+&lt;h3&gt;What's in the box&lt;/h3&gt;&#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;iPod touch&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Earphones&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;USB 2.0 cable&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Dock adapter&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Polishing cloth&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Stand&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Quick Start guide&lt;/li&gt;&#xD;
+&lt;/ul&gt;</description>
+    <description_short>&lt;ul&gt;&#xD;
+&lt;li&gt;Revolutionary Multi-Touch interface&lt;/li&gt;&#xD;
+&lt;li&gt;3.5-inch widescreen color display&lt;/li&gt;&#xD;
+&lt;li&gt;Wi-Fi (802.11b/g)&lt;/li&gt;&#xD;
+&lt;li&gt;8 mm thin&lt;/li&gt;&#xD;
+&lt;li&gt;Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps&lt;/li&gt;&#xD;
+&lt;/ul&gt;</description_short>
+    <link_rewrite>ipod-touch</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod touch</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_shop="1">
+    <description>&lt;p&gt;Lorem ipsum&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;Lorem ipsum&lt;/p&gt;</description_short>
+    <link_rewrite>belkin-leather-folio-for-ipod-nano-black-chocolate</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>Belkin Leather Folio for iPod nano - Black / Chocolate</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_shop="1">
+    <description>&lt;div class="product-overview-full"&gt;Using Hi-Definition MicroSpeakers to deliver full-range audio, the ergonomic and lightweight design of the SE210 earphones is ideal for premium on-the-go listening on your iPod or iPhone. They offer the most accurate audio reproduction from both portable and home stereo audio sources--for the ultimate in precision highs and rich low end. In addition, the flexible design allows you to choose the most comfortable fit from a variety of wearing positions. &lt;br /&gt; &lt;br /&gt; &lt;strong&gt;Features &lt;/strong&gt; &lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Sound-isolating design &lt;/li&gt;&#xD;
+&lt;li&gt; Hi-Definition MicroSpeaker with a single balanced armature driver &lt;/li&gt;&#xD;
+&lt;li&gt; Detachable, modular cable so you can make the cable longer or shorter depending on your activity &lt;/li&gt;&#xD;
+&lt;li&gt; Connector compatible with earphone ports on both iPod and iPhone &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+&lt;strong&gt;Specifications &lt;/strong&gt;&lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Speaker type: Hi-Definition MicroSpeaker &lt;/li&gt;&#xD;
+&lt;li&gt; Frequency range: 25Hz-18.5kHz &lt;/li&gt;&#xD;
+&lt;li&gt; Impedance (1kHz): 26 Ohms &lt;/li&gt;&#xD;
+&lt;li&gt; Sensitivity (1mW): 114 dB SPL/mW &lt;/li&gt;&#xD;
+&lt;li&gt; Cable length (with extension): 18.0 in./45.0 cm (54.0 in./137.1 cm) &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+&lt;strong&gt;In the box&lt;/strong&gt;&lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Shure SE210 earphones &lt;/li&gt;&#xD;
+&lt;li&gt; Extension cable (36.0 in./91.4 cm) &lt;/li&gt;&#xD;
+&lt;li&gt; Three pairs foam earpiece sleeves (small, medium, large) &lt;/li&gt;&#xD;
+&lt;li&gt; Three pairs soft flex earpiece sleeves (small, medium, large) &lt;/li&gt;&#xD;
+&lt;li&gt; One pair triple-flange earpiece sleeves &lt;/li&gt;&#xD;
+&lt;li&gt; Carrying case &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+Warranty&lt;br /&gt; Two-year limited &lt;br /&gt;(For details, please visit &lt;br /&gt;www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.) &lt;br /&gt;&lt;br /&gt; Mfr. Part No.: SE210-A-EFS &lt;br /&gt;&lt;br /&gt;Note: Products sold through this website that do not bear the Apple Brand name are serviced and supported exclusively by their manufacturers in accordance with terms and conditions packaged with the products. Apple's Limited Warranty does not apply to products that are not Apple-branded, even if packaged or sold with Apple products. Please contact the manufacturer directly for technical support and customer service.&lt;/div&gt;</description>
+    <description_short>&lt;p&gt;Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.&lt;/p&gt;</description_short>
+    <link_rewrite>ecouteurs-a-isolation-sonore-shure-se210-blanc</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>Shure SE210 Sound-Isolating Earphones for iPod and iPhone</name>
+    <available_now/>
+    <available_later/>
+  </product>
+</entity_product>
diff --git a/install-dev/fixtures/apple/langs/bn/data/profile.xml b/install-dev/fixtures/apple/langs/bn/data/profile.xml
new file mode 100644
index 000000000..02aa4d76c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/profile.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_profile>
+  <profile id="Administrator">
+    <name>Administrator</name>
+  </profile>
+  <profile id="Logistician">
+    <name>Logistician</name>
+  </profile>
+  <profile id="Translator">
+    <name>Translator</name>
+  </profile>
+  <profile id="Salesman">
+    <name>Salesman</name>
+  </profile>
+</entity_profile>
diff --git a/install-dev/fixtures/apple/langs/bn/data/scene.xml b/install-dev/fixtures/apple/langs/bn/data/scene.xml
new file mode 100644
index 000000000..f7270d3ff
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/scene.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<entity_scene>
+  <scene id="The_iPods_Nano">
+    <name>The iPods Nano</name>
+  </scene>
+  <scene id="The_iPods">
+    <name>The iPods</name>
+  </scene>
+  <scene id="The_MacBooks">
+    <name>The MacBooks</name>
+  </scene>
+</entity_scene>
diff --git a/install-dev/fixtures/apple/langs/bn/data/supplier.xml b/install-dev/fixtures/apple/langs/bn/data/supplier.xml
new file mode 100644
index 000000000..e9db64034
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/supplier.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_supplier>
+  <supplier id="AppleStore">
+    <description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </supplier>
+  <supplier id="Shure_Online_Store">
+    <description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </supplier>
+</entity_supplier>
diff --git a/install-dev/fixtures/apple/langs/bn/data/tag.xml b/install-dev/fixtures/apple/langs/bn/data/tag.xml
new file mode 100644
index 000000000..b781c0ed2
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/data/tag.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<entity_tag>
+  <tag id="tag_5" name="apple" products="iPod_Nano,MacBook"/>
+  <tag id="tag_22" name="superdrive" products="MacBook"/>
+  <tag id="tag_23" name="Ipod touch" products="iPod_touch"/>
+  <tag id="tag_28" name="ipod" products="iPod_Nano,iPod_shuffle"/>
+  <tag id="tag_29" name="nano" products="iPod_Nano"/>
+  <tag id="tag_33" name="shuffle" products="iPod_shuffle"/>
+</entity_tag>
diff --git a/install-dev/fixtures/apple/langs/bn/index.php b/install-dev/fixtures/apple/langs/bn/index.php
new file mode 100644
index 000000000..67d9932bf
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/bn/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/fixtures/apple/langs/id/data/attribute.xml b/install-dev/fixtures/apple/langs/id/data/attribute.xml
new file mode 100644
index 000000000..f27df851c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/attribute.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<entity_attribute>
+  <attribute id="2GB">
+    <name>2GB</name>
+  </attribute>
+  <attribute id="4GB">
+    <name>4GB</name>
+  </attribute>
+  <attribute id="Metal">
+    <name>Metal</name>
+  </attribute>
+  <attribute id="Blue">
+    <name>Blue</name>
+  </attribute>
+  <attribute id="Pink">
+    <name>Pink</name>
+  </attribute>
+  <attribute id="Green">
+    <name>Green</name>
+  </attribute>
+  <attribute id="Orange">
+    <name>Orange</name>
+  </attribute>
+  <attribute id="Optional_64GB_solid-state_drive">
+    <name>Optional 64GB solid-state drive</name>
+  </attribute>
+  <attribute id="80GB_Parallel_ATA_Drive_4200_rpm">
+    <name>80GB Parallel ATA Drive @ 4200 rpm</name>
+  </attribute>
+  <attribute id="1_60GHz_Intel_Core_2_Duo">
+    <name>1.60GHz Intel Core 2 Duo</name>
+  </attribute>
+  <attribute id="1_80GHz_Intel_Core_2_Duo">
+    <name>1.80GHz Intel Core 2 Duo</name>
+  </attribute>
+  <attribute id="80GB_20_000_Songs">
+    <name>80GB: 20,000 Songs</name>
+  </attribute>
+  <attribute id="160GB_40_000_Songs">
+    <name>160GB: 40,000 Songs</name>
+  </attribute>
+  <attribute id="Black">
+    <name>Black</name>
+  </attribute>
+  <attribute id="8GB">
+    <name>8GB</name>
+  </attribute>
+  <attribute id="16GB">
+    <name>16GB</name>
+  </attribute>
+  <attribute id="32GB">
+    <name>32GB</name>
+  </attribute>
+  <attribute id="Purple">
+    <name>Purple</name>
+  </attribute>
+  <attribute id="Yellow">
+    <name>Yellow</name>
+  </attribute>
+  <attribute id="Red">
+    <name>Red</name>
+  </attribute>
+</entity_attribute>
diff --git a/install-dev/fixtures/apple/langs/id/data/attribute_group.xml b/install-dev/fixtures/apple/langs/id/data/attribute_group.xml
new file mode 100644
index 000000000..221a81bc7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/attribute_group.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_attribute_group>
+  <attribute_group id="Disk_space">
+    <name>Disk space</name>
+    <public_name>Disk space</public_name>
+  </attribute_group>
+  <attribute_group id="Color">
+    <name>Color</name>
+    <public_name>Color</public_name>
+  </attribute_group>
+  <attribute_group id="ICU">
+    <name>ICU</name>
+    <public_name>Processor</public_name>
+  </attribute_group>
+</entity_attribute_group>
diff --git a/install-dev/fixtures/apple/langs/id/data/attributegroup.xml b/install-dev/fixtures/apple/langs/id/data/attributegroup.xml
new file mode 100644
index 000000000..977fceeb7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/attributegroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_attributegroup>
+	<attributegroup id="capacity">
+		<name><![CDATA[Disk space]]></name>
+	</attributegroup>
+	<attributegroup id="capacity_public">
+		<name><![CDATA[Disk space]]></name>
+	</attributegroup>
+	<attributegroup id="color">
+		<name><![CDATA[Color]]></name>
+	</attributegroup>
+	<attributegroup id="color_public">
+		<name><![CDATA[Color]]></name>
+	</attributegroup>
+	<attributegroup id="processor">
+		<name><![CDATA[ICU]]></name>
+	</attributegroup>
+	<attributegroup id="processor_public">
+		<name><![CDATA[Processor]]></name>
+	</attributegroup>
+</list_attributegroup>
diff --git a/install-dev/fixtures/apple/langs/id/data/carrier.xml b/install-dev/fixtures/apple/langs/id/data/carrier.xml
new file mode 100644
index 000000000..c59766e73
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/carrier.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<entity_carrier>
+  <carrier id="My_carrier" id_shop="1">
+    <delay>Delivery next day!</delay>
+  </carrier>
+</entity_carrier>
diff --git a/install-dev/fixtures/apple/langs/id/data/category.xml b/install-dev/fixtures/apple/langs/id/data/category.xml
new file mode 100644
index 000000000..eeae63831
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/category.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<entity_category>
+  <category id="iPods" id_shop="1">
+    <name>iPods</name>
+    <description>Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.</description>
+    <link_rewrite>music-ipods</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id="Accessories" id_shop="1">
+    <name>Accessories</name>
+    <description>Wonderful accessories for your iPod</description>
+    <link_rewrite>accessories-ipod</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id="Laptops" id_shop="1">
+    <name>Laptops</name>
+    <description>The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.</description>
+    <link_rewrite>laptops</link_rewrite>
+    <meta_title>Apple laptops</meta_title>
+    <meta_keywords>Apple laptops MacBook Air</meta_keywords>
+    <meta_description>Powerful and chic Apple laptops</meta_description>
+  </category>
+</entity_category>
diff --git a/install-dev/fixtures/apple/langs/id/data/feature.xml b/install-dev/fixtures/apple/langs/id/data/feature.xml
new file mode 100644
index 000000000..7682c6495
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/feature.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<entity_feature>
+  <feature id="Height">
+    <name>Height</name>
+  </feature>
+  <feature id="Width">
+    <name>Width</name>
+  </feature>
+  <feature id="Depth">
+    <name>Depth</name>
+  </feature>
+  <feature id="Weight">
+    <name>Weight</name>
+  </feature>
+  <feature id="Headphone">
+    <name>Headphone</name>
+  </feature>
+</entity_feature>
diff --git a/install-dev/fixtures/apple/langs/id/data/feature_value.xml b/install-dev/fixtures/apple/langs/id/data/feature_value.xml
new file mode 100644
index 000000000..d3a824d22
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/feature_value.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<entity_feature_value>
+  <feature_value id="Jack_stereo">
+    <value>Jack stereo</value>
+  </feature_value>
+  <feature_value id="Mini-jack_stereo">
+    <value>Mini-jack stereo</value>
+  </feature_value>
+  <feature_value id="2_75_in">
+    <value>2.75 in</value>
+  </feature_value>
+  <feature_value id="2_06_in">
+    <value>2.06 in</value>
+  </feature_value>
+  <feature_value id="49_2_g">
+    <value>49.2 g</value>
+  </feature_value>
+  <feature_value id="0_26_in">
+    <value>0.26 in</value>
+  </feature_value>
+  <feature_value id="1_07_in">
+    <value>1.07 in</value>
+  </feature_value>
+  <feature_value id="1_62_in">
+    <value>1.62 in</value>
+  </feature_value>
+  <feature_value id="15_5_g">
+    <value>15.5 g</value>
+  </feature_value>
+  <feature_value id="0_41_in_clip_included">
+    <value>0.41 in (clip included)</value>
+  </feature_value>
+  <feature_value id="4_33_in">
+    <value>4.33 in</value>
+  </feature_value>
+  <feature_value id="2_76_in">
+    <value>2.76 in</value>
+  </feature_value>
+  <feature_value id="120g">
+    <value>120g</value>
+  </feature_value>
+  <feature_value id="0_31_in">
+    <value>0.31 in</value>
+  </feature_value>
+</entity_feature_value>
diff --git a/install-dev/fixtures/apple/langs/id/data/featurevalue.xml b/install-dev/fixtures/apple/langs/id/data/featurevalue.xml
new file mode 100644
index 000000000..d101bed96
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/featurevalue.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_featurevalue>
+	<featurevalue id="jack_stereo">
+		<value><![CDATA[Jack stereo]]></value>
+	</featurevalue>
+	<featurevalue id="mini_jack_stereo">
+		<value><![CDATA[Mini-jack stereo]]></value>
+	</featurevalue>
+	<featurevalue id="2.75in">
+		<value><![CDATA[2.75 in]]></value>
+	</featurevalue>
+	<featurevalue id="2.06in">
+		<value><![CDATA[2.06 in]]></value>
+	</featurevalue>
+	<featurevalue id="49.2g">
+		<value><![CDATA[49.2 g]]></value>
+	</featurevalue>
+	<featurevalue id="0.26in">
+		<value><![CDATA[0.26 in]]></value>
+	</featurevalue>
+	<featurevalue id="1.07in">
+		<value><![CDATA[1.07 in]]></value>
+	</featurevalue>
+	<featurevalue id="1.62in">
+		<value><![CDATA[1.62 in]]></value>
+	</featurevalue>
+	<featurevalue id="15.5g">
+		<value><![CDATA[15.5 g]]></value>
+	</featurevalue>
+	<featurevalue id="0.41in">
+		<value><![CDATA[0.41 in (clip included)]]></value>
+	</featurevalue>
+	<featurevalue id="4.33in">
+		<value><![CDATA[4.33 in]]></value>
+	</featurevalue>
+	<featurevalue id="2.76in">
+		<value><![CDATA[2.76 in]]></value>
+	</featurevalue>
+	<featurevalue id="120g">
+		<value><![CDATA[120g]]></value>
+	</featurevalue>
+	<featurevalue id="0.31in">
+		<value><![CDATA[0.31 in]]></value>
+	</featurevalue>
+</list_featurevalue>
diff --git a/install-dev/fixtures/apple/langs/id/data/image.xml b/install-dev/fixtures/apple/langs/id/data/image.xml
new file mode 100644
index 000000000..49a836dc3
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/image.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<entity_image>
+  <image id="MacBook_Air">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_1">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_2">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_3">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_4">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_SuperDrive">
+    <legend> MacBook Air SuperDrive</legend>
+  </image>
+  <image id="iPod_touch">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_1">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_2">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_3">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_4">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_5">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="housse-portefeuille-en-cuir">
+    <legend>housse-portefeuille-en-cuir</legend>
+  </image>
+  <image id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone">
+    <legend>Shure SE210 Sound-Isolating Earphones for iPod and iPhone</legend>
+  </image>
+  <image id="iPod_Nano">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_1">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_2">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_3">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_4">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_5">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_6">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_7">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_shuffle">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_1">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_2">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_3">
+    <legend>iPod shuffle</legend>
+  </image>
+</entity_image>
diff --git a/install-dev/fixtures/apple/langs/id/data/index.php b/install-dev/fixtures/apple/langs/id/data/index.php
new file mode 100644
index 000000000..fcb7f5c2b
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/fixtures/apple/langs/id/data/manufacturer.xml b/install-dev/fixtures/apple/langs/id/data/manufacturer.xml
new file mode 100644
index 000000000..f06ff9661
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/manufacturer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<entity_manufacturer>
+  <manufacturer id="Apple_Computer_Inc">
+    <description/>
+    <short_description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </manufacturer>
+  <manufacturer id="Shure_Incorporated">
+    <description/>
+    <short_description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </manufacturer>
+</entity_manufacturer>
diff --git a/install-dev/fixtures/apple/langs/id/data/order_message.xml b/install-dev/fixtures/apple/langs/id/data/order_message.xml
new file mode 100644
index 000000000..93ad3b501
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/order_message.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<entity_order_message>
+  <order_message id="Delay">
+    <name>Delay</name>
+    <message>Hi,
+
+Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.
+Please accept our apologies and rest assured that we are working hard to rectify this.
+
+Best regards,</message>
+  </order_message>
+</entity_order_message>
diff --git a/install-dev/fixtures/apple/langs/id/data/ordermessage.xml b/install-dev/fixtures/apple/langs/id/data/ordermessage.xml
new file mode 100644
index 000000000..e743f5d97
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/ordermessage.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_ordermessage>
+	<ordermessage id="delay">
+		<name><![CDATA[Delay]]></name>
+		<message><![CDATA[Hi,

Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.
Please accept our apologies and rest assured that we are working hard to rectify this.

Best regards,]]></message>
+	</ordermessage>
+</list_ordermessage>
diff --git a/install-dev/fixtures/apple/langs/id/data/product.xml b/install-dev/fixtures/apple/langs/id/data/product.xml
new file mode 100644
index 000000000..0c405b001
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/product.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<entity_product>
+  <product id="iPod_Nano" id_shop="1">
+    <description>&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Curved ahead of the curve.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass design and you won't want to put iPod nano down.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Great looks. And brains, too.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;The new Genius feature turns iPod nano into your own highly intelligent, personal DJ. It creates playlists by finding songs in your library that go great together.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Made to move with your moves.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;The accelerometer comes to iPod nano. Give it a shake to shuffle your music. Turn it sideways to view Cover Flow. And play games designed with your moves in mind.&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.&lt;/p&gt;</description_short>
+    <link_rewrite>ipod-nano</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod Nano</name>
+    <available_now>In stock</available_now>
+    <available_later/>
+  </product>
+  <product id="iPod_shuffle" id_shop="1">
+    <description>&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Instant attachment.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;Wear up to 500 songs on your sleeve. Or your belt. Or your gym shorts. iPod shuffle is a badge of musical devotion. Now in new, more brilliant colors.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Feed your iPod shuffle.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;iTunes is your entertainment superstore. It&#x2019;s your ultra-organized music collection and jukebox. And it&#x2019;s how you load up your iPod shuffle in one click.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Beauty and the beat.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;Intensely colorful anodized aluminum complements the simple design of iPod shuffle. Now in blue, green, pink, red, and original silver.&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;iPod shuffle, the world&#x2019;s most wearable music player, now clips on in more vibrant blue, green, pink, and red.&lt;/p&gt;</description_short>
+    <link_rewrite>ipod-shuffle</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod shuffle</name>
+    <available_now>In stock</available_now>
+    <available_later/>
+  </product>
+  <product id="MacBook_Air" id_shop="1">
+    <description>&lt;p&gt;MacBook Air is nearly as thin as your index finger. Practically every detail that could be streamlined has been. Yet it still has a 13.3-inch widescreen LED display, full-size keyboard, and large multi-touch trackpad. It&#x2019;s incomparably portable without the usual ultraportable screen and keyboard compromises.&lt;/p&gt;&lt;p&gt;The incredible thinness of MacBook Air is the result of numerous size- and weight-shaving innovations. From a slimmer hard drive to strategically hidden I/O ports to a lower-profile battery, everything has been considered and reconsidered with thinness in mind.&lt;/p&gt;&lt;p&gt;MacBook Air is designed and engineered to take full advantage of the wireless world. A world in which 802.11n Wi-Fi is now so fast and so available, people are truly living untethered &#x2014; buying and renting movies online, downloading software, and sharing and storing files on the web. &lt;/p&gt;</description>
+    <description_short>MacBook Air is ultrathin, ultraportable, and ultra unlike anything else. But you don&#x2019;t lose inches and pounds overnight. It&#x2019;s the result of rethinking conventions. Of multiple wireless innovations. And of breakthrough design. With MacBook Air, mobile computing suddenly has a new standard.</description_short>
+    <link_rewrite>macbook-air</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>MacBook Air</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="MacBook" id_shop="1">
+    <description>Every MacBook has a larger hard drive, up to 250GB, to store growing media collections and valuable data.&lt;br /&gt;&lt;br /&gt;The 2.4GHz MacBook models now include 2GB of memory standard &#x2014; perfect for running more of your favorite applications smoothly.</description>
+    <description_short>MacBook makes it easy to hit the road thanks to its tough polycarbonate case, built-in wireless technologies, and innovative MagSafe Power Adapter that releases automatically if someone accidentally trips on the cord.</description_short>
+    <link_rewrite>macbook</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>MacBook</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="iPod_touch" id_shop="1">
+    <description>&lt;h3&gt;Five new hands-on applications&lt;/h3&gt;&#xD;
+&lt;p&gt;View rich HTML email with photos as well as PDF, Word, and Excel attachments. Get maps, directions, and real-time traffic information. Take notes and read stock and weather reports.&lt;/p&gt;&#xD;
+&lt;h3&gt;Touch your music, movies, and more&lt;/h3&gt;&#xD;
+&lt;p&gt;The revolutionary Multi-Touch technology built into the gorgeous 3.5-inch display lets you pinch, zoom, scroll, and flick with your fingers.&lt;/p&gt;&#xD;
+&lt;h3&gt;Internet in your pocket&lt;/h3&gt;&#xD;
+&lt;p&gt;With the Safari web browser, see websites the way they were designed to be seen and zoom in and out with a tap.&lt;sup&gt;2&lt;/sup&gt; And add Web Clips to your Home screen for quick access to favorite sites.&lt;/p&gt;&#xD;
+&lt;h3&gt;What's in the box&lt;/h3&gt;&#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;iPod touch&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Earphones&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;USB 2.0 cable&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Dock adapter&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Polishing cloth&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Stand&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Quick Start guide&lt;/li&gt;&#xD;
+&lt;/ul&gt;</description>
+    <description_short>&lt;ul&gt;&#xD;
+&lt;li&gt;Revolutionary Multi-Touch interface&lt;/li&gt;&#xD;
+&lt;li&gt;3.5-inch widescreen color display&lt;/li&gt;&#xD;
+&lt;li&gt;Wi-Fi (802.11b/g)&lt;/li&gt;&#xD;
+&lt;li&gt;8 mm thin&lt;/li&gt;&#xD;
+&lt;li&gt;Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps&lt;/li&gt;&#xD;
+&lt;/ul&gt;</description_short>
+    <link_rewrite>ipod-touch</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod touch</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_shop="1">
+    <description>&lt;p&gt;Lorem ipsum&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;Lorem ipsum&lt;/p&gt;</description_short>
+    <link_rewrite>belkin-leather-folio-for-ipod-nano-black-chocolate</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>Belkin Leather Folio for iPod nano - Black / Chocolate</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_shop="1">
+    <description>&lt;div class="product-overview-full"&gt;Using Hi-Definition MicroSpeakers to deliver full-range audio, the ergonomic and lightweight design of the SE210 earphones is ideal for premium on-the-go listening on your iPod or iPhone. They offer the most accurate audio reproduction from both portable and home stereo audio sources--for the ultimate in precision highs and rich low end. In addition, the flexible design allows you to choose the most comfortable fit from a variety of wearing positions. &lt;br /&gt; &lt;br /&gt; &lt;strong&gt;Features &lt;/strong&gt; &lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Sound-isolating design &lt;/li&gt;&#xD;
+&lt;li&gt; Hi-Definition MicroSpeaker with a single balanced armature driver &lt;/li&gt;&#xD;
+&lt;li&gt; Detachable, modular cable so you can make the cable longer or shorter depending on your activity &lt;/li&gt;&#xD;
+&lt;li&gt; Connector compatible with earphone ports on both iPod and iPhone &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+&lt;strong&gt;Specifications &lt;/strong&gt;&lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Speaker type: Hi-Definition MicroSpeaker &lt;/li&gt;&#xD;
+&lt;li&gt; Frequency range: 25Hz-18.5kHz &lt;/li&gt;&#xD;
+&lt;li&gt; Impedance (1kHz): 26 Ohms &lt;/li&gt;&#xD;
+&lt;li&gt; Sensitivity (1mW): 114 dB SPL/mW &lt;/li&gt;&#xD;
+&lt;li&gt; Cable length (with extension): 18.0 in./45.0 cm (54.0 in./137.1 cm) &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+&lt;strong&gt;In the box&lt;/strong&gt;&lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Shure SE210 earphones &lt;/li&gt;&#xD;
+&lt;li&gt; Extension cable (36.0 in./91.4 cm) &lt;/li&gt;&#xD;
+&lt;li&gt; Three pairs foam earpiece sleeves (small, medium, large) &lt;/li&gt;&#xD;
+&lt;li&gt; Three pairs soft flex earpiece sleeves (small, medium, large) &lt;/li&gt;&#xD;
+&lt;li&gt; One pair triple-flange earpiece sleeves &lt;/li&gt;&#xD;
+&lt;li&gt; Carrying case &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+Warranty&lt;br /&gt; Two-year limited &lt;br /&gt;(For details, please visit &lt;br /&gt;www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.) &lt;br /&gt;&lt;br /&gt; Mfr. Part No.: SE210-A-EFS &lt;br /&gt;&lt;br /&gt;Note: Products sold through this website that do not bear the Apple Brand name are serviced and supported exclusively by their manufacturers in accordance with terms and conditions packaged with the products. Apple's Limited Warranty does not apply to products that are not Apple-branded, even if packaged or sold with Apple products. Please contact the manufacturer directly for technical support and customer service.&lt;/div&gt;</description>
+    <description_short>&lt;p&gt;Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.&lt;/p&gt;</description_short>
+    <link_rewrite>ecouteurs-a-isolation-sonore-shure-se210-blanc</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>Shure SE210 Sound-Isolating Earphones for iPod and iPhone</name>
+    <available_now/>
+    <available_later/>
+  </product>
+</entity_product>
diff --git a/install-dev/fixtures/apple/langs/id/data/profile.xml b/install-dev/fixtures/apple/langs/id/data/profile.xml
new file mode 100644
index 000000000..02aa4d76c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/profile.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_profile>
+  <profile id="Administrator">
+    <name>Administrator</name>
+  </profile>
+  <profile id="Logistician">
+    <name>Logistician</name>
+  </profile>
+  <profile id="Translator">
+    <name>Translator</name>
+  </profile>
+  <profile id="Salesman">
+    <name>Salesman</name>
+  </profile>
+</entity_profile>
diff --git a/install-dev/fixtures/apple/langs/id/data/scene.xml b/install-dev/fixtures/apple/langs/id/data/scene.xml
new file mode 100644
index 000000000..f7270d3ff
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/scene.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<entity_scene>
+  <scene id="The_iPods_Nano">
+    <name>The iPods Nano</name>
+  </scene>
+  <scene id="The_iPods">
+    <name>The iPods</name>
+  </scene>
+  <scene id="The_MacBooks">
+    <name>The MacBooks</name>
+  </scene>
+</entity_scene>
diff --git a/install-dev/fixtures/apple/langs/id/data/supplier.xml b/install-dev/fixtures/apple/langs/id/data/supplier.xml
new file mode 100644
index 000000000..e9db64034
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/supplier.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_supplier>
+  <supplier id="AppleStore">
+    <description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </supplier>
+  <supplier id="Shure_Online_Store">
+    <description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </supplier>
+</entity_supplier>
diff --git a/install-dev/fixtures/apple/langs/id/data/tag.xml b/install-dev/fixtures/apple/langs/id/data/tag.xml
new file mode 100644
index 000000000..b781c0ed2
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/data/tag.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<entity_tag>
+  <tag id="tag_5" name="apple" products="iPod_Nano,MacBook"/>
+  <tag id="tag_22" name="superdrive" products="MacBook"/>
+  <tag id="tag_23" name="Ipod touch" products="iPod_touch"/>
+  <tag id="tag_28" name="ipod" products="iPod_Nano,iPod_shuffle"/>
+  <tag id="tag_29" name="nano" products="iPod_Nano"/>
+  <tag id="tag_33" name="shuffle" products="iPod_shuffle"/>
+</entity_tag>
diff --git a/install-dev/fixtures/apple/langs/id/index.php b/install-dev/fixtures/apple/langs/id/index.php
new file mode 100644
index 000000000..67d9932bf
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/id/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/fixtures/apple/langs/tw/data/attribute.xml b/install-dev/fixtures/apple/langs/tw/data/attribute.xml
new file mode 100644
index 000000000..f27df851c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/attribute.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<entity_attribute>
+  <attribute id="2GB">
+    <name>2GB</name>
+  </attribute>
+  <attribute id="4GB">
+    <name>4GB</name>
+  </attribute>
+  <attribute id="Metal">
+    <name>Metal</name>
+  </attribute>
+  <attribute id="Blue">
+    <name>Blue</name>
+  </attribute>
+  <attribute id="Pink">
+    <name>Pink</name>
+  </attribute>
+  <attribute id="Green">
+    <name>Green</name>
+  </attribute>
+  <attribute id="Orange">
+    <name>Orange</name>
+  </attribute>
+  <attribute id="Optional_64GB_solid-state_drive">
+    <name>Optional 64GB solid-state drive</name>
+  </attribute>
+  <attribute id="80GB_Parallel_ATA_Drive_4200_rpm">
+    <name>80GB Parallel ATA Drive @ 4200 rpm</name>
+  </attribute>
+  <attribute id="1_60GHz_Intel_Core_2_Duo">
+    <name>1.60GHz Intel Core 2 Duo</name>
+  </attribute>
+  <attribute id="1_80GHz_Intel_Core_2_Duo">
+    <name>1.80GHz Intel Core 2 Duo</name>
+  </attribute>
+  <attribute id="80GB_20_000_Songs">
+    <name>80GB: 20,000 Songs</name>
+  </attribute>
+  <attribute id="160GB_40_000_Songs">
+    <name>160GB: 40,000 Songs</name>
+  </attribute>
+  <attribute id="Black">
+    <name>Black</name>
+  </attribute>
+  <attribute id="8GB">
+    <name>8GB</name>
+  </attribute>
+  <attribute id="16GB">
+    <name>16GB</name>
+  </attribute>
+  <attribute id="32GB">
+    <name>32GB</name>
+  </attribute>
+  <attribute id="Purple">
+    <name>Purple</name>
+  </attribute>
+  <attribute id="Yellow">
+    <name>Yellow</name>
+  </attribute>
+  <attribute id="Red">
+    <name>Red</name>
+  </attribute>
+</entity_attribute>
diff --git a/install-dev/fixtures/apple/langs/tw/data/attribute_group.xml b/install-dev/fixtures/apple/langs/tw/data/attribute_group.xml
new file mode 100644
index 000000000..221a81bc7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/attribute_group.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_attribute_group>
+  <attribute_group id="Disk_space">
+    <name>Disk space</name>
+    <public_name>Disk space</public_name>
+  </attribute_group>
+  <attribute_group id="Color">
+    <name>Color</name>
+    <public_name>Color</public_name>
+  </attribute_group>
+  <attribute_group id="ICU">
+    <name>ICU</name>
+    <public_name>Processor</public_name>
+  </attribute_group>
+</entity_attribute_group>
diff --git a/install-dev/fixtures/apple/langs/tw/data/attributegroup.xml b/install-dev/fixtures/apple/langs/tw/data/attributegroup.xml
new file mode 100644
index 000000000..977fceeb7
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/attributegroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_attributegroup>
+	<attributegroup id="capacity">
+		<name><![CDATA[Disk space]]></name>
+	</attributegroup>
+	<attributegroup id="capacity_public">
+		<name><![CDATA[Disk space]]></name>
+	</attributegroup>
+	<attributegroup id="color">
+		<name><![CDATA[Color]]></name>
+	</attributegroup>
+	<attributegroup id="color_public">
+		<name><![CDATA[Color]]></name>
+	</attributegroup>
+	<attributegroup id="processor">
+		<name><![CDATA[ICU]]></name>
+	</attributegroup>
+	<attributegroup id="processor_public">
+		<name><![CDATA[Processor]]></name>
+	</attributegroup>
+</list_attributegroup>
diff --git a/install-dev/fixtures/apple/langs/tw/data/carrier.xml b/install-dev/fixtures/apple/langs/tw/data/carrier.xml
new file mode 100644
index 000000000..c59766e73
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/carrier.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<entity_carrier>
+  <carrier id="My_carrier" id_shop="1">
+    <delay>Delivery next day!</delay>
+  </carrier>
+</entity_carrier>
diff --git a/install-dev/fixtures/apple/langs/tw/data/category.xml b/install-dev/fixtures/apple/langs/tw/data/category.xml
new file mode 100644
index 000000000..eeae63831
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/category.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<entity_category>
+  <category id="iPods" id_shop="1">
+    <name>iPods</name>
+    <description>Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater.</description>
+    <link_rewrite>music-ipods</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id="Accessories" id_shop="1">
+    <name>Accessories</name>
+    <description>Wonderful accessories for your iPod</description>
+    <link_rewrite>accessories-ipod</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id="Laptops" id_shop="1">
+    <name>Laptops</name>
+    <description>The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part.</description>
+    <link_rewrite>laptops</link_rewrite>
+    <meta_title>Apple laptops</meta_title>
+    <meta_keywords>Apple laptops MacBook Air</meta_keywords>
+    <meta_description>Powerful and chic Apple laptops</meta_description>
+  </category>
+</entity_category>
diff --git a/install-dev/fixtures/apple/langs/tw/data/feature.xml b/install-dev/fixtures/apple/langs/tw/data/feature.xml
new file mode 100644
index 000000000..7682c6495
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/feature.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<entity_feature>
+  <feature id="Height">
+    <name>Height</name>
+  </feature>
+  <feature id="Width">
+    <name>Width</name>
+  </feature>
+  <feature id="Depth">
+    <name>Depth</name>
+  </feature>
+  <feature id="Weight">
+    <name>Weight</name>
+  </feature>
+  <feature id="Headphone">
+    <name>Headphone</name>
+  </feature>
+</entity_feature>
diff --git a/install-dev/fixtures/apple/langs/tw/data/feature_value.xml b/install-dev/fixtures/apple/langs/tw/data/feature_value.xml
new file mode 100644
index 000000000..d3a824d22
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/feature_value.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<entity_feature_value>
+  <feature_value id="Jack_stereo">
+    <value>Jack stereo</value>
+  </feature_value>
+  <feature_value id="Mini-jack_stereo">
+    <value>Mini-jack stereo</value>
+  </feature_value>
+  <feature_value id="2_75_in">
+    <value>2.75 in</value>
+  </feature_value>
+  <feature_value id="2_06_in">
+    <value>2.06 in</value>
+  </feature_value>
+  <feature_value id="49_2_g">
+    <value>49.2 g</value>
+  </feature_value>
+  <feature_value id="0_26_in">
+    <value>0.26 in</value>
+  </feature_value>
+  <feature_value id="1_07_in">
+    <value>1.07 in</value>
+  </feature_value>
+  <feature_value id="1_62_in">
+    <value>1.62 in</value>
+  </feature_value>
+  <feature_value id="15_5_g">
+    <value>15.5 g</value>
+  </feature_value>
+  <feature_value id="0_41_in_clip_included">
+    <value>0.41 in (clip included)</value>
+  </feature_value>
+  <feature_value id="4_33_in">
+    <value>4.33 in</value>
+  </feature_value>
+  <feature_value id="2_76_in">
+    <value>2.76 in</value>
+  </feature_value>
+  <feature_value id="120g">
+    <value>120g</value>
+  </feature_value>
+  <feature_value id="0_31_in">
+    <value>0.31 in</value>
+  </feature_value>
+</entity_feature_value>
diff --git a/install-dev/fixtures/apple/langs/tw/data/featurevalue.xml b/install-dev/fixtures/apple/langs/tw/data/featurevalue.xml
new file mode 100644
index 000000000..d101bed96
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/featurevalue.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_featurevalue>
+	<featurevalue id="jack_stereo">
+		<value><![CDATA[Jack stereo]]></value>
+	</featurevalue>
+	<featurevalue id="mini_jack_stereo">
+		<value><![CDATA[Mini-jack stereo]]></value>
+	</featurevalue>
+	<featurevalue id="2.75in">
+		<value><![CDATA[2.75 in]]></value>
+	</featurevalue>
+	<featurevalue id="2.06in">
+		<value><![CDATA[2.06 in]]></value>
+	</featurevalue>
+	<featurevalue id="49.2g">
+		<value><![CDATA[49.2 g]]></value>
+	</featurevalue>
+	<featurevalue id="0.26in">
+		<value><![CDATA[0.26 in]]></value>
+	</featurevalue>
+	<featurevalue id="1.07in">
+		<value><![CDATA[1.07 in]]></value>
+	</featurevalue>
+	<featurevalue id="1.62in">
+		<value><![CDATA[1.62 in]]></value>
+	</featurevalue>
+	<featurevalue id="15.5g">
+		<value><![CDATA[15.5 g]]></value>
+	</featurevalue>
+	<featurevalue id="0.41in">
+		<value><![CDATA[0.41 in (clip included)]]></value>
+	</featurevalue>
+	<featurevalue id="4.33in">
+		<value><![CDATA[4.33 in]]></value>
+	</featurevalue>
+	<featurevalue id="2.76in">
+		<value><![CDATA[2.76 in]]></value>
+	</featurevalue>
+	<featurevalue id="120g">
+		<value><![CDATA[120g]]></value>
+	</featurevalue>
+	<featurevalue id="0.31in">
+		<value><![CDATA[0.31 in]]></value>
+	</featurevalue>
+</list_featurevalue>
diff --git a/install-dev/fixtures/apple/langs/tw/data/image.xml b/install-dev/fixtures/apple/langs/tw/data/image.xml
new file mode 100644
index 000000000..49a836dc3
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/image.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<entity_image>
+  <image id="MacBook_Air">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_1">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_2">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_3">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_4">
+    <legend>MacBook Air</legend>
+  </image>
+  <image id="MacBook_Air_SuperDrive">
+    <legend> MacBook Air SuperDrive</legend>
+  </image>
+  <image id="iPod_touch">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_1">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_2">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_3">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_4">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="iPod_touch_5">
+    <legend>iPod touch</legend>
+  </image>
+  <image id="housse-portefeuille-en-cuir">
+    <legend>housse-portefeuille-en-cuir</legend>
+  </image>
+  <image id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone">
+    <legend>Shure SE210 Sound-Isolating Earphones for iPod and iPhone</legend>
+  </image>
+  <image id="iPod_Nano">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_1">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_2">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_3">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_4">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_5">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_6">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_Nano_7">
+    <legend>iPod Nano</legend>
+  </image>
+  <image id="iPod_shuffle">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_1">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_2">
+    <legend>iPod shuffle</legend>
+  </image>
+  <image id="iPod_shuffle_3">
+    <legend>iPod shuffle</legend>
+  </image>
+</entity_image>
diff --git a/install-dev/fixtures/apple/langs/tw/data/index.php b/install-dev/fixtures/apple/langs/tw/data/index.php
new file mode 100644
index 000000000..fcb7f5c2b
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/fixtures/apple/langs/tw/data/manufacturer.xml b/install-dev/fixtures/apple/langs/tw/data/manufacturer.xml
new file mode 100644
index 000000000..f06ff9661
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/manufacturer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<entity_manufacturer>
+  <manufacturer id="Apple_Computer_Inc">
+    <description/>
+    <short_description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </manufacturer>
+  <manufacturer id="Shure_Incorporated">
+    <description/>
+    <short_description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </manufacturer>
+</entity_manufacturer>
diff --git a/install-dev/fixtures/apple/langs/tw/data/order_message.xml b/install-dev/fixtures/apple/langs/tw/data/order_message.xml
new file mode 100644
index 000000000..93ad3b501
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/order_message.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<entity_order_message>
+  <order_message id="Delay">
+    <name>Delay</name>
+    <message>Hi,
+
+Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.
+Please accept our apologies and rest assured that we are working hard to rectify this.
+
+Best regards,</message>
+  </order_message>
+</entity_order_message>
diff --git a/install-dev/fixtures/apple/langs/tw/data/ordermessage.xml b/install-dev/fixtures/apple/langs/tw/data/ordermessage.xml
new file mode 100644
index 000000000..e743f5d97
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/ordermessage.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list_ordermessage>
+	<ordermessage id="delay">
+		<name><![CDATA[Delay]]></name>
+		<message><![CDATA[Hi,

Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.
Please accept our apologies and rest assured that we are working hard to rectify this.

Best regards,]]></message>
+	</ordermessage>
+</list_ordermessage>
diff --git a/install-dev/fixtures/apple/langs/tw/data/product.xml b/install-dev/fixtures/apple/langs/tw/data/product.xml
new file mode 100644
index 000000000..0c405b001
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/product.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<entity_product>
+  <product id="iPod_Nano" id_shop="1">
+    <description>&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Curved ahead of the curve.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass design and you won't want to put iPod nano down.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Great looks. And brains, too.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;The new Genius feature turns iPod nano into your own highly intelligent, personal DJ. It creates playlists by finding songs in your library that go great together.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;strong&gt;&lt;span style="font-size: small;"&gt;Made to move with your moves.&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;The accelerometer comes to iPod nano. Give it a shake to shuffle your music. Turn it sideways to view Cover Flow. And play games designed with your moves in mind.&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.&lt;/p&gt;</description_short>
+    <link_rewrite>ipod-nano</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod Nano</name>
+    <available_now>In stock</available_now>
+    <available_later/>
+  </product>
+  <product id="iPod_shuffle" id_shop="1">
+    <description>&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Instant attachment.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;Wear up to 500 songs on your sleeve. Or your belt. Or your gym shorts. iPod shuffle is a badge of musical devotion. Now in new, more brilliant colors.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Feed your iPod shuffle.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;iTunes is your entertainment superstore. It&#x2019;s your ultra-organized music collection and jukebox. And it&#x2019;s how you load up your iPod shuffle in one click.&lt;/p&gt;&#xD;
+&lt;p&gt;&lt;span style="font-size: small;"&gt;&lt;strong&gt;Beauty and the beat.&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;&#xD;
+&lt;p&gt;Intensely colorful anodized aluminum complements the simple design of iPod shuffle. Now in blue, green, pink, red, and original silver.&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;iPod shuffle, the world&#x2019;s most wearable music player, now clips on in more vibrant blue, green, pink, and red.&lt;/p&gt;</description_short>
+    <link_rewrite>ipod-shuffle</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod shuffle</name>
+    <available_now>In stock</available_now>
+    <available_later/>
+  </product>
+  <product id="MacBook_Air" id_shop="1">
+    <description>&lt;p&gt;MacBook Air is nearly as thin as your index finger. Practically every detail that could be streamlined has been. Yet it still has a 13.3-inch widescreen LED display, full-size keyboard, and large multi-touch trackpad. It&#x2019;s incomparably portable without the usual ultraportable screen and keyboard compromises.&lt;/p&gt;&lt;p&gt;The incredible thinness of MacBook Air is the result of numerous size- and weight-shaving innovations. From a slimmer hard drive to strategically hidden I/O ports to a lower-profile battery, everything has been considered and reconsidered with thinness in mind.&lt;/p&gt;&lt;p&gt;MacBook Air is designed and engineered to take full advantage of the wireless world. A world in which 802.11n Wi-Fi is now so fast and so available, people are truly living untethered &#x2014; buying and renting movies online, downloading software, and sharing and storing files on the web. &lt;/p&gt;</description>
+    <description_short>MacBook Air is ultrathin, ultraportable, and ultra unlike anything else. But you don&#x2019;t lose inches and pounds overnight. It&#x2019;s the result of rethinking conventions. Of multiple wireless innovations. And of breakthrough design. With MacBook Air, mobile computing suddenly has a new standard.</description_short>
+    <link_rewrite>macbook-air</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>MacBook Air</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="MacBook" id_shop="1">
+    <description>Every MacBook has a larger hard drive, up to 250GB, to store growing media collections and valuable data.&lt;br /&gt;&lt;br /&gt;The 2.4GHz MacBook models now include 2GB of memory standard &#x2014; perfect for running more of your favorite applications smoothly.</description>
+    <description_short>MacBook makes it easy to hit the road thanks to its tough polycarbonate case, built-in wireless technologies, and innovative MagSafe Power Adapter that releases automatically if someone accidentally trips on the cord.</description_short>
+    <link_rewrite>macbook</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>MacBook</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="iPod_touch" id_shop="1">
+    <description>&lt;h3&gt;Five new hands-on applications&lt;/h3&gt;&#xD;
+&lt;p&gt;View rich HTML email with photos as well as PDF, Word, and Excel attachments. Get maps, directions, and real-time traffic information. Take notes and read stock and weather reports.&lt;/p&gt;&#xD;
+&lt;h3&gt;Touch your music, movies, and more&lt;/h3&gt;&#xD;
+&lt;p&gt;The revolutionary Multi-Touch technology built into the gorgeous 3.5-inch display lets you pinch, zoom, scroll, and flick with your fingers.&lt;/p&gt;&#xD;
+&lt;h3&gt;Internet in your pocket&lt;/h3&gt;&#xD;
+&lt;p&gt;With the Safari web browser, see websites the way they were designed to be seen and zoom in and out with a tap.&lt;sup&gt;2&lt;/sup&gt; And add Web Clips to your Home screen for quick access to favorite sites.&lt;/p&gt;&#xD;
+&lt;h3&gt;What's in the box&lt;/h3&gt;&#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;iPod touch&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Earphones&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;USB 2.0 cable&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Dock adapter&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Polishing cloth&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Stand&lt;/li&gt;&#xD;
+&lt;li&gt;&lt;span&gt;&lt;/span&gt;Quick Start guide&lt;/li&gt;&#xD;
+&lt;/ul&gt;</description>
+    <description_short>&lt;ul&gt;&#xD;
+&lt;li&gt;Revolutionary Multi-Touch interface&lt;/li&gt;&#xD;
+&lt;li&gt;3.5-inch widescreen color display&lt;/li&gt;&#xD;
+&lt;li&gt;Wi-Fi (802.11b/g)&lt;/li&gt;&#xD;
+&lt;li&gt;8 mm thin&lt;/li&gt;&#xD;
+&lt;li&gt;Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps&lt;/li&gt;&#xD;
+&lt;/ul&gt;</description_short>
+    <link_rewrite>ipod-touch</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>iPod touch</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_shop="1">
+    <description>&lt;p&gt;Lorem ipsum&lt;/p&gt;</description>
+    <description_short>&lt;p&gt;Lorem ipsum&lt;/p&gt;</description_short>
+    <link_rewrite>belkin-leather-folio-for-ipod-nano-black-chocolate</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>Belkin Leather Folio for iPod nano - Black / Chocolate</name>
+    <available_now/>
+    <available_later/>
+  </product>
+  <product id="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_shop="1">
+    <description>&lt;div class="product-overview-full"&gt;Using Hi-Definition MicroSpeakers to deliver full-range audio, the ergonomic and lightweight design of the SE210 earphones is ideal for premium on-the-go listening on your iPod or iPhone. They offer the most accurate audio reproduction from both portable and home stereo audio sources--for the ultimate in precision highs and rich low end. In addition, the flexible design allows you to choose the most comfortable fit from a variety of wearing positions. &lt;br /&gt; &lt;br /&gt; &lt;strong&gt;Features &lt;/strong&gt; &lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Sound-isolating design &lt;/li&gt;&#xD;
+&lt;li&gt; Hi-Definition MicroSpeaker with a single balanced armature driver &lt;/li&gt;&#xD;
+&lt;li&gt; Detachable, modular cable so you can make the cable longer or shorter depending on your activity &lt;/li&gt;&#xD;
+&lt;li&gt; Connector compatible with earphone ports on both iPod and iPhone &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+&lt;strong&gt;Specifications &lt;/strong&gt;&lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Speaker type: Hi-Definition MicroSpeaker &lt;/li&gt;&#xD;
+&lt;li&gt; Frequency range: 25Hz-18.5kHz &lt;/li&gt;&#xD;
+&lt;li&gt; Impedance (1kHz): 26 Ohms &lt;/li&gt;&#xD;
+&lt;li&gt; Sensitivity (1mW): 114 dB SPL/mW &lt;/li&gt;&#xD;
+&lt;li&gt; Cable length (with extension): 18.0 in./45.0 cm (54.0 in./137.1 cm) &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+&lt;strong&gt;In the box&lt;/strong&gt;&lt;br /&gt; &#xD;
+&lt;ul&gt;&#xD;
+&lt;li&gt;Shure SE210 earphones &lt;/li&gt;&#xD;
+&lt;li&gt; Extension cable (36.0 in./91.4 cm) &lt;/li&gt;&#xD;
+&lt;li&gt; Three pairs foam earpiece sleeves (small, medium, large) &lt;/li&gt;&#xD;
+&lt;li&gt; Three pairs soft flex earpiece sleeves (small, medium, large) &lt;/li&gt;&#xD;
+&lt;li&gt; One pair triple-flange earpiece sleeves &lt;/li&gt;&#xD;
+&lt;li&gt; Carrying case &lt;/li&gt;&#xD;
+&lt;/ul&gt;&#xD;
+Warranty&lt;br /&gt; Two-year limited &lt;br /&gt;(For details, please visit &lt;br /&gt;www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.) &lt;br /&gt;&lt;br /&gt; Mfr. Part No.: SE210-A-EFS &lt;br /&gt;&lt;br /&gt;Note: Products sold through this website that do not bear the Apple Brand name are serviced and supported exclusively by their manufacturers in accordance with terms and conditions packaged with the products. Apple's Limited Warranty does not apply to products that are not Apple-branded, even if packaged or sold with Apple products. Please contact the manufacturer directly for technical support and customer service.&lt;/div&gt;</description>
+    <description_short>&lt;p&gt;Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.&lt;/p&gt;</description_short>
+    <link_rewrite>ecouteurs-a-isolation-sonore-shure-se210-blanc</link_rewrite>
+    <meta_description/>
+    <meta_keywords/>
+    <meta_title/>
+    <name>Shure SE210 Sound-Isolating Earphones for iPod and iPhone</name>
+    <available_now/>
+    <available_later/>
+  </product>
+</entity_product>
diff --git a/install-dev/fixtures/apple/langs/tw/data/profile.xml b/install-dev/fixtures/apple/langs/tw/data/profile.xml
new file mode 100644
index 000000000..02aa4d76c
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/profile.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_profile>
+  <profile id="Administrator">
+    <name>Administrator</name>
+  </profile>
+  <profile id="Logistician">
+    <name>Logistician</name>
+  </profile>
+  <profile id="Translator">
+    <name>Translator</name>
+  </profile>
+  <profile id="Salesman">
+    <name>Salesman</name>
+  </profile>
+</entity_profile>
diff --git a/install-dev/fixtures/apple/langs/tw/data/scene.xml b/install-dev/fixtures/apple/langs/tw/data/scene.xml
new file mode 100644
index 000000000..f7270d3ff
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/scene.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<entity_scene>
+  <scene id="The_iPods_Nano">
+    <name>The iPods Nano</name>
+  </scene>
+  <scene id="The_iPods">
+    <name>The iPods</name>
+  </scene>
+  <scene id="The_MacBooks">
+    <name>The MacBooks</name>
+  </scene>
+</entity_scene>
diff --git a/install-dev/fixtures/apple/langs/tw/data/supplier.xml b/install-dev/fixtures/apple/langs/tw/data/supplier.xml
new file mode 100644
index 000000000..e9db64034
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/supplier.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<entity_supplier>
+  <supplier id="AppleStore">
+    <description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </supplier>
+  <supplier id="Shure_Online_Store">
+    <description/>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </supplier>
+</entity_supplier>
diff --git a/install-dev/fixtures/apple/langs/tw/data/tag.xml b/install-dev/fixtures/apple/langs/tw/data/tag.xml
new file mode 100644
index 000000000..b781c0ed2
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/data/tag.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<entity_tag>
+  <tag id="tag_5" name="apple" products="iPod_Nano,MacBook"/>
+  <tag id="tag_22" name="superdrive" products="MacBook"/>
+  <tag id="tag_23" name="Ipod touch" products="iPod_touch"/>
+  <tag id="tag_28" name="ipod" products="iPod_Nano,iPod_shuffle"/>
+  <tag id="tag_29" name="nano" products="iPod_Nano"/>
+  <tag id="tag_33" name="shuffle" products="iPod_shuffle"/>
+</entity_tag>
diff --git a/install-dev/fixtures/apple/langs/tw/index.php b/install-dev/fixtures/apple/langs/tw/index.php
new file mode 100644
index 000000000..67d9932bf
--- /dev/null
+++ b/install-dev/fixtures/apple/langs/tw/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/install_version.php b/install-dev/install_version.php
index 0eb85db70..bc6b82f75 100644
--- a/install-dev/install_version.php
+++ b/install-dev/install_version.php
@@ -24,4 +24,4 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-define('_PS_INSTALL_VERSION_', '1.5.5.0');
+define('_PS_INSTALL_VERSION_', '1.5.6.0');
diff --git a/install-dev/langs/bn/data/carrier.xml b/install-dev/langs/bn/data/carrier.xml
new file mode 100644
index 000000000..db968ca0e
--- /dev/null
+++ b/install-dev/langs/bn/data/carrier.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<entity_carrier>
+  <carrier id='carrier_1' id_shop='1'>
+    <delay>দোকান থেকে নিন</delay>
+  </carrier>
+</entity_carrier>
diff --git a/install-dev/langs/bn/data/category.xml b/install-dev/langs/bn/data/category.xml
new file mode 100644
index 000000000..be0c6bd95
--- /dev/null
+++ b/install-dev/langs/bn/data/category.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+<entity_category>
+  <category id='Root' id_shop='1'>
+    <name>রুট </name>
+    <description/>
+    <link_rewrite>root</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id='Home' id_shop='1'>
+    <name>হোম </name>
+    <description/>
+    <link_rewrite>home</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+</entity_category>
diff --git a/install-dev/langs/bn/data/cms.xml b/install-dev/langs/bn/data/cms.xml
new file mode 100644
index 000000000..85941f6ef
--- /dev/null
+++ b/install-dev/langs/bn/data/cms.xml
@@ -0,0 +1,45 @@
+<?xml version='1.0'?>
+<entity_cms>
+  <cms id='Delivery'>
+    <meta_title>বিতরন</meta_title>
+    <meta_description>বিতরনের শর্ত সমূহ</meta_description>
+    <meta_keywords>conditions, delivery, delay, shipment, pack</meta_keywords>
+    <content>&lt;h2&gt;বিলি এবং ফেরত&lt;/h2&gt;&lt;h3&gt;আপনার প্যাক বিলিt&lt;/h3&gt;&lt;p&gt;প্যাকেজ সাধারণত পেমেন্ট প্রাপ্তির পর 2 দিনের মধ্যে প্রেষিত হয় এবং স্বাক্ষর ছাড়াই ট্র্যাকিং এবং ড্রপ অফ সঙ্গে ইউ.পি. মাধ্যমে প্রেরণ করা হয়. আপনি প্রয়োজনীয় স্বাক্ষর সঙ্গে অতিরিক্ত ইউ.পি. দ্বারা ডেলিভারি পছন্দ করেন, একটি অতিরিক্ত খরচ প্রয়োগ করা হবে, তাই এই পদ্ধতি চয়ন করার আগে আমাদের সাথে যোগাযোগ করুন. আপনি যেটা পছন্দ চালান, আমরা আপনাকে আপনার প্যাকেজ অনলাইন ট্র্যাক একটি লিঙ্ক প্রদান করা হবে.&lt;/p&gt;&lt;p&gt;শিপিং ফি ফি হিসেবে ডাকমাসুল খরচ সামলাচ্ছে ও প্যাকিং অন্তর্ভুক্ত. পরিবহন ফি চালানের মোট ওজন অনুযায়ী পরিবর্তন হওয়ার সম্ভাবনা রয়েছে, যেহেতু সামলাচ্ছে ফি, সংশোধন করা হয়. আমরা এক করার জন্য আপনার আইটেম গ্রুপে আপনাকে উপদেশ. আমরা আলাদা আলাদাভাবে স্থাপিত দুটি স্বতন্ত্র আদেশ গ্রুপ করতে পারবে না, এবং শিপিং ফি তাদের প্রতিটি ক্ষেত্রে প্রযোজ্য হবে. আপনার প্যাকেজ আপনার নিজের ঝুঁকিতে প্রেষিত করা হবে, কিন্তু ভঙ্গুর বস্তুর রক্ষা বিশেষ যত্ন নেওয়া হয়.&lt;br /&gt;&lt;br /&gt;বক্সগুলিতে যা আছে পর্যাপ্তভাবে মাপের এবং আপনার আইটেম ভাল সুরক্ষিত হয়.&lt;/p&gt;</content>
+    <link_rewrite>delivery</link_rewrite>
+  </cms>
+  <cms id='Legal_Notice'>
+    <meta_title>আইনি বিজ্ঞপ্তি</meta_title>
+    <meta_description>আইনি বিজ্ঞপ্তি</meta_description>
+    <meta_keywords>notice, legal, credits</meta_keywords>
+    <content>&lt;h2&gt;আইনগত&lt;/h2&gt;&lt;h3&gt;বকেয়া&lt;/h3&gt;&lt;p&gt;ধারনা এবং উৎপাদন:&lt;/p&gt;&lt;p&gt;এই ওয়েব সাইট টি ব্যাবহার করে তৈরি&lt;a href=&quot;http://www.prestashop.com&quot;&gt;PrestaShop&lt;/a&gt;&amp;trade; open-source software.&lt;/p&gt;</content>
+    <link_rewrite>legal-notice</link_rewrite>
+  </cms>
+  <cms id='Terms_and_conditions_of_use'>
+    <meta_title>ব্যাবহারের শর্ত </meta_title>
+    <meta_description>আমাদের ব্যাবহারের শর্ত </meta_description>
+    <meta_keywords>conditions, terms, use, sell</meta_keywords>
+    <content>&lt;h2&gt;আপনার জন্য ব্যাবহারের শর্ত&lt;/h2&gt;&lt;h3&gt;নিয়ম ১&lt;/h3&gt;&lt;p&gt;এখানে নিয়ম ১ content&lt;/p&gt;
+&lt;h3&gt;নিয়ম২&lt;/h3&gt;&lt;p&gt;এখানে নিয়ম২&lt;/p&gt;
+&lt;h3&gt;নিয়ম ৩&lt;/h3&gt;&lt;p&gt;এখানে নিয়ম৩ content&lt;/p&gt;</content>
+    <link_rewrite>terms-and-conditions-of-use</link_rewrite>
+  </cms>
+  <cms id='About_us'>
+    <meta_title>আমাদের সম্পর্কে</meta_title>
+    <meta_description>আমাদের সম্পর্কে আরও জানুন</meta_description>
+    <meta_keywords>about us, informations</meta_keywords>
+    <content>&lt;h2&gt;আমাদের সম্পর্কে&lt;/h2&gt;
+&lt;h3&gt;আমাদের কোম্পানি&lt;/h3&gt;&lt;p&gt;Our company&lt;/p&gt;
+&lt;h3&gt;আমাদের টিম&lt;/h3&gt;&lt;p&gt;Our team&lt;/p&gt;
+&lt;h3&gt;তথ্য&lt;/h3&gt;&lt;p&gt;Informations&lt;/p&gt;</content>
+    <link_rewrite>about-us</link_rewrite>
+  </cms>
+  <cms id='Secure_payment'>
+    <meta_title> নিরাপদ পরিশোধ</meta_title>
+    <meta_description>আমাদের নিরাপদ পরিশোধ পদ্ধতি</meta_description>
+    <meta_keywords>secure payment, ssl, visa, mastercard, paypal</meta_keywords>
+    <content>&lt;h2&gt;নিরাপদ পরিশোধ&lt;/h2&gt;
+&lt;h3&gt;আমাদের নিরাপদ পরিশোধ&lt;/h3&gt;&lt;p&gt;With SSL&lt;/p&gt;
+&lt;h3&gt;ব্যাবহার করে Visa/Mastercard/Paypal&lt;/h3&gt;&lt;p&gt;এই সেবা সম্পর্কে&lt;/p&gt;</content>
+    <link_rewrite>secure-payment</link_rewrite>
+  </cms>
+</entity_cms>
diff --git a/install-dev/langs/bn/data/cms_category.xml b/install-dev/langs/bn/data/cms_category.xml
new file mode 100644
index 000000000..ae6a122c7
--- /dev/null
+++ b/install-dev/langs/bn/data/cms_category.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+<entity_cms_category>
+  <cms_category id='Home'>
+    <name>হোম </name>
+    <description/>
+    <link_rewrite>home</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </cms_category>
+</entity_cms_category>
diff --git a/install-dev/langs/bn/data/configuration.xml b/install-dev/langs/bn/data/configuration.xml
new file mode 100644
index 000000000..8f30677d3
--- /dev/null
+++ b/install-dev/langs/bn/data/configuration.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+<entity_configuration>
+  <configuration id='PS_INVOICE_PREFIX'>
+    <value>ভিতরে </value>
+  </configuration>
+  <configuration id='PS_DELIVERY_PREFIX'>
+    <value>ডি ই </value>
+  </configuration>
+  <configuration id='PS_SEARCH_BLACKLIST'>
+    <value>একটি|এটি|থেকে|এবং|হতে   </value>
+  </configuration>
+  <configuration id='PS_META_KEYWORDS'>
+    <value>0</value>
+  </configuration>
+  <configuration id='PS_CUSTOMER_SERVICE_SIGNATURE'>
+    <value>প্রিয় গ্রাহক,                                        শুভেচ্ছা, গ্রাহক সেবা বিভাগ</value>
+  </configuration>
+</entity_configuration>
diff --git a/install-dev/langs/bn/data/contact.xml b/install-dev/langs/bn/data/contact.xml
new file mode 100644
index 000000000..d1917ad61
--- /dev/null
+++ b/install-dev/langs/bn/data/contact.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<entity_contact>
+  <contact id='Webmaster' name='ওয়েব মাস্টার'>
+    <description>যদি এই ওয়েব সাইটে একটি টেকনিকাল ত্রুটি ঘটে</description>
+  </contact>
+  <contact id='Customer_service' name='গ্রাহক সেবা '>
+    <description>যে কোনো পণ্য সম্পর্কে প্রশ্ন, একটি অর্ডার </description>
+  </contact>
+</entity_contact>
diff --git a/install-dev/langs/bn/data/country.xml b/install-dev/langs/bn/data/country.xml
new file mode 100644
index 000000000..d57ea1e36
--- /dev/null
+++ b/install-dev/langs/bn/data/country.xml
@@ -0,0 +1,735 @@
+<?xml version="1.0"?>
+<entity_country>
+  <country id="DE">
+    <name>Germany</name>
+  </country>
+  <country id="AT">
+    <name>Austria</name>
+  </country>
+  <country id="BE">
+    <name>Belgium</name>
+  </country>
+  <country id="CA">
+    <name>Canada</name>
+  </country>
+  <country id="CN">
+    <name>China</name>
+  </country>
+  <country id="ES">
+    <name>Spain</name>
+  </country>
+  <country id="FI">
+    <name>Finland</name>
+  </country>
+  <country id="FR">
+    <name>France</name>
+  </country>
+  <country id="GR">
+    <name>Greece</name>
+  </country>
+  <country id="IT">
+    <name>Italy</name>
+  </country>
+  <country id="JP">
+    <name>Japan</name>
+  </country>
+  <country id="LU">
+    <name>Luxemburg</name>
+  </country>
+  <country id="NL">
+    <name>Netherlands</name>
+  </country>
+  <country id="PL">
+    <name>Poland</name>
+  </country>
+  <country id="PT">
+    <name>Portugal</name>
+  </country>
+  <country id="CZ">
+    <name>Czech Republic</name>
+  </country>
+  <country id="GB">
+    <name>United Kingdom</name>
+  </country>
+  <country id="SE">
+    <name>Sweden</name>
+  </country>
+  <country id="CH">
+    <name>Switzerland</name>
+  </country>
+  <country id="DK">
+    <name>Denmark</name>
+  </country>
+  <country id="US">
+    <name>United States</name>
+  </country>
+  <country id="HK">
+    <name>HongKong</name>
+  </country>
+  <country id="NO">
+    <name>Norway</name>
+  </country>
+  <country id="AU">
+    <name>Australia</name>
+  </country>
+  <country id="SG">
+    <name>Singapore</name>
+  </country>
+  <country id="IE">
+    <name>Ireland</name>
+  </country>
+  <country id="NZ">
+    <name>New Zealand</name>
+  </country>
+  <country id="KR">
+    <name>South Korea</name>
+  </country>
+  <country id="IL">
+    <name>Israel</name>
+  </country>
+  <country id="ZA">
+    <name>South Africa</name>
+  </country>
+  <country id="NG">
+    <name>Nigeria</name>
+  </country>
+  <country id="CI">
+    <name>Ivory Coast</name>
+  </country>
+  <country id="TG">
+    <name>Togo</name>
+  </country>
+  <country id="BO">
+    <name>Bolivia</name>
+  </country>
+  <country id="MU">
+    <name>Mauritius</name>
+  </country>
+  <country id="RO">
+    <name>Romania</name>
+  </country>
+  <country id="SK">
+    <name>Slovakia</name>
+  </country>
+  <country id="DZ">
+    <name>Algeria</name>
+  </country>
+  <country id="AS">
+    <name>American Samoa</name>
+  </country>
+  <country id="AD">
+    <name>Andorra</name>
+  </country>
+  <country id="AO">
+    <name>Angola</name>
+  </country>
+  <country id="AI">
+    <name>Anguilla</name>
+  </country>
+  <country id="AG">
+    <name>Antigua and Barbuda</name>
+  </country>
+  <country id="AR">
+    <name>Argentina</name>
+  </country>
+  <country id="AM">
+    <name>Armenia</name>
+  </country>
+  <country id="AW">
+    <name>Aruba</name>
+  </country>
+  <country id="AZ">
+    <name>Azerbaijan</name>
+  </country>
+  <country id="BS">
+    <name>Bahamas</name>
+  </country>
+  <country id="BH">
+    <name>Bahrain</name>
+  </country>
+  <country id="BD">
+    <name>Bangladesh</name>
+  </country>
+  <country id="BB">
+    <name>Barbados</name>
+  </country>
+  <country id="BY">
+    <name>Belarus</name>
+  </country>
+  <country id="BZ">
+    <name>Belize</name>
+  </country>
+  <country id="BJ">
+    <name>Benin</name>
+  </country>
+  <country id="BM">
+    <name>Bermuda</name>
+  </country>
+  <country id="BT">
+    <name>Bhutan</name>
+  </country>
+  <country id="BW">
+    <name>Botswana</name>
+  </country>
+  <country id="BR">
+    <name>Brazil</name>
+  </country>
+  <country id="BN">
+    <name>Brunei</name>
+  </country>
+  <country id="BF">
+    <name>Burkina Faso</name>
+  </country>
+  <country id="MM">
+    <name>Burma (Myanmar)</name>
+  </country>
+  <country id="BI">
+    <name>Burundi</name>
+  </country>
+  <country id="KH">
+    <name>Cambodia</name>
+  </country>
+  <country id="CM">
+    <name>Cameroon</name>
+  </country>
+  <country id="CV">
+    <name>Cape Verde</name>
+  </country>
+  <country id="CF">
+    <name>Central African Republic</name>
+  </country>
+  <country id="TD">
+    <name>Chad</name>
+  </country>
+  <country id="CL">
+    <name>Chile</name>
+  </country>
+  <country id="CO">
+    <name>Colombia</name>
+  </country>
+  <country id="KM">
+    <name>Comoros</name>
+  </country>
+  <country id="CD">
+    <name>Congo, Dem. Republic</name>
+  </country>
+  <country id="CG">
+    <name>Congo, Republic</name>
+  </country>
+  <country id="CR">
+    <name>Costa Rica</name>
+  </country>
+  <country id="HR">
+    <name>Croatia</name>
+  </country>
+  <country id="CU">
+    <name>Cuba</name>
+  </country>
+  <country id="CY">
+    <name>Cyprus</name>
+  </country>
+  <country id="DJ">
+    <name>Djibouti</name>
+  </country>
+  <country id="DM">
+    <name>Dominica</name>
+  </country>
+  <country id="DO">
+    <name>Dominican Republic</name>
+  </country>
+  <country id="TL">
+    <name>East Timor</name>
+  </country>
+  <country id="EC">
+    <name>Ecuador</name>
+  </country>
+  <country id="EG">
+    <name>Egypt</name>
+  </country>
+  <country id="SV">
+    <name>El Salvador</name>
+  </country>
+  <country id="GQ">
+    <name>Equatorial Guinea</name>
+  </country>
+  <country id="ER">
+    <name>Eritrea</name>
+  </country>
+  <country id="EE">
+    <name>Estonia</name>
+  </country>
+  <country id="ET">
+    <name>Ethiopia</name>
+  </country>
+  <country id="FK">
+    <name>Falkland Islands</name>
+  </country>
+  <country id="FO">
+    <name>Faroe Islands</name>
+  </country>
+  <country id="FJ">
+    <name>Fiji</name>
+  </country>
+  <country id="GA">
+    <name>Gabon</name>
+  </country>
+  <country id="GM">
+    <name>Gambia</name>
+  </country>
+  <country id="GE">
+    <name>Georgia</name>
+  </country>
+  <country id="GH">
+    <name>Ghana</name>
+  </country>
+  <country id="GD">
+    <name>Grenada</name>
+  </country>
+  <country id="GL">
+    <name>Greenland</name>
+  </country>
+  <country id="GI">
+    <name>Gibraltar</name>
+  </country>
+  <country id="GP">
+    <name>Guadeloupe</name>
+  </country>
+  <country id="GU">
+    <name>Guam</name>
+  </country>
+  <country id="GT">
+    <name>Guatemala</name>
+  </country>
+  <country id="GG">
+    <name>Guernsey</name>
+  </country>
+  <country id="GN">
+    <name>Guinea</name>
+  </country>
+  <country id="GW">
+    <name>Guinea-Bissau</name>
+  </country>
+  <country id="GY">
+    <name>Guyana</name>
+  </country>
+  <country id="HT">
+    <name>Haiti</name>
+  </country>
+  <country id="HM">
+    <name>Heard Island and McDonald Islands</name>
+  </country>
+  <country id="VA">
+    <name>Vatican City State</name>
+  </country>
+  <country id="HN">
+    <name>Honduras</name>
+  </country>
+  <country id="IS">
+    <name>Iceland</name>
+  </country>
+  <country id="IN">
+    <name>India</name>
+  </country>
+  <country id="ID">
+    <name>Indonesia</name>
+  </country>
+  <country id="IR">
+    <name>Iran</name>
+  </country>
+  <country id="IQ">
+    <name>Iraq</name>
+  </country>
+  <country id="IM">
+    <name>Man Island</name>
+  </country>
+  <country id="JM">
+    <name>Jamaica</name>
+  </country>
+  <country id="JE">
+    <name>Jersey</name>
+  </country>
+  <country id="JO">
+    <name>Jordan</name>
+  </country>
+  <country id="KZ">
+    <name>Kazakhstan</name>
+  </country>
+  <country id="KE">
+    <name>Kenya</name>
+  </country>
+  <country id="KI">
+    <name>Kiribati</name>
+  </country>
+  <country id="KP">
+    <name>Korea, Dem. Republic of</name>
+  </country>
+  <country id="KW">
+    <name>Kuwait</name>
+  </country>
+  <country id="KG">
+    <name>Kyrgyzstan</name>
+  </country>
+  <country id="LA">
+    <name>Laos</name>
+  </country>
+  <country id="LV">
+    <name>Latvia</name>
+  </country>
+  <country id="LB">
+    <name>Lebanon</name>
+  </country>
+  <country id="LS">
+    <name>Lesotho</name>
+  </country>
+  <country id="LR">
+    <name>Liberia</name>
+  </country>
+  <country id="LY">
+    <name>Libya</name>
+  </country>
+  <country id="LI">
+    <name>Liechtenstein</name>
+  </country>
+  <country id="LT">
+    <name>Lithuania</name>
+  </country>
+  <country id="MO">
+    <name>Macau</name>
+  </country>
+  <country id="MK">
+    <name>Macedonia</name>
+  </country>
+  <country id="MG">
+    <name>Madagascar</name>
+  </country>
+  <country id="MW">
+    <name>Malawi</name>
+  </country>
+  <country id="MY">
+    <name>Malaysia</name>
+  </country>
+  <country id="MV">
+    <name>Maldives</name>
+  </country>
+  <country id="ML">
+    <name>Mali</name>
+  </country>
+  <country id="MT">
+    <name>Malta</name>
+  </country>
+  <country id="MH">
+    <name>Marshall Islands</name>
+  </country>
+  <country id="MQ">
+    <name>Martinique</name>
+  </country>
+  <country id="MR">
+    <name>Mauritania</name>
+  </country>
+  <country id="HU">
+    <name>Hungary</name>
+  </country>
+  <country id="YT">
+    <name>Mayotte</name>
+  </country>
+  <country id="MX">
+    <name>Mexico</name>
+  </country>
+  <country id="FM">
+    <name>Micronesia</name>
+  </country>
+  <country id="MD">
+    <name>Moldova</name>
+  </country>
+  <country id="MC">
+    <name>Monaco</name>
+  </country>
+  <country id="MN">
+    <name>Mongolia</name>
+  </country>
+  <country id="ME">
+    <name>Montenegro</name>
+  </country>
+  <country id="MS">
+    <name>Montserrat</name>
+  </country>
+  <country id="MA">
+    <name>Morocco</name>
+  </country>
+  <country id="MZ">
+    <name>Mozambique</name>
+  </country>
+  <country id="NA">
+    <name>Namibia</name>
+  </country>
+  <country id="NR">
+    <name>Nauru</name>
+  </country>
+  <country id="NP">
+    <name>Nepal</name>
+  </country>
+  <country id="AN">
+    <name>Netherlands Antilles</name>
+  </country>
+  <country id="NC">
+    <name>New Caledonia</name>
+  </country>
+  <country id="NI">
+    <name>Nicaragua</name>
+  </country>
+  <country id="NE">
+    <name>Niger</name>
+  </country>
+  <country id="NU">
+    <name>Niue</name>
+  </country>
+  <country id="NF">
+    <name>Norfolk Island</name>
+  </country>
+  <country id="MP">
+    <name>Northern Mariana Islands</name>
+  </country>
+  <country id="OM">
+    <name>Oman</name>
+  </country>
+  <country id="PK">
+    <name>Pakistan</name>
+  </country>
+  <country id="PW">
+    <name>Palau</name>
+  </country>
+  <country id="PS">
+    <name>Palestinian Territories</name>
+  </country>
+  <country id="PA">
+    <name>Panama</name>
+  </country>
+  <country id="PG">
+    <name>Papua New Guinea</name>
+  </country>
+  <country id="PY">
+    <name>Paraguay</name>
+  </country>
+  <country id="PE">
+    <name>Peru</name>
+  </country>
+  <country id="PH">
+    <name>Philippines</name>
+  </country>
+  <country id="PN">
+    <name>Pitcairn</name>
+  </country>
+  <country id="PR">
+    <name>Puerto Rico</name>
+  </country>
+  <country id="QA">
+    <name>Qatar</name>
+  </country>
+  <country id="RE">
+    <name>Reunion Island</name>
+  </country>
+  <country id="RU">
+    <name>Russian Federation</name>
+  </country>
+  <country id="RW">
+    <name>Rwanda</name>
+  </country>
+  <country id="BL">
+    <name>Saint Barthelemy</name>
+  </country>
+  <country id="KN">
+    <name>Saint Kitts and Nevis</name>
+  </country>
+  <country id="LC">
+    <name>Saint Lucia</name>
+  </country>
+  <country id="MF">
+    <name>Saint Martin</name>
+  </country>
+  <country id="PM">
+    <name>Saint Pierre and Miquelon</name>
+  </country>
+  <country id="VC">
+    <name>Saint Vincent and the Grenadines</name>
+  </country>
+  <country id="WS">
+    <name>Samoa</name>
+  </country>
+  <country id="SM">
+    <name>San Marino</name>
+  </country>
+  <country id="ST">
+    <name>S&#xE3;o Tom&#xE9; and Pr&#xED;ncipe</name>
+  </country>
+  <country id="SA">
+    <name>Saudi Arabia</name>
+  </country>
+  <country id="SN">
+    <name>Senegal</name>
+  </country>
+  <country id="RS">
+    <name>Serbia</name>
+  </country>
+  <country id="SC">
+    <name>Seychelles</name>
+  </country>
+  <country id="SL">
+    <name>Sierra Leone</name>
+  </country>
+  <country id="SI">
+    <name>Slovenia</name>
+  </country>
+  <country id="SB">
+    <name>Solomon Islands</name>
+  </country>
+  <country id="SO">
+    <name>Somalia</name>
+  </country>
+  <country id="GS">
+    <name>South Georgia and the South Sandwich Islands</name>
+  </country>
+  <country id="LK">
+    <name>Sri Lanka</name>
+  </country>
+  <country id="SD">
+    <name>Sudan</name>
+  </country>
+  <country id="SR">
+    <name>Suriname</name>
+  </country>
+  <country id="SJ">
+    <name>Svalbard and Jan Mayen</name>
+  </country>
+  <country id="SZ">
+    <name>Swaziland</name>
+  </country>
+  <country id="SY">
+    <name>Syria</name>
+  </country>
+  <country id="TW">
+    <name>Taiwan</name>
+  </country>
+  <country id="TJ">
+    <name>Tajikistan</name>
+  </country>
+  <country id="TZ">
+    <name>Tanzania</name>
+  </country>
+  <country id="TH">
+    <name>Thailand</name>
+  </country>
+  <country id="TK">
+    <name>Tokelau</name>
+  </country>
+  <country id="TO">
+    <name>Tonga</name>
+  </country>
+  <country id="TT">
+    <name>Trinidad and Tobago</name>
+  </country>
+  <country id="TN">
+    <name>Tunisia</name>
+  </country>
+  <country id="TR">
+    <name>Turkey</name>
+  </country>
+  <country id="TM">
+    <name>Turkmenistan</name>
+  </country>
+  <country id="TC">
+    <name>Turks and Caicos Islands</name>
+  </country>
+  <country id="TV">
+    <name>Tuvalu</name>
+  </country>
+  <country id="UG">
+    <name>Uganda</name>
+  </country>
+  <country id="UA">
+    <name>Ukraine</name>
+  </country>
+  <country id="AE">
+    <name>United Arab Emirates</name>
+  </country>
+  <country id="UY">
+    <name>Uruguay</name>
+  </country>
+  <country id="UZ">
+    <name>Uzbekistan</name>
+  </country>
+  <country id="VU">
+    <name>Vanuatu</name>
+  </country>
+  <country id="VE">
+    <name>Venezuela</name>
+  </country>
+  <country id="VN">
+    <name>Vietnam</name>
+  </country>
+  <country id="VG">
+    <name>Virgin Islands (British)</name>
+  </country>
+  <country id="VI">
+    <name>Virgin Islands (U.S.)</name>
+  </country>
+  <country id="WF">
+    <name>Wallis and Futuna</name>
+  </country>
+  <country id="EH">
+    <name>Western Sahara</name>
+  </country>
+  <country id="YE">
+    <name>Yemen</name>
+  </country>
+  <country id="ZM">
+    <name>Zambia</name>
+  </country>
+  <country id="ZW">
+    <name>Zimbabwe</name>
+  </country>
+  <country id="AL">
+    <name>Albania</name>
+  </country>
+  <country id="AF">
+    <name>Afghanistan</name>
+  </country>
+  <country id="AQ">
+    <name>Antarctica</name>
+  </country>
+  <country id="BA">
+    <name>Bosnia and Herzegovina</name>
+  </country>
+  <country id="BV">
+    <name>Bouvet Island</name>
+  </country>
+  <country id="IO">
+    <name>British Indian Ocean Territory</name>
+  </country>
+  <country id="BG">
+    <name>Bulgaria</name>
+  </country>
+  <country id="KY">
+    <name>Cayman Islands</name>
+  </country>
+  <country id="CX">
+    <name>Christmas Island</name>
+  </country>
+  <country id="CC">
+    <name>Cocos (Keeling) Islands</name>
+  </country>
+  <country id="CK">
+    <name>Cook Islands</name>
+  </country>
+  <country id="GF">
+    <name>French Guiana</name>
+  </country>
+  <country id="PF">
+    <name>French Polynesia</name>
+  </country>
+  <country id="TF">
+    <name>French Southern Territories</name>
+  </country>
+  <country id="AX">
+    <name>&#xC5;land Islands</name>
+  </country>
+</entity_country>
diff --git a/install-dev/langs/bn/data/gender.xml b/install-dev/langs/bn/data/gender.xml
new file mode 100644
index 000000000..29be26f05
--- /dev/null
+++ b/install-dev/langs/bn/data/gender.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0'?>
+<entity_gender>
+  <gender id='1' name='জনাব '/>
+  <gender id='2' name='জনাবা  '/>
+</entity_gender>
diff --git a/install-dev/langs/bn/data/group.xml b/install-dev/langs/bn/data/group.xml
new file mode 100644
index 000000000..e1bc26538
--- /dev/null
+++ b/install-dev/langs/bn/data/group.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<entity_group>
+  <group id='Visitor' name='দর্শক '/>
+  <group id='Guest' name='অতিত্থি'/>
+  <group id='Customer' name='গ্রাহক '/>
+</entity_group>
diff --git a/install-dev/langs/bn/data/index.php b/install-dev/langs/bn/data/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/bn/data/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/bn/data/meta.xml b/install-dev/langs/bn/data/meta.xml
new file mode 100644
index 000000000..de0ac4c12
--- /dev/null
+++ b/install-dev/langs/bn/data/meta.xml
@@ -0,0 +1,159 @@
+<?xml version='1.0'?>
+<entity_meta>
+  <meta id='404' id_shop='1'>
+    <title>৪০৪-ত্রুটি </title>
+    <description>এই পেইজ টি খুজে পাওয়া যায় নি</description>
+    <keywords/>
+    <url_rewrite>page-not-found</url_rewrite>
+  </meta>
+  <meta id='best-sales' id_shop='1'>
+    <title>সেরা বিক্রি </title>
+    <description>আমাদের সেরা বিক্রি </description>
+    <keywords/>
+    <url_rewrite>best-sales</url_rewrite>
+  </meta>
+  <meta id='contact' id_shop='1'>
+    <title>আমাদের সাথে যোগাযোগ করুন </title>
+    <description>আমাদের সাথে যোগাযোগ করতে যোগাযোগ ফর্ম ব্যবহার করুন </description>
+    <keywords/>
+    <url_rewrite>contact-us</url_rewrite>
+  </meta>
+  <meta id='index' id_shop='1'>
+    <title/>
+    <description>PrestaShop দ্বারা চালিত</description>
+    <keywords/>
+    <url_rewrite/>
+  </meta>
+  <meta id='manufacturer' id_shop='1'>
+    <title>উতপাদক</title>
+    <description>উতপাদক তালিকা</description>
+    <keywords/>
+    <url_rewrite>manufacturers</url_rewrite>
+  </meta>
+  <meta id='new-products' id_shop='1'>
+    <title>নতুন পণ্য </title>
+    <description>আমাদের নতুন পণ্য</description>
+    <keywords/>
+    <url_rewrite>new-products</url_rewrite>
+  </meta>
+  <meta id='password' id_shop='1'>
+    <title>আপানর পাসওয়ার্ড ভুলে গেছেন?</title>
+    <description>আপনার নতুন পাসওয়ার্ড মেইল এ পেতে রেজিসট্রেসন মেইল ঠিকানা দিন</description>
+    <keywords/>
+    <url_rewrite>password-recovery</url_rewrite>
+  </meta>
+  <meta id='prices-drop' id_shop='1'>
+    <title>মূল্য কমানো</title>
+    <description>আমাদের বিশেষ পণ্য </description>
+    <keywords/>
+    <url_rewrite>prices-drop</url_rewrite>
+  </meta>
+  <meta id='sitemap' id_shop='1'>
+    <title>সাইট ম্যাপ </title>
+    <description>ভুলে গেছেন? যা চান তা খুজুন </description>
+    <keywords/>
+    <url_rewrite>sitemap</url_rewrite>
+  </meta>
+  <meta id='supplier' id_shop='1'>
+    <title>সরবরাহকারী </title>
+    <description>সরবরাহকারির তালিকা </description>
+    <keywords/>
+    <url_rewrite>supplier</url_rewrite>
+  </meta>
+  <meta id='address' id_shop='1'>
+    <title>ঠিকানা </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>address</url_rewrite>
+  </meta>
+  <meta id='addresses' id_shop='1'>
+    <title>ঠিকানা </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>addresses</url_rewrite>
+  </meta>
+  <meta id='authentication' id_shop='1'>
+    <title>লগ ইন </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>login</url_rewrite>
+  </meta>
+  <meta id='cart' id_shop='1'>
+    <title>কার্ট </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>cart</url_rewrite>
+  </meta>
+  <meta id='discount' id_shop='1'>
+    <title>মূল্য ছার </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>discount</url_rewrite>
+  </meta>
+  <meta id='history' id_shop='1'>
+    <title>অর্ডার ইতিহাস</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order-history</url_rewrite>
+  </meta>
+  <meta id='identity' id_shop='1'>
+    <title>পরিচয় </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>identity</url_rewrite>
+  </meta>
+  <meta id='my-account' id_shop='1'>
+    <title>আমার আকাউনট</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>my-account</url_rewrite>
+  </meta>
+  <meta id='order-follow' id_shop='1'>
+    <title>অর্ডার ফলো </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order-follow</url_rewrite>
+  </meta>
+  <meta id='order-slip' id_shop='1'>
+    <title>অর্ডার স্লিপ </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order-slip</url_rewrite>
+  </meta>
+  <meta id='order' id_shop='1'>
+    <title>অর্ডার </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order</url_rewrite>
+  </meta>
+  <meta id='search' id_shop='1'>
+    <title>খোজ </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>search</url_rewrite>
+  </meta>
+  <meta id='stores' id_shop='1'>
+    <title>দোকান </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>stores</url_rewrite>
+  </meta>
+  <meta id='order-opc' id_shop='1'>
+    <title>অর্ডার </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>quick-order</url_rewrite>
+  </meta>
+  <meta id='guest-tracking' id_shop='1'>
+    <title>অতিত্থি অনুসরন </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>guest-tracking</url_rewrite>
+  </meta>
+  <meta id='order-confirmation' id_shop='1'>
+    <title>অর্ডার নিশ্চিত করন </title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order-confirmation</url_rewrite>
+  </meta>
+</entity_meta>
diff --git a/install-dev/langs/bn/data/order_return_state.xml b/install-dev/langs/bn/data/order_return_state.xml
new file mode 100644
index 000000000..259ad4ebb
--- /dev/null
+++ b/install-dev/langs/bn/data/order_return_state.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+<entity_order_return_state>
+  <order_return_state id='Waiting_for_confirmation'>
+    <name>নিশ্চিত করনের জন্য অপেক্ষমান</name>
+  </order_return_state>
+  <order_return_state id='Waiting_for_package'>
+    <name>প্যাকিং এর জন্য অপেক্ষমাণ </name>
+  </order_return_state>
+  <order_return_state id='Package_received'>
+    <name>প্যাকেজ রিসিভ করা হয়েছে</name>
+  </order_return_state>
+  <order_return_state id='Return_denied'>
+    <name>ফেরত বাতিল </name>
+  </order_return_state>
+  <order_return_state id='Return_completed'>
+    <name>ফেরত সম্পন্ন </name>
+  </order_return_state>
+</entity_order_return_state>
diff --git a/install-dev/langs/bn/data/order_state.xml b/install-dev/langs/bn/data/order_state.xml
new file mode 100644
index 000000000..c189d6afe
--- /dev/null
+++ b/install-dev/langs/bn/data/order_state.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0'?>
+<entity_order_state>
+  <order_state id='Awaiting_cheque_payment'>
+    <name>অপেক্ষমান চেক পেমেন্ট</name>
+    <template>cheque</template>
+  </order_state>
+  <order_state id='Payment_accepted'>
+    <name>পেমেন্ট গৃহীত </name>
+    <template>payment</template>
+  </order_state>
+  <order_state id='Preparation_in_progress'>
+    <name>প্রস্তুতি আগাচ্ছে </name>
+    <template>preparation</template>
+  </order_state>
+  <order_state id='Shipped'>
+    <name>বিলি হয়েছে</name>
+    <template>shipped</template>
+  </order_state>
+  <order_state id='Delivered'>
+    <name>পৌঁছানো হয়েছে</name>
+    <template/>
+  </order_state>
+  <order_state id='Canceled'>
+    <name>বাতিল </name>
+    <template>order_canceled</template>
+  </order_state>
+  <order_state id='Refund'>
+    <name>মূল্য ফেরত </name>
+    <template>refund</template>
+  </order_state>
+  <order_state id='Payment_error'>
+    <name>পরিশোধ ত্রুটি </name>
+    <template>payment_error</template>
+  </order_state>
+  <order_state id='On_backorder'>
+    <name>অন ব্যাক অর্ডার  </name>
+    <template>outofstock</template>
+  </order_state>
+  <order_state id='Awaiting_bank_wire_payment'>
+    <name>ব্যাংক অয়্যার পেমেন্ট এর জন্য অপেক্ষমাণ</name>
+    <template>bankwire</template>
+  </order_state>
+  <order_state id='Awaiting_PayPal_payment'>
+    <name>পে পল পেমেন্ট এর জন্য অপেক্ষমান </name>
+    <template/>
+  </order_state>
+  <order_state id='Payment_remotely_accepted'>
+    <name>পেমেন্ট স্থানিয় ভাবে গৃহীত</name>
+    <template>payment</template>
+  </order_state>
+</entity_order_state>
diff --git a/install-dev/langs/bn/data/profile.xml b/install-dev/langs/bn/data/profile.xml
new file mode 100644
index 000000000..c638f90dd
--- /dev/null
+++ b/install-dev/langs/bn/data/profile.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<entity_profile>
+  <profile id='SuperAdmin'>
+    <name>সুপার এডমিন</name>
+  </profile>
+</entity_profile>
diff --git a/install-dev/langs/bn/data/quick_access.xml b/install-dev/langs/bn/data/quick_access.xml
new file mode 100644
index 000000000..8a1ea3cae
--- /dev/null
+++ b/install-dev/langs/bn/data/quick_access.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<entity_quick_access>
+  <quick_access id='Home' name='হোম '/>
+  <quick_access id='My_Shop' name='আমার দোকান '/>
+  <quick_access id='New_category' name='নতুন ক্যাটাগরি '/>
+  <quick_access id='New_product' name='নতুন পণ্য '/>
+  <quick_access id='New_voucher' name='নতুন চালান '/>
+</entity_quick_access>
diff --git a/install-dev/langs/bn/data/risk.xml b/install-dev/langs/bn/data/risk.xml
new file mode 100644
index 000000000..bf1c5d57e
--- /dev/null
+++ b/install-dev/langs/bn/data/risk.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0'?>
+<entity_risk>
+  <risk id='None' name='কোনটি নয় '/>
+  <risk id='Low' name='নিচু'/>
+  <risk id='Medium' name='মধ্যম'/>
+  <risk id='High' name='উচ্চ'/>
+</entity_risk>
diff --git a/install-dev/langs/bn/data/stock_mvt_reason.xml b/install-dev/langs/bn/data/stock_mvt_reason.xml
new file mode 100644
index 000000000..f402e147f
--- /dev/null
+++ b/install-dev/langs/bn/data/stock_mvt_reason.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+<entity_stock_mvt_reason>
+  <stock_mvt_reason id='Increase'>
+    <name>বৃদ্ধি </name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Decrease'>
+    <name>হ্রাস </name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Customer_Order'>
+    <name>ক্রেতা অর্ডার </name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Regulation_following_an_inventory_of_stock'>
+    <name>পণ্য স্টক এর নিয়ম</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Regulation_following_an_inventory_of_stock_1'>
+    <name>পণ্য স্টক এর নিয়ম</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Transfer_to_another_warehouse'>
+    <name>অন্য গুদামে পাঠান </name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Transfer_from_another_warehouse'>
+    <name>অন্য গুদাম ত্থেকে আনুন </name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Supply_Order'>
+    <name>সরবরাহ আদেশ </name>
+  </stock_mvt_reason>
+</entity_stock_mvt_reason>
diff --git a/install-dev/langs/bn/data/supplier_order_state.xml b/install-dev/langs/bn/data/supplier_order_state.xml
new file mode 100644
index 000000000..4d2dca3bd
--- /dev/null
+++ b/install-dev/langs/bn/data/supplier_order_state.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<entity_supplier_order_state>
+	<supplier_order_state id='creation_in_progress'>
+		<name>তইরির উন্নতি</name>
+	</supplier_order_state>
+	<supplier_order_state id='Order_validated'>
+		<name>অর্ডার যাচাই হয়েছে  </name>
+	</supplier_order_state>
+	<supplier_order_state id='Pending_receipt'>
+		<name>অপেক্ষমান রিসিপট</name>
+	</supplier_order_state>
+	<supplier_order_state id='Order_received_in_part'>
+		<name>অর্ডার আংশিক রিসিভ হয়েছে </name>
+	</supplier_order_state>
+	<supplier_order_state id='Order_received_completely'>
+		<name>অর্ডার সম্পূর্ণ রিসিভ হয়েছে</name>
+	</supplier_order_state>
+	<supplier_order_state id='order_fenced'>
+		<name>অর্ডার অ্যাটকে আছে</name>
+	</supplier_order_state>
+</entity_supplier_order_state>
\ No newline at end of file
diff --git a/install-dev/langs/bn/data/supply_order_state.xml b/install-dev/langs/bn/data/supply_order_state.xml
new file mode 100644
index 000000000..d5ef37dd2
--- /dev/null
+++ b/install-dev/langs/bn/data/supply_order_state.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0'?>
+<entity_supply_order_state>
+  <supply_order_state id='supply_order_state_1'>
+    <name>১-তইরি আগাচ্ছে</name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_2'>
+    <name>২-অর্ডার যাচাই হয়েছে  </name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_3'>
+    <name>৩- রিসিপট অপেক্ষমান </name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_4'>
+    <name>৪-অর্ডার আংশিক রিসিভ হয়েছে </name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_5'>
+    <name>৫- অর্ডার সম্পূর্ণ রিসিভ হয়েছে</name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_6'>
+    <name>৬- অর্ডার বাতিল </name>
+  </supply_order_state>
+</entity_supply_order_state>
diff --git a/install-dev/langs/bn/data/tab.xml b/install-dev/langs/bn/data/tab.xml
new file mode 100644
index 000000000..a34db948e
--- /dev/null
+++ b/install-dev/langs/bn/data/tab.xml
@@ -0,0 +1,103 @@
+<?xml version='1.0'?>
+<entity_tab>
+  <tab id='Home' name='হোম /বাসা'/>
+  <tab id='CMS_Pages' name='বিষয় বাবস্থাপনা পক্রিয়া পাতা'/>
+  <tab id='CMS_Categories' name='বিষয় বাবস্থাপনা পক্রিয়ার প্রকার'/>
+  <tab id='Combinations_Generator' name='সম্ভব্য সম্মিলন তৈরি কারক'/>
+  <tab id='Search' name='অনুসন্ধান করুন'/>
+  <tab id='Login' name='প্রবেশ করুন'/>
+  <tab id='Shops' name='দোকান'/>
+  <tab id='Shop_URLs' name='দোকান এর ইউ আর ল'/>
+  <tab id='Catalog' name='মূল্য সূচী'/>
+  <tab id='Orders' name='ফরমায়েশ'/>
+  <tab id='Customers' name='গ্রাহকরা'/>
+  <tab id='Price_Rules' name='বিক্রয় এর শর্ত'/>
+  <tab id='Shipping' name='স্থানান্তর'/>
+  <tab id='Localization' name='অবস্থিত করন'/>
+  <tab id='Modules' name='মডিউল'/>
+  <tab id='Preferences' name='পছন্দ'/>
+  <tab id='Advanced_Parameters' name='উচ্চতর মাপকাঠি'/>
+  <tab id='Administration' name='প্রশাসন'/>
+  <tab id='Stats' name='পরিসংখ্যান'/>
+  <tab id='Stock' name='স্টক'/>
+  <tab id='Products' name='পণ্য সমূহ'/>
+  <tab id='Categories' name='শ্রেণি'/>
+  <tab id='Monitoring' name='নিয়ন্ত্রণ'/>
+  <tab id='Attributes_and_Values' name='বিভাগসমূহ এবং মান'/>
+  <tab id='Features' name='বৈশিষ্ট্য'/>
+  <tab id='Manufacturers' name='উত্পাদক'/>
+  <tab id='Suppliers' name='সরবরাহকারি'/>
+  <tab id='Image_Mapping' name='চিত্রসমূহ অবস্থানকরন'/>
+  <tab id='Tags' name='ট্যাগ'/>
+  <tab id='Attachments' name='সংযুক্তিসমূহ'/>
+  <tab id='Orders_1' name='ফরমায়েশ'/>
+  <tab id='Invoices' name='চালান'/>
+  <tab id='Merchandise_Returns' name='পণ্যদ্রব্য ফেরত'/>
+  <tab id='Delivery_Slips' name='বিতরন রশিদ'/>
+  <tab id='Credit_Slips' name='বকেয়া বিল'/>
+  <tab id='Statuses' name='অবস্থা'/>
+  <tab id='Order_Messages' name='অর্ডার এর মাসাআজ'/>
+  <tab id='Customers_1' name='গ্রাহকরা'/>
+  <tab id='Addresses' name='ঠিকানা'/>
+  <tab id='Groups' name='দল'/>
+  <tab id='Shopping_Carts' name='ক্রয় ঝুড়ি'/>
+  <tab id='Customer_Service' name='গ্রাহক সেবা'/>
+  <tab id='Contacts' name='যোগাযোগ'/>
+  <tab id='Titles' name='শিরোনাম'/>
+  <tab id='Outstanding' name='অসাধারণ'/>
+  <tab id='Cart_Rules' name='ক্রয় এর শর্ত'/>
+  <tab id='Catalog_Price_Rules' name='মূল্য সূচী'/>
+  <tab id='Marketing' name='বাযারজাতকরন'/>
+  <tab id='Shipping_1' name='পছন্দ'/>
+  <tab id='Carriers' name='বাহক'/>
+  <tab id='Localization_1' name='অবস্থিত করন'/>
+  <tab id='Languages' name='ভাষা'/>
+  <tab id='Zones' name='এলাকা'/>
+  <tab id='Countries' name='দেশ সমূহ'/>
+  <tab id='States' name='প্রদেশ'/>
+  <tab id='Currencies' name='মুদ্রা'/>
+  <tab id='Taxes' name='শুল্ক'/>
+  <tab id='Tax_Rules' name='শুল্ক নিয়ম'/>
+  <tab id='Translations' name='অনুবাদ'/>
+  <tab id='Modules_1' name='মডিউল'/>
+  <tab id='Modules_Themes_Catalog' name='মডিউল এবং থইম ক্যাটআলগ'/>
+  <tab id='Positions' name='অবস্থান'/>
+  <tab id='Payment' name='পরিশোধ'/>
+  <tab id='General' name='সাধারণ'/>
+  <tab id='Orders_2' name='ফরমায়েশ'/>
+  <tab id='Products_1' name='পণ্য সমূহ'/>
+  <tab id='Customers_2' name='গ্রাহকরা'/>
+  <tab id='Themes' name='বিষয়বস্তু'/>
+  <tab id='SEO_URLs' name='সি ই ও  এবং ইউ আর ল'/>
+  <tab id='CMS' name='বিষয় বাবস্থাপনা পক্রিয়া'/>
+  <tab id='Images' name='চিত্র'/>
+  <tab id='Store_Contacts' name='দোকান এর যোগাযোগ নম্বার'/>
+  <tab id='Search_1' name='অনুসন্ধান করুন'/>
+  <tab id='Maintenance' name='রক্ষণাবেক্ষণ'/>
+  <tab id='Geolocation' name='অবস্থান'/>
+  <tab id='Configuration_Information' name='মান নির্ধারক তথ্য'/>
+  <tab id='Performance' name='সম্পাদন'/>
+  <tab id='E-mail' name='ই মেইল'/>
+  <tab id='Multistore' name='মাল্টি স্টোর'/>
+  <tab id='CSV_Import' name='কারেক্টের সেপারেট ভ্যালূ আমদানি'/>
+  <tab id='DB_Backup' name='ডাঁটা বেইজ ব্যাক আপ'/>
+  <tab id='SQL_Manager' name='এস কিউ এল বাবস্ত্যাপক'/>
+  <tab id='Logs' name='তথ্য বই'/>
+  <tab id='Webservice' name='ওয়েব সেবা'/>
+  <tab id='Preferences_1' name='পছন্দ'/>
+  <tab id='Quick_Access' name='দ্রুত প্রবেশ'/>
+  <tab id='Employees' name='কর্মচারী'/>
+  <tab id='Profiles' name='প্রোফাইল'/>
+  <tab id='Permissions' name='অনুমতি'/>
+  <tab id='Menus' name='মেনু'/>
+  <tab id='Stats_1' name='পরিসংখ্যান'/>
+  <tab id='Search_Engines' name='অনুসন্ধান যন্ত্র'/>
+  <tab id='Referrers' name='রেফারেন্সে'/>
+  <tab id='Warehouses' name='গুদাম ঘর'/>
+  <tab id='Stock_Management' name='স্টক বাবস্থাপনা'/>
+  <tab id='Stock_Movement' name='স্টক মুভমেন্ট'/>
+  <tab id='Instant_Stock_Status' name='বরতমানে স্টক এর অবস্থা'/>
+  <tab id='Stock_Coverage' name='স্টক কভারেজ'/>
+  <tab id='Supply_orders' name='সরবরাহ আদেশ'/>
+  <tab id='Configuration' name='মান নির্ধারণ'/>
+</entity_tab>
diff --git a/install-dev/langs/bn/flag.jpg b/install-dev/langs/bn/flag.jpg
new file mode 100644
index 000000000..7faa049eb
Binary files /dev/null and b/install-dev/langs/bn/flag.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-category.jpg b/install-dev/langs/bn/img/bn-default-category.jpg
new file mode 100644
index 000000000..c28c90de1
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-category.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-home.jpg b/install-dev/langs/bn/img/bn-default-home.jpg
new file mode 100644
index 000000000..ae6658431
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-home.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-large.jpg b/install-dev/langs/bn/img/bn-default-large.jpg
new file mode 100644
index 000000000..83f20252e
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-large.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-large_scene.jpg b/install-dev/langs/bn/img/bn-default-large_scene.jpg
new file mode 100644
index 000000000..0c8b30dbe
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-large_scene.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-medium.jpg b/install-dev/langs/bn/img/bn-default-medium.jpg
new file mode 100644
index 000000000..13546aa40
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-medium.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-small.jpg b/install-dev/langs/bn/img/bn-default-small.jpg
new file mode 100644
index 000000000..8cb9417b6
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-small.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-thickbox.jpg b/install-dev/langs/bn/img/bn-default-thickbox.jpg
new file mode 100644
index 000000000..6bd5603f7
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-thickbox.jpg differ
diff --git a/install-dev/langs/bn/img/bn-default-thumb_scene.jpg b/install-dev/langs/bn/img/bn-default-thumb_scene.jpg
new file mode 100644
index 000000000..47d2def48
Binary files /dev/null and b/install-dev/langs/bn/img/bn-default-thumb_scene.jpg differ
diff --git a/install-dev/langs/bn/img/bn.jpg b/install-dev/langs/bn/img/bn.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/langs/bn/img/bn.jpg differ
diff --git a/install-dev/langs/bn/img/index.php b/install-dev/langs/bn/img/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/bn/img/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/bn/index.php b/install-dev/langs/bn/index.php
new file mode 100644
index 000000000..5e4749107
--- /dev/null
+++ b/install-dev/langs/bn/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/bn/install.php b/install-dev/langs/bn/install.php
new file mode 100644
index 000000000..a2fe3ecad
--- /dev/null
+++ b/install-dev/langs/bn/install.php
@@ -0,0 +1,205 @@
+<?php
+return array(
+	'informations' => array(
+		'phone' => '+1 (888) 947-6543',
+		'documentation' => 'http://doc.prestashop.com/',
+		'documentation_upgrade' => 'http://docs.prestashop.com/display/PS15/Updating+PrestaShop',
+		'forum' => 'http://www.prestashop.com/forums/',
+		'blog' => 'http://www.prestashop.com/blog/',
+		'support' => 'https://www.prestashop.com/en/support',
+	),
+	'translations' => array(
+		'menu_welcome' => 'আপনার ভাষা নির্বাচন করুন',
+		'menu_license' => 'লাইসেন্স চুক্তি ',
+		'menu_system' => 'সিস্টেম প্রয়োজনীয়তা',
+		'menu_database' => 'সিস্টেম কনফিগারেসন',
+		'menu_configure' => 'দোকান এর তথ্য ',
+		'menu_process' => 'দোকান ইন্সটলেসন ',
+		'Animals and Pets' => 'প্রাণী এবং গৃহপালিত',
+		'Art and Culture' => 'শিল্প ও সংস্কৃতি',
+		'Install theme' => 'থিম ইনস্টল হয়েছে',
+		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'এনটিটি <i>%1$s</i>: <i>%2$s</i> এর জন্য একটি SQL ত্রুটি ঘটেছে',
+		'Cannot create image "%1$s" for entity "%2$s"' => 'এনটিটি "%2$s"এর জন্য চিত্র "%1$s" তৈরি করা যায় নি',
+		'Cannot create image "%1$s" (bad permissions on folder "%2$s")' => 'চিত্র "%1$s" তৈরি করা যায় নি (ফোল্ডার  "%2$s"এ অনুমতি জনিত সমস্যা)',
+		'Cannot create image "%s"' => 'চিত্র  "%s" তৈরি করা যায় নি ',
+		'SQL error on query <i>%s</i>' => 'কোয়েরি <i>%s</i> তে SQLত্রুটি',
+		'%s - Login information' => '%s - লগইন তথ্য ',
+		'Field required' => 'ক্ষেত্রটি প্রয়োজন',
+		'Invalid shop name' => 'দোকানের নাম ভুল',
+		'The field %s is limited to %d characters' => 'ক্ষেত্র%s, %dটি বর্ণের ভিতর সিমাবদ্ধ',
+		'Your firstname contains some invalid characters' => 'আপনার নামের ১ম অংশ কিছু ভুল অক্ষর বহন করছে',
+		'Your lastname contains some invalid characters' => 'আপনার নামের শেষ অংশ কিছু ভুল অক্ষর বহন করছে ',
+		'The password is incorrect (alphanumeric string with at least 8 characters)' => 'পাসওয়ার্ডটি ভুল(কমপক্ষে ৮ অক্ষরের সংখা-শব্দ এর মিলিত  স্ট্রিং)',
+		'Password and its confirmation are different' => 'পাসওয়ার্ড এবং তার নিশ্চয়তা ভিন্ন',
+		'This e-mail address is invalid' => 'এই ইমেইল ঠিকানাটি ভুল',
+		'Image folder %s is not writable' => 'চিত্রের ফোল্ডার%s অনুলিপি যোগ্য নয়',
+		'An error occurred during logo copy.' => 'লোগো কপি করার সময় একটি ত্রুটি ঘটেছে',
+		'An error occurred during logo upload.' => 'লোগো আপলোড করার সময় একটি ত্রুটি ঘটেছে',
+		'Lingerie and Adult' => ' অন্তর্বাস ও পূর্ণবয়স্ক',
+		'Babies' => 'শিশু',
+		'Beauty and Personal Care' => 'সৌন্দর্য্য ও ব্যক্তিগত পরিচর্যা',
+		'Cars' => 'গাড়ী',
+		'Computer Hardware and Software' => 'কম্পিউটার হার্ডওয়্যার ও সফটওয়্যার',
+		'Download' => 'ডাউনলোড',
+		'Fashion and accessories' => 'ফ্যাশন ও আনুষাঙ্গিক',
+		'Flowers, Gifts and Crafts' => 'ফুল, উপহার এবং হস্তশিল্প',
+		'Food and beverage' => 'খাদ্য এবং পানীয়',
+		'HiFi, Photo and Video' => 'HiFi, ফটো এবং ভিডিও',
+		'Home and Garden' => 'বাড়ি এবং বাগান',
+		'Home Appliances' => 'গৃহস্থালি সামগ্রী',
+		'Jewelry' => 'গয়না',
+		'Mobile and Telecom' => 'মোবাইল এবং টেলিকম',
+		'Services' => 'সেবা ',
+		'Shoes and accessories' => 'জুতো এবং আনুষাঙ্গিক',
+		'Sports and Entertainment' => 'ক্রীড়া ও বিনোদন',
+		'Travel' => 'পর্যটন',
+		'Database is connected' => 'ডাটাবেস সংযুক্ত করা হয়েছে',
+		'Database is created' => 'ডাটাবেজ তৈরি করা হয়েছে',
+		'Cannot create the database automatically' => 'স্বয়ংক্রিয়ভাবে ডাটাবেস তৈরি করতে পারবেন না',
+		'Create settings.inc file' => 'settings.inc ফাইল তৈরি হয়েছে',
+		'Create database tables' => 'ডাটাবেস সারণী তৈরী হয়েছে',
+		'Create default shop and languages' => 'ডিফল্ট দোকান এবং ভাষাসমূহ তৈর হয়েছে',
+		'Populate database tables' => 'ডাটাবেস টেবিল তথ্যপূর্ণ হয়েছে',
+		'Configure shop information' => 'দোকানের তথ্য কনফিগার হয়েছে',
+		'Install modules' => 'মডিউল ইনস্টল হয়েছে',
+		'Install modules Addons' => 'মডিউল অ্যাডঅনস ইনস্টল হয়েছে',
+		'Install demonstration data' => 'ডেমনেসট্রেসন তথ্য ইনস্টল হয়েছে',
+		'PHP parameters:' => 'পিএইচপি পরামিতি:',
+		'PHP 5.1.2 or later is not enabled' => 'পিএইচপি 5.1.2 অথবা পরবর্তী সংস্করণ সক্রিয় করা নেই',
+		'Cannot upload files' => 'ফাইল আপলোড করা যাচ্ছে না',
+		'Cannot create new files and folders' => 'নতুন ফাইল এবং ফোল্ডার তৈরি করা যাচ্ছে না',
+		'GD Library is not installed' => 'জিডি লাইব্রেরী ইনস্টল করা নেই ',
+		'MySQL support is not activated' => 'মাইএসকিউএল সমর্থন সক্রিয় করা নেই',
+		'Files' => 'ফাইল',
+		'All files are not successfuly uploaded on your server' => 'সব ফাইল সফলতার সাথে আপনার সার্ভারে আপলোড করা যায় নি',
+		'Recursive write permissions on files and folders:' => 'ফাইল এবং ফোল্ডার এর জন্য রিকারসিভ রাইট এর অনুমতি: ',
+		'Cannot open external URLs' => 'বাহ্যিক URL-খোলা যাচ্ছে না',
+		'PHP register global option is on' => 'পিএইচপি রেজিসটার বিশ্বব্যাপী বিকল্প সক্রিয় ',
+		'GZIP compression is not activated' => 'Gzip কম্প্রেশন সক্রিয় করা নেই',
+		'Mcrypt extension is not enabled' => 'Mcrypt এক্সটেনশন সক্রিয় করা নেই',
+		'Mbstring extension is not enabled' => 'Mbstring এক্সটেনশন সক্রিয় করা নেই',
+		'PHP magic quotes option is enabled' => 'PHP magic quotes অপশনটি সক্রিয় করা',
+		'Dom extension is not loaded' => 'Dom এক্সটেনশন লোড করা হয় নি',
+		'PDO MySQL extension is not loaded' => 'PDO MySQLএক্সটেনশন লোড করা হয় নি',
+		'Server name is not valid' => 'সার্ভারের নাম সঠিক নয় ',
+		'You must enter a database name' => 'আপনাকে একটি ডাটাবেসের নাম লিখতে হবে',
+		'You must enter a database login' => 'আপনাকে একটি ডাটাবেস লগইন থেকে প্রবেশ করতে হবে',
+		'Tables prefix is invalid' => 'টেবিল প্রিফিক্স ভুল',
+		'Cannot convert database data to utf-8' => ' ডাটাবেসের তথ্য utf-8 এ রূপান্তর করতে পারবেন না',
+		'At least one table with same prefix was already found, please change your prefix or drop your database' => 'একই প্রিফিক্স যুক্ত কমপক্ষে আরও একটি টেবিল পাওয়া গেছে,আপনার প্রিফিক্স বদলান অথবা ডাটাবেস ড্রপ করুন',
+		'Database Server is not found. Please verify the login, password and server fields' => 'ডাটাবেস সার্ভার খুঁজে পাওয়া যায় নি।লগইন, পাসওয়ার্ড এবং সার্ভার ক্ষেত্র দয়া করে যাচাই করুন।',
+		'Connection to MySQL server succeeded, but database "%s" not found' => 'MySQLসার্ভারে সংযোগ সফল হএচে,কিন্তু ডাটাবেস  "%s" খুজে পাওয়া যায় নি',
+		'Attempt to create the database automatically' => 'স্বয়ংক্রিয়ভাবে ডাটাবেস তৈরি করার চেষ্টা করুন',
+		'%s file is not writable (check permissions)' => '%sফাইল লিখনযোগ্য নয়(অনুমতি চেক করুন)',
+		'%s folder is not writable (check permissions)' => '%sফোল্ডার লিখনযোগ্য নয়(অনুমতি চেক করুন) ',
+		'Cannot write settings file' => 'সেটিংস ফাইল রাইট করা যায় নি ',
+		'Database structure file not found' => 'ডাটাবেজ কাঠামো ফাইল খুঁজে পাওয়া যায় নি',
+		'Cannot create group shop' => 'গ্রুপ দোকান তৈরি করা যায় নি ',
+		'Cannot create shop' => ' দোকান তৈরি করা যায় নি ',
+		'Cannot create shop URL' => ' দোকানের  URL   তৈরি করা যায় নি ',
+		'File "language.xml" not found for language iso "%s"' => '"language.xml"ফাইল টি language iso "%s" তে পাওয়া যায় নি',
+		'File "language.xml" not valid for language iso "%s"' => '"language.xml" ফাইল টি language iso "%s এর জন্য সঠিক নয়',
+		'Cannot install language "%s"' => ' "%s" ভাষা ইনস্টল করা যাচ্ছে না',
+		'Cannot copy flag language "%s"' => '"%s" ফ্লাগ ভাষা কপি করা যাচ্ছে না ',
+		'Cannot create admin account' => 'এডমিন অ্যাকাউন্ট তৈরি করা যায় নি ',
+		'Cannot install module "%s"' => '"%s" মডিউল ইনস্টল করা যাচ্ছে না',
+		'Fixtures class "%s" not found' => '"%s" Fixtures class পাওয়া যায় নি',
+		'"%s" must be an instane of "InstallXmlLoader"' => '"%s" কে অবশ্যই  "InstallXmlLoader" এর একটি instaneহতে হবে',
+		'Information about your Store' => 'আপনার দোকান সম্পর্কে তথ্য',
+		'Shop name:' => 'দোকানের নাম:',
+		'Main activity:' => 'মুখ্য কার্যকলাপ:',
+		'Please choose your main activity' => 'আপনার প্রধান কার্যকলাপ বেছে নিন',
+		'Other activity...' => 'অন্য কার্যকলাপ ...',
+		'Help us learn more about your store so we can offer you optimal guidance and the best features for your business!' => 'আমরা যাতে আপনাকে আপনার ব্যবসার জন্য অনুকূল নির্দেশিকা এবং সর্বোত্তম বৈশিষ্ট্য অফার করতে পারি সেজন্য আমাদের আপনার দোকান সম্বন্ধে আরও জানতে সাহায্য করুন!',
+		'Install demo products:' => 'ডেমো পণ্য ইনস্টল করুন:',
+		'Yes' => 'হ্যাঁ',
+		'No' => 'না ',
+		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'ডেমো পণ্য PrestaShopএর ব্যবহার শিখার একটি ভালো উপায়।আপনি যদি এটার সাথে পরিচিত না হন, তাহলে তাদের ইনস্টল করা উচিত।',
+		'Country:' => 'দেশ:',
+		'Select your country' => 'আপনার দেশ নির্বাচন করুন',
+		'Shop timezone:' => 'দোকানের সময় অঞ্চল(timezone):',
+		'Select your timezone' => 'আপনার সময় অঞ্চল নির্বাচন করুন',
+		'Shop logo:' => 'দোকান লোগো:',
+		'Optional - You can add you logo at a later time.' => 'ঐচ্ছিক - পরবর্তী সময়ে লোগো যোগ করতে পারেন.',
+		'Your Account' => 'আপনার অ্যাকাউন্ট',
+		'First name:' => 'নামের ১ম অংশঃ',
+		'Last name:' => 'নামের শেষ অংশঃ',
+		'E-mail address:' => 'ইমেইল ঠিকানা:',
+		'This email address will be your username to access your store\'s back office.' => 'এই ইমেইল ঠিকানা আপনার দোকান এর ব্যাক অফিস অ্যাক্সেস করতে আপনার ইউজারনেম হবে',
+		'Shop password:' => 'দোকানের পাসওয়ার্ড:',
+		'Must be letters and numbers with at least 8 characters' => 'কমপক্ষে ৮ অক্ষরের অক্ষর এবং সংখ্যায় হতে হবে',
+		'Re-type to confirm:' => 'নিশ্চিত করার জন্য আবার টাইপ করুন:',
+		'Sign-up to the newsletter' => 'নিউজলেটারে সাইন আপ করুন ',
+		'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 আপনার ব্যবসা বৃদ্ধি করতে সহায়তা করবে।আপনি এই টিপস পেতে না চাইলে এই বাক্সটি আনচেক করুন।',
+		'Configure your database by filling out the following fields:' => 'নিম্নলিখিত ক্ষেত্রগুলি পূরণ করে আপনার ডাটাবেস কনফিগার করুন:',
+		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">ডেটাবেস তৈরি করুন</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 আপনার ডাটাবেসের সাথে সংযোগ করার জন্য নীচের ক্ষেত্রগুলি পূরণ করুন.',
+		'Database server address:' => 'ডাটাবেস সার্ভারের ঠিকানা:',
+		'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". ',
+		'Database name:' => 'ডেটাবেস নাম:',
+		'Database login:' => 'ডাটাবেস লগইন:',
+		'Database password:' => 'ডাটাবেজ পাসওয়ার্ড:',
+		'Database Engine:' => 'ডাটাবেস ইঞ্জিন:',
+		'Tables prefix:' => 'টেবিল প্রিফিক্সঃ',
+		'Drop existing tables (mode dev):' => 'বিদ্যমান টেবিল ড্রপ করুন(mode dev):',
+		'Test your database connection now!' => 'এখন আপনার ডাটাবেস সংযোগ পরীক্ষা করুন!',
+		'E-mail delivery set-up' => 'ই মেইল ​​বিতরণের সেট আপ',
+		'Configure SMTP manually (advanced users only)' => 'নিজে SMTP-কনফিগার করুন(দক্ষ ব্যবহারকারীদের জন্য শুধুমাত্র)',
+		'By default, the PHP mail() function is used' => 'ডিফল্টরূপে পিএইচপি মেইল ​​() ফাংশন ব্যবহার করা হয়েছে',
+		'SMTP server address:' => 'SMTP সার্ভারের ঠিকানা:',
+		'Encryption:' => 'এনক্রিপশন:',
+		'None' => 'কোনোটা না',
+		'Port:' => 'পোর্ট:',
+		'Login:' => 'লগইন:',
+		'Password:' => 'পাসওয়ার্ড:',
+		'enter@your.email' => 'enter@your.email ',
+		'Send me a test email!' => 'আমাকে একটা পরীক্ষামূলক ইমেল প্রেরণ করুন!',
+		'Next' => 'পরবর্তী ',
+		'Back' => 'পূর্ববর্তী',
+		'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' => 'নথিপত্র করন',
+		'Contact us' => 'আমাদের সাথে যোগাযোগ করুন',
+		'PrestaShop Installation Assistant' => 'PrestaShop ইনস্টলেশন সহকারী',
+		'Forum' => 'ফোরাম',
+		'Blog' => 'ব্লগ',
+		'Contact us!' => 'আমাদের সাথে যোগাযোগ করুন',
+		'Installation Assistant' => 'ইনস্টলেশন সহকারী',
+		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'PrestaShop ইনস্টল করার জন্য,আপনাকে জাভাস্ক্রিপ্ট আপনার ব্রাউজারে সক্রিয় করতে হবে',
+		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
+		'License Agreements' => 'লাইসেন্স চুক্তি',
+		'To enjoy the many features that are offered for free 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.' => 'PrestaShop দ্বারা বিনামূল্যে দেওয়া অনেক বৈশিষ্ট্য ভোগ করতে, নীচের লাইসেন্স শর্ত দয়া করে পড়ুন।PrestaShop কোর, OSL 3.0 এর অধীনে লাইসেন্স করা হয় এবং মডিউল, এবং থিমগুলি afl 3.0 অধীনে লাইসেন্স করা হয়',
+		'I agree to the above terms and conditions.' => 'আমি উপরের শর্তাবলীর সাথে সম্মত ',
+		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'আমি আমার কনফিগারেশন সম্পর্কে বেনামী তথ্য পাঠিয়ে সমাধান উন্নতিতে অংশগ্রহণের জন্য সম্মত ',
+		'Done!' => 'সম্পন্ন!',
+		'An error occured during installation...' => 'একটি ত্রুটি ইনস্টলেশনের সময় ঘটেছে ...',
+		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'আপনি বাম কলামের পিছনে ফেরার লিঙ্ক দিয়ে আগের ধাপে ফিরে যেতে পারেন অথবা ইনস্টলেশন প্রক্রিয়া পুনরায় আরম্ভ করুন-<a href="%s">clicking here</a>. হতে',
+		'Your installation is finished!' => 'আপনার ইনস্টলেশন সমাপ্ত!',
+		'You have just finished installing your shop. Thank you for using PrestaShop!' => ' আপনার দোকান ইনস্টল সমাপ্ত হয়েছে. PrestaShop ব্যবহারের জন্য আপনাকে ধন্যবাদ!',
+		'Please remember your login information:' => 'আপনার লগইন তথ্য দয়া করে মনে রাখবেন:',
+		'E-mail:' => 'ই মেইল:',
+		'Print my login information' => 'আপনার লগইন তথ্য মুদ্রণ করুন',
+		'Display' => 'প্রদর্শন ',
+		'For security purposes, you must delete the "install" folder.' => 'নিরাপত্তার জন্য "install" ফোল্ডার মুছে ফেলা আবশ্যক.',
+		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation ',
+		'Back Office' => 'ব্যাক অফিস',
+		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'আপনার ব্যাক অফিস ব্যবহার করে আপনার দোকান পরিচালনা করুন।আপনার অর্ডার এবং গ্রাহকদের, মডিউল, থিম পরিবর্তন , ইত্যাদি পরিচালনা করুন',
+		'Manage your store' => 'আপনার দোকান পরিচালনা করুন',
+		'Front Office' => 'ফ্রন্ট অফিস',
+		'Discover your store as your future customers will see it!' => 'আপনার ভবিষ্যত গ্রাহক দেখতে পাবে আপনার যে দোকানটি তা আবিস্কার করুন!',
+		'Discover your store' => 'আপনার দোকান উন্মোচন করুন',
+		'We are currently checking PrestaShop compatibility with your system environment' => 'আমরা বর্তমানে আপনার সিস্টেম পরিবেশের সঙ্গে PrestaShopএর উপযুক্ততা যাচাই করছি',
+		'If you have any questions, please visit our <a href="%1$s" target="_blank">documentation</a> and <a href="%2$s" target="_blank">community forum</a>.' => 'যদি আপনার কোন প্রশ্ন থাকে,  তাহলে অনুগ্রহপূর্বক আমাদের <a href="%1$s" target="_blank">নথিপত্র</a> এবং <a href="%2$s" target="_blank">কমুনিটি ফোরাম</a>.   পরিদর্শন করুন',
+		'PrestaShop compatibility with your system environment has been verified!' => 'আপনার সিস্টেমে পরিবেশের সঙ্গে PrestaShop উপযুক্ততা যাচাই করা হয়েছে!',
+		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => ' নীচের আইটেম (গুলি) দয়া করে সঠিক করুন তারপর আপনার নতুন সিস্টেম সামঞ্জস্যের পরীক্ষা করতে "Refresh information" ক্লিক করুন',
+		'Refresh these settings' => 'এই সেটিংস রিফ্রেশ করুন',
+		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop চালাতে অন্তত 32M মেমরি প্রয়োজন।php.ini তে আপনার মেমরি চেক করুন অথবা অথবা আপনার হোস্ট সরবরাহকারীর সাথে যোগাযোগ করুন।',
+		'Welcome to the PrestaShop %s Installer.' => 'PrestaShop  ইনস্টলার  %s এ স্বাগতম',
+		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'PrestaShop ইনস্টলেশনের দ্রুত এবং সহজ।মাত্র কয়েক মুহূর্তের মধ্যে, আপনি আরও ১৫০০০০ ব্যাবসায়ি নিয়ে গঠিত একটি কমিউনিটির অংশ হয়ে যাবেন।আপনি প্রতিদিন সহজে পরিচালনা করতে পারবেন এমন একটি নিজস্ব অনন্য অনলাইন দোকান নির্মাণ করতে যাচ্ছেন।',
+		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">আমাদের নত্থি করন</a> or to contact our support team: %2$s' => 'যদি আপনার সাহায্যের প্রয়োজন হলে, <a href="%1$s" target="_blank">আমাদের ম্যানুয়াল</a>চেক করতে বিব্রত বোধ করবেন না অথবা আমাদের সহায়ক দলের সাথে যোগাযোগ করুন: %2$s ',
+		'Continue the installation in:' => 'ইনস্টলেশন চালিয়ে যান:',
+		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'উপরোক্ত ভাষা নির্বাচন শুধুমাত্র ইনস্টলেশনের সহকারীর জন্য প্রযোজ্য।আপনার দোকান ইনস্টল করা হলে,আপনি উপর থেকে আপনার দোকানের ভাষা নির্বাচন করতে পারবেন একদম বিনামূল্যে!',
+		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => ' যদি আপনার কোনো সাহায্যের দরকার হয়,তবে আমাদের নত্থিপত্র<a href="%1$s" target="_blank">চেক করতে দ্বিধা করবেন না</a> অথবা আমাদের সাপোর্ট টিম এর সাথে যোগাযোগ করুন: %2$s ',
+	),
+);
\ No newline at end of file
diff --git a/install-dev/langs/bn/language.xml b/install-dev/langs/bn/language.xml
new file mode 100644
index 000000000..e7ab53813
--- /dev/null
+++ b/install-dev/langs/bn/language.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language>
+	<name><![CDATA[বাংলা  (Bengali)]]></name>
+	<language_code>bn-bd</language_code>
+	<date_format_lite>m/j/Y</date_format_lite>
+	<date_format_full>m/j/Y H:i:s</date_format_full>
+	<is_rtl>false</is_rtl>
+</language>
diff --git a/install-dev/langs/bn/mail_identifiers.txt b/install-dev/langs/bn/mail_identifiers.txt
new file mode 100644
index 000000000..3f768acb3
--- /dev/null
+++ b/install-dev/langs/bn/mail_identifiers.txt
@@ -0,0 +1,10 @@
+Hi {firstname} {lastname},
+
+Here is your personal login information for {shop_name}:
+
+Password: {passwd}
+E-mail address: {email}
+
+{shop_name} - {shop_url}
+
+{shop_url} powered by PrestaShop™
\ No newline at end of file
diff --git a/install-dev/langs/br/data/gender.xml b/install-dev/langs/br/data/gender.xml
index 16b4504d9..0eb461bc0 100644
--- a/install-dev/langs/br/data/gender.xml
+++ b/install-dev/langs/br/data/gender.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <entity_gender>
   <gender id="1" name="Sr."/>
-  <gender id="2" name="Sr."/>
-  <gender id="3" name="Senhorita"/>
+  <gender id="2" name="Sra."/>
 </entity_gender>
diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index ab4e5715b..a397797ce 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -2,8 +2,8 @@
 return array(
 	'informations' => array(
 		'phone' => '+1 888.947.6543',
-        'support' => 'https://www.prestashop.com/pt/support',
-        'blog' => 'http://www.prestashop.com/blog/pt/'
+		'support' => 'https://www.prestashop.com/pt/support',
+		'blog' => 'http://www.prestashop.com/blog/pt/',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Escolha seu idioma',
@@ -247,5 +247,7 @@ return array(
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Para instalar o PrestaShop, você precisa ter JavaScript ativado no seu navegador',
 		'To enjoy the many features that are offered for free 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.' => 'Para aproveitar os muitos recursos que são oferecidos grátis pelo PrestaShop, por favor, leia os termos de licença abaixo. O núcleo do PrestaShop é licenciado sob OSL 3.0, enquanto os módulos e temas são licenciados sob AFL 3.0.',
 		'For security purposes, you must delete the "install" folder.' => 'Por questões de segurança, você deve deletar a pasta "install"',
+		'Files' => 'Arquivos',
+		'All files are not successfuly uploaded on your server' => 'Todos os arquivos não foram carregados no seu servidor com sucesso',
 	),
-);
+);
\ No newline at end of file
diff --git a/install-dev/langs/de/data/gender.xml b/install-dev/langs/de/data/gender.xml
index 2fd7dcecd..e1293dcda 100644
--- a/install-dev/langs/de/data/gender.xml
+++ b/install-dev/langs/de/data/gender.xml
@@ -2,5 +2,4 @@
 <entity_gender>
   <gender id="1" name="Herr"/>
   <gender id="2" name="Frau"/>
-  <gender id="3" name="Miss"/>
 </entity_gender>
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index b39302665..5b56f894d 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -234,5 +234,16 @@ return array(
 		'PrestaShop compatibility with your system environment has been verified!' => 'Die Kompatibilität von PrestaShop mit Ihrem System wurde überprüft!',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'Damit PrestaShop einwandfrei funktionieren kann, werden mindestens 32M Speicher benötigt. Bitte überprüfen Sie die  memory_limit directive in php.in oder kontaktieren Sie Ihrem Provider.',
 		'Your PHP sessions path is not writable - check with your hosting provider:' => 'Der Speicherungsordner ist nicht beschreibbar - bitte kontaktieren Sie Ihren Provider',
+		'Database is created' => 'Datenbank erstellt',
+		'Cannot create the database automatically' => 'Datenbank kann nicht automatisch erstellt werden',
+		'Install modules Addons' => 'Module Addons installieren',
+		'Files' => 'Dateien',
+		'All files are not successfuly uploaded on your server' => 'Es wurden nicht alle Dateien erfolgreich auf Ihren Server hochgeladen',
+		'Attempt to create the database automatically' => 'Versuchen, die Datenbank automatisch zu erstellen.',
+		'Country:' => 'Land:',
+		'Must be letters and numbers with at least 8 characters' => 'Zulässig sind Buchstaben und Nummern. Mindestens 8 Zeichen.',
+		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'JavaScript muss in Ihrem Browser aktiviert sein, um PrestaShop zu installieren.',
+		'To enjoy the many features that are offered for free 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.' => 'Um all die Vorteile zu nutzen, die Ihnen Prestashop bietet, lesen sie bitte die folgenden Bedingungen. Der PrestaShop ist unter OSL 3.0 lizensiert, die Module und Themen unter AFL 3.0.',
+		'For security purposes, you must delete the "install" folder.' => 'For security purposes, you must delete the "install" folder. - Aus Sicherheitsgründen sollten Sie das Verzeichnis “install” unbedingt löschen.',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/en/data/gender.xml b/install-dev/langs/en/data/gender.xml
index 75fc2ed2a..efea471a8 100644
--- a/install-dev/langs/en/data/gender.xml
+++ b/install-dev/langs/en/data/gender.xml
@@ -2,5 +2,4 @@
 <entity_gender>
   <gender id="1" name="Mr."/>
   <gender id="2" name="Ms."/>
-  <gender id="3" name="Miss"/>
 </entity_gender>
diff --git a/install-dev/langs/es/data/gender.xml b/install-dev/langs/es/data/gender.xml
index 09a3d39e7..0eb461bc0 100644
--- a/install-dev/langs/es/data/gender.xml
+++ b/install-dev/langs/es/data/gender.xml
@@ -2,5 +2,4 @@
 <entity_gender>
   <gender id="1" name="Sr."/>
   <gender id="2" name="Sra."/>
-  <gender id="3" name="Miss"/>
 </entity_gender>
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index cb7234192..2375e9b89 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -2,8 +2,8 @@
 return array(
 	'informations' => array(
 		'phone' => '+34 917.872.909',
-        'support' => 'https://www.prestashop.com/es/support',
-        'blog' => 'http://www.prestashop.com/blog/es/'
+		'support' => 'https://www.prestashop.com/es/support',
+		'blog' => 'http://www.prestashop.com/blog/es/',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Elegir el idioma',
@@ -246,5 +246,7 @@ return array(
 		'To enjoy the many features that are offered for free 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.' => 'Para disfrutar de las numerosas funcionalidades ofrecidas de forma gratuita por PrestaShop, por favor lea los términos de la licencia a continuación. Core PrestaShop está disponible bajo la licencia OSL 3.0, mientras que los módulos y los temas están licenciados bajo la AFL 3.0.',
 		'For security purposes, you must delete the "install" folder.' => 'Por razones de seguridad, debe eliminar la carpeta "install".',
 		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+		'Files' => 'Ficheros',
+		'All files are not successfuly uploaded on your server' => 'Todos los ficheros no se han subido correctamente al servidor',
 	),
-);
+);
\ No newline at end of file
diff --git a/install-dev/langs/fr/data/gender.xml b/install-dev/langs/fr/data/gender.xml
index edee9b05c..a6599ccfc 100644
--- a/install-dev/langs/fr/data/gender.xml
+++ b/install-dev/langs/fr/data/gender.xml
@@ -2,5 +2,4 @@
 <entity_gender>
   <gender id="1" name="M."/>
   <gender id="2" name="Mme"/>
-  <gender id="3" name="Mlle"/>
 </entity_gender>
diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php
index c4a31b4f5..068e83d6d 100644
--- a/install-dev/langs/fr/install.php
+++ b/install-dev/langs/fr/install.php
@@ -248,5 +248,7 @@ return array(
 		'Must be letters and numbers with at least 8 characters' => 'Lettres et chiffres avec au moins 8 caractères',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Pour installer PrestaShop, vous devez avoir JavaScript activé dans votre navigateur',
 		'For security purposes, you must delete the "install" folder.' => 'Pour des raisons de sécurité, vous devez supprimer le dossier "install" manuellement.',
+		'Files' => 'Fichiers',
+		'All files are not successfuly uploaded on your server' => 'Tous les fichiers n\'ont pas été correctement téléchargés sur votre serveur',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/id/data/carrier.xml b/install-dev/langs/id/data/carrier.xml
new file mode 100644
index 000000000..d1ebb0c7e
--- /dev/null
+++ b/install-dev/langs/id/data/carrier.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<entity_carrier>
+  <carrier id='carrier_1' id_shop='1'>
+    <delay>Ambil di toko</delay>
+  </carrier>
+</entity_carrier>
diff --git a/install-dev/langs/id/data/category.xml b/install-dev/langs/id/data/category.xml
new file mode 100644
index 000000000..d619f5a04
--- /dev/null
+++ b/install-dev/langs/id/data/category.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+<entity_category>
+  <category id='Root' id_shop='1'>
+    <name>Root</name>
+    <description/>
+    <link_rewrite>root</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id='Home' id_shop='1'>
+    <name>Beranda</name>
+    <description/>
+    <link_rewrite>beranda</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+</entity_category>
diff --git a/install-dev/langs/id/data/cms.xml b/install-dev/langs/id/data/cms.xml
new file mode 100644
index 000000000..490e8515d
--- /dev/null
+++ b/install-dev/langs/id/data/cms.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<entity_cms>
+  <cms id='Delivery'>
+    <meta_title>Pengiriman barang</meta_title>
+    <meta_description>Tata cara pengiriman barang</meta_description>
+    <meta_keywords>pengiriman barang</meta_keywords>
+    <content>&lt;h2&gt;Pengiriman barang&lt;/h2&gt;&lt;h3&gt;Your pack shipment&lt;/h3&gt;&lt;p&gt;Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.&lt;/p&gt;&lt;p&gt;Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.&lt;br /&gt;&lt;br /&gt;Boxes are amply sized and your items are well-protected.&lt;/p&gt;</content>
+    <link_rewrite>pengiriman-barang</link_rewrite>
+  </cms>
+  <cms id='Legal_Notice'>
+    <meta_title>Kebijakan privasi dan hukum</meta_title>
+    <meta_description>Kebijakan privasi dan hukum</meta_description>
+    <meta_keywords>notice, legal, credits</meta_keywords>
+    <content>&lt;h2&gt;Kebijakan privasi dan hukum&lt;/h2&gt;&lt;p&gt;Tentang kebijakan privasi dan hukum bagi pelanggan&lt;/p&gt;&lt;p&gt;Website ini dibuat menggunakan &lt;a href=&quot;http://www.prestashop.com&quot;&gt;PrestaShop&lt;/a&gt;&amp;trade; open-source software.&lt;/p&gt;</content>
+    <link_rewrite>kebijakan-privasi-dan-hukum</link_rewrite>
+  </cms>
+  <cms id='Terms_and_conditions_of_use'>
+    <meta_title>Syarat pemakaian</meta_title>
+    <meta_description>Syarat pemakaian</meta_description>
+    <meta_keywords>conditions, terms, use, sell</meta_keywords>
+    <content>&lt;h2&gt;Syarat dan ketentuan pemakaian website&lt;/h2&gt;&lt;p&gt;Tentang syarat dan ketentuan pemakaian website (penggunaan cookies, penggunaan data customer, dsb)&lt;/p&gt;
+</content>
+    <link_rewrite>syarat-pemakaian</link_rewrite>
+  </cms>
+  <cms id='About_us'>
+    <meta_title>Tentang kami</meta_title>
+    <meta_description>Lebih lanjut mengenai kami</meta_description>
+    <meta_keywords>about us, informations</meta_keywords>
+    <content>&lt;h2&gt;Tentang kami&lt;/h2&gt;
+&lt;p&gt;Informasi tentang toko Anda&lt;/p&gt;
+</content>
+    <link_rewrite>tentang-kami</link_rewrite>
+  </cms>
+  <cms id='Secure_payment'>
+    <meta_title>Pembayaran</meta_title>
+    <meta_description>Pembayaran</meta_description>
+    <meta_keywords>secure payment, ssl, visa, mastercard, paypal</meta_keywords>
+    <content>&lt;h2&gt;Pembayaran&lt;/h2&gt;
+&lt;p&gt;Detail tentang pembayaran&lt;/p&gt;</content>
+    <link_rewrite>pembayaran</link_rewrite>
+  </cms>
+</entity_cms>
diff --git a/install-dev/langs/id/data/cms_category.xml b/install-dev/langs/id/data/cms_category.xml
new file mode 100644
index 000000000..e4766e093
--- /dev/null
+++ b/install-dev/langs/id/data/cms_category.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+<entity_cms_category>
+  <cms_category id='Home'>
+    <name>Beranda</name>
+    <description/>
+    <link_rewrite>beranda</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </cms_category>
+</entity_cms_category>
diff --git a/install-dev/langs/id/data/configuration.xml b/install-dev/langs/id/data/configuration.xml
new file mode 100644
index 000000000..eb0121de4
--- /dev/null
+++ b/install-dev/langs/id/data/configuration.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0'?>
+<entity_configuration>
+  <configuration id='PS_INVOICE_PREFIX'>
+    <value>IN</value>
+  </configuration>
+  <configuration id='PS_DELIVERY_PREFIX'>
+    <value>DE</value>
+  </configuration>
+  <configuration id='PS_SEARCH_BLACKLIST'>
+    <value>a|the|of|on|in|and|to</value>
+  </configuration>
+  <configuration id='PS_META_KEYWORDS'>
+    <value>0</value>
+  </configuration>
+  <configuration id='PS_CUSTOMER_SERVICE_SIGNATURE'>
+    <value>Halo,
+
+Salam kami,
+Customer service</value>
+  </configuration>
+</entity_configuration>
diff --git a/install-dev/langs/id/data/contact.xml b/install-dev/langs/id/data/contact.xml
new file mode 100644
index 000000000..beded785c
--- /dev/null
+++ b/install-dev/langs/id/data/contact.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<entity_contact>
+  <contact id='Webmaster' name='Webmaster'>
+    <description>Jika terdapat masalah teknis di website kami</description>
+  </contact>
+  <contact id='Customer_service' name='Customer service'>
+    <description>Untuk pertanyaan seputar produk dan pembelian</description>
+  </contact>
+</entity_contact>
diff --git a/install-dev/langs/id/data/country.xml b/install-dev/langs/id/data/country.xml
new file mode 100644
index 000000000..d57ea1e36
--- /dev/null
+++ b/install-dev/langs/id/data/country.xml
@@ -0,0 +1,735 @@
+<?xml version="1.0"?>
+<entity_country>
+  <country id="DE">
+    <name>Germany</name>
+  </country>
+  <country id="AT">
+    <name>Austria</name>
+  </country>
+  <country id="BE">
+    <name>Belgium</name>
+  </country>
+  <country id="CA">
+    <name>Canada</name>
+  </country>
+  <country id="CN">
+    <name>China</name>
+  </country>
+  <country id="ES">
+    <name>Spain</name>
+  </country>
+  <country id="FI">
+    <name>Finland</name>
+  </country>
+  <country id="FR">
+    <name>France</name>
+  </country>
+  <country id="GR">
+    <name>Greece</name>
+  </country>
+  <country id="IT">
+    <name>Italy</name>
+  </country>
+  <country id="JP">
+    <name>Japan</name>
+  </country>
+  <country id="LU">
+    <name>Luxemburg</name>
+  </country>
+  <country id="NL">
+    <name>Netherlands</name>
+  </country>
+  <country id="PL">
+    <name>Poland</name>
+  </country>
+  <country id="PT">
+    <name>Portugal</name>
+  </country>
+  <country id="CZ">
+    <name>Czech Republic</name>
+  </country>
+  <country id="GB">
+    <name>United Kingdom</name>
+  </country>
+  <country id="SE">
+    <name>Sweden</name>
+  </country>
+  <country id="CH">
+    <name>Switzerland</name>
+  </country>
+  <country id="DK">
+    <name>Denmark</name>
+  </country>
+  <country id="US">
+    <name>United States</name>
+  </country>
+  <country id="HK">
+    <name>HongKong</name>
+  </country>
+  <country id="NO">
+    <name>Norway</name>
+  </country>
+  <country id="AU">
+    <name>Australia</name>
+  </country>
+  <country id="SG">
+    <name>Singapore</name>
+  </country>
+  <country id="IE">
+    <name>Ireland</name>
+  </country>
+  <country id="NZ">
+    <name>New Zealand</name>
+  </country>
+  <country id="KR">
+    <name>South Korea</name>
+  </country>
+  <country id="IL">
+    <name>Israel</name>
+  </country>
+  <country id="ZA">
+    <name>South Africa</name>
+  </country>
+  <country id="NG">
+    <name>Nigeria</name>
+  </country>
+  <country id="CI">
+    <name>Ivory Coast</name>
+  </country>
+  <country id="TG">
+    <name>Togo</name>
+  </country>
+  <country id="BO">
+    <name>Bolivia</name>
+  </country>
+  <country id="MU">
+    <name>Mauritius</name>
+  </country>
+  <country id="RO">
+    <name>Romania</name>
+  </country>
+  <country id="SK">
+    <name>Slovakia</name>
+  </country>
+  <country id="DZ">
+    <name>Algeria</name>
+  </country>
+  <country id="AS">
+    <name>American Samoa</name>
+  </country>
+  <country id="AD">
+    <name>Andorra</name>
+  </country>
+  <country id="AO">
+    <name>Angola</name>
+  </country>
+  <country id="AI">
+    <name>Anguilla</name>
+  </country>
+  <country id="AG">
+    <name>Antigua and Barbuda</name>
+  </country>
+  <country id="AR">
+    <name>Argentina</name>
+  </country>
+  <country id="AM">
+    <name>Armenia</name>
+  </country>
+  <country id="AW">
+    <name>Aruba</name>
+  </country>
+  <country id="AZ">
+    <name>Azerbaijan</name>
+  </country>
+  <country id="BS">
+    <name>Bahamas</name>
+  </country>
+  <country id="BH">
+    <name>Bahrain</name>
+  </country>
+  <country id="BD">
+    <name>Bangladesh</name>
+  </country>
+  <country id="BB">
+    <name>Barbados</name>
+  </country>
+  <country id="BY">
+    <name>Belarus</name>
+  </country>
+  <country id="BZ">
+    <name>Belize</name>
+  </country>
+  <country id="BJ">
+    <name>Benin</name>
+  </country>
+  <country id="BM">
+    <name>Bermuda</name>
+  </country>
+  <country id="BT">
+    <name>Bhutan</name>
+  </country>
+  <country id="BW">
+    <name>Botswana</name>
+  </country>
+  <country id="BR">
+    <name>Brazil</name>
+  </country>
+  <country id="BN">
+    <name>Brunei</name>
+  </country>
+  <country id="BF">
+    <name>Burkina Faso</name>
+  </country>
+  <country id="MM">
+    <name>Burma (Myanmar)</name>
+  </country>
+  <country id="BI">
+    <name>Burundi</name>
+  </country>
+  <country id="KH">
+    <name>Cambodia</name>
+  </country>
+  <country id="CM">
+    <name>Cameroon</name>
+  </country>
+  <country id="CV">
+    <name>Cape Verde</name>
+  </country>
+  <country id="CF">
+    <name>Central African Republic</name>
+  </country>
+  <country id="TD">
+    <name>Chad</name>
+  </country>
+  <country id="CL">
+    <name>Chile</name>
+  </country>
+  <country id="CO">
+    <name>Colombia</name>
+  </country>
+  <country id="KM">
+    <name>Comoros</name>
+  </country>
+  <country id="CD">
+    <name>Congo, Dem. Republic</name>
+  </country>
+  <country id="CG">
+    <name>Congo, Republic</name>
+  </country>
+  <country id="CR">
+    <name>Costa Rica</name>
+  </country>
+  <country id="HR">
+    <name>Croatia</name>
+  </country>
+  <country id="CU">
+    <name>Cuba</name>
+  </country>
+  <country id="CY">
+    <name>Cyprus</name>
+  </country>
+  <country id="DJ">
+    <name>Djibouti</name>
+  </country>
+  <country id="DM">
+    <name>Dominica</name>
+  </country>
+  <country id="DO">
+    <name>Dominican Republic</name>
+  </country>
+  <country id="TL">
+    <name>East Timor</name>
+  </country>
+  <country id="EC">
+    <name>Ecuador</name>
+  </country>
+  <country id="EG">
+    <name>Egypt</name>
+  </country>
+  <country id="SV">
+    <name>El Salvador</name>
+  </country>
+  <country id="GQ">
+    <name>Equatorial Guinea</name>
+  </country>
+  <country id="ER">
+    <name>Eritrea</name>
+  </country>
+  <country id="EE">
+    <name>Estonia</name>
+  </country>
+  <country id="ET">
+    <name>Ethiopia</name>
+  </country>
+  <country id="FK">
+    <name>Falkland Islands</name>
+  </country>
+  <country id="FO">
+    <name>Faroe Islands</name>
+  </country>
+  <country id="FJ">
+    <name>Fiji</name>
+  </country>
+  <country id="GA">
+    <name>Gabon</name>
+  </country>
+  <country id="GM">
+    <name>Gambia</name>
+  </country>
+  <country id="GE">
+    <name>Georgia</name>
+  </country>
+  <country id="GH">
+    <name>Ghana</name>
+  </country>
+  <country id="GD">
+    <name>Grenada</name>
+  </country>
+  <country id="GL">
+    <name>Greenland</name>
+  </country>
+  <country id="GI">
+    <name>Gibraltar</name>
+  </country>
+  <country id="GP">
+    <name>Guadeloupe</name>
+  </country>
+  <country id="GU">
+    <name>Guam</name>
+  </country>
+  <country id="GT">
+    <name>Guatemala</name>
+  </country>
+  <country id="GG">
+    <name>Guernsey</name>
+  </country>
+  <country id="GN">
+    <name>Guinea</name>
+  </country>
+  <country id="GW">
+    <name>Guinea-Bissau</name>
+  </country>
+  <country id="GY">
+    <name>Guyana</name>
+  </country>
+  <country id="HT">
+    <name>Haiti</name>
+  </country>
+  <country id="HM">
+    <name>Heard Island and McDonald Islands</name>
+  </country>
+  <country id="VA">
+    <name>Vatican City State</name>
+  </country>
+  <country id="HN">
+    <name>Honduras</name>
+  </country>
+  <country id="IS">
+    <name>Iceland</name>
+  </country>
+  <country id="IN">
+    <name>India</name>
+  </country>
+  <country id="ID">
+    <name>Indonesia</name>
+  </country>
+  <country id="IR">
+    <name>Iran</name>
+  </country>
+  <country id="IQ">
+    <name>Iraq</name>
+  </country>
+  <country id="IM">
+    <name>Man Island</name>
+  </country>
+  <country id="JM">
+    <name>Jamaica</name>
+  </country>
+  <country id="JE">
+    <name>Jersey</name>
+  </country>
+  <country id="JO">
+    <name>Jordan</name>
+  </country>
+  <country id="KZ">
+    <name>Kazakhstan</name>
+  </country>
+  <country id="KE">
+    <name>Kenya</name>
+  </country>
+  <country id="KI">
+    <name>Kiribati</name>
+  </country>
+  <country id="KP">
+    <name>Korea, Dem. Republic of</name>
+  </country>
+  <country id="KW">
+    <name>Kuwait</name>
+  </country>
+  <country id="KG">
+    <name>Kyrgyzstan</name>
+  </country>
+  <country id="LA">
+    <name>Laos</name>
+  </country>
+  <country id="LV">
+    <name>Latvia</name>
+  </country>
+  <country id="LB">
+    <name>Lebanon</name>
+  </country>
+  <country id="LS">
+    <name>Lesotho</name>
+  </country>
+  <country id="LR">
+    <name>Liberia</name>
+  </country>
+  <country id="LY">
+    <name>Libya</name>
+  </country>
+  <country id="LI">
+    <name>Liechtenstein</name>
+  </country>
+  <country id="LT">
+    <name>Lithuania</name>
+  </country>
+  <country id="MO">
+    <name>Macau</name>
+  </country>
+  <country id="MK">
+    <name>Macedonia</name>
+  </country>
+  <country id="MG">
+    <name>Madagascar</name>
+  </country>
+  <country id="MW">
+    <name>Malawi</name>
+  </country>
+  <country id="MY">
+    <name>Malaysia</name>
+  </country>
+  <country id="MV">
+    <name>Maldives</name>
+  </country>
+  <country id="ML">
+    <name>Mali</name>
+  </country>
+  <country id="MT">
+    <name>Malta</name>
+  </country>
+  <country id="MH">
+    <name>Marshall Islands</name>
+  </country>
+  <country id="MQ">
+    <name>Martinique</name>
+  </country>
+  <country id="MR">
+    <name>Mauritania</name>
+  </country>
+  <country id="HU">
+    <name>Hungary</name>
+  </country>
+  <country id="YT">
+    <name>Mayotte</name>
+  </country>
+  <country id="MX">
+    <name>Mexico</name>
+  </country>
+  <country id="FM">
+    <name>Micronesia</name>
+  </country>
+  <country id="MD">
+    <name>Moldova</name>
+  </country>
+  <country id="MC">
+    <name>Monaco</name>
+  </country>
+  <country id="MN">
+    <name>Mongolia</name>
+  </country>
+  <country id="ME">
+    <name>Montenegro</name>
+  </country>
+  <country id="MS">
+    <name>Montserrat</name>
+  </country>
+  <country id="MA">
+    <name>Morocco</name>
+  </country>
+  <country id="MZ">
+    <name>Mozambique</name>
+  </country>
+  <country id="NA">
+    <name>Namibia</name>
+  </country>
+  <country id="NR">
+    <name>Nauru</name>
+  </country>
+  <country id="NP">
+    <name>Nepal</name>
+  </country>
+  <country id="AN">
+    <name>Netherlands Antilles</name>
+  </country>
+  <country id="NC">
+    <name>New Caledonia</name>
+  </country>
+  <country id="NI">
+    <name>Nicaragua</name>
+  </country>
+  <country id="NE">
+    <name>Niger</name>
+  </country>
+  <country id="NU">
+    <name>Niue</name>
+  </country>
+  <country id="NF">
+    <name>Norfolk Island</name>
+  </country>
+  <country id="MP">
+    <name>Northern Mariana Islands</name>
+  </country>
+  <country id="OM">
+    <name>Oman</name>
+  </country>
+  <country id="PK">
+    <name>Pakistan</name>
+  </country>
+  <country id="PW">
+    <name>Palau</name>
+  </country>
+  <country id="PS">
+    <name>Palestinian Territories</name>
+  </country>
+  <country id="PA">
+    <name>Panama</name>
+  </country>
+  <country id="PG">
+    <name>Papua New Guinea</name>
+  </country>
+  <country id="PY">
+    <name>Paraguay</name>
+  </country>
+  <country id="PE">
+    <name>Peru</name>
+  </country>
+  <country id="PH">
+    <name>Philippines</name>
+  </country>
+  <country id="PN">
+    <name>Pitcairn</name>
+  </country>
+  <country id="PR">
+    <name>Puerto Rico</name>
+  </country>
+  <country id="QA">
+    <name>Qatar</name>
+  </country>
+  <country id="RE">
+    <name>Reunion Island</name>
+  </country>
+  <country id="RU">
+    <name>Russian Federation</name>
+  </country>
+  <country id="RW">
+    <name>Rwanda</name>
+  </country>
+  <country id="BL">
+    <name>Saint Barthelemy</name>
+  </country>
+  <country id="KN">
+    <name>Saint Kitts and Nevis</name>
+  </country>
+  <country id="LC">
+    <name>Saint Lucia</name>
+  </country>
+  <country id="MF">
+    <name>Saint Martin</name>
+  </country>
+  <country id="PM">
+    <name>Saint Pierre and Miquelon</name>
+  </country>
+  <country id="VC">
+    <name>Saint Vincent and the Grenadines</name>
+  </country>
+  <country id="WS">
+    <name>Samoa</name>
+  </country>
+  <country id="SM">
+    <name>San Marino</name>
+  </country>
+  <country id="ST">
+    <name>S&#xE3;o Tom&#xE9; and Pr&#xED;ncipe</name>
+  </country>
+  <country id="SA">
+    <name>Saudi Arabia</name>
+  </country>
+  <country id="SN">
+    <name>Senegal</name>
+  </country>
+  <country id="RS">
+    <name>Serbia</name>
+  </country>
+  <country id="SC">
+    <name>Seychelles</name>
+  </country>
+  <country id="SL">
+    <name>Sierra Leone</name>
+  </country>
+  <country id="SI">
+    <name>Slovenia</name>
+  </country>
+  <country id="SB">
+    <name>Solomon Islands</name>
+  </country>
+  <country id="SO">
+    <name>Somalia</name>
+  </country>
+  <country id="GS">
+    <name>South Georgia and the South Sandwich Islands</name>
+  </country>
+  <country id="LK">
+    <name>Sri Lanka</name>
+  </country>
+  <country id="SD">
+    <name>Sudan</name>
+  </country>
+  <country id="SR">
+    <name>Suriname</name>
+  </country>
+  <country id="SJ">
+    <name>Svalbard and Jan Mayen</name>
+  </country>
+  <country id="SZ">
+    <name>Swaziland</name>
+  </country>
+  <country id="SY">
+    <name>Syria</name>
+  </country>
+  <country id="TW">
+    <name>Taiwan</name>
+  </country>
+  <country id="TJ">
+    <name>Tajikistan</name>
+  </country>
+  <country id="TZ">
+    <name>Tanzania</name>
+  </country>
+  <country id="TH">
+    <name>Thailand</name>
+  </country>
+  <country id="TK">
+    <name>Tokelau</name>
+  </country>
+  <country id="TO">
+    <name>Tonga</name>
+  </country>
+  <country id="TT">
+    <name>Trinidad and Tobago</name>
+  </country>
+  <country id="TN">
+    <name>Tunisia</name>
+  </country>
+  <country id="TR">
+    <name>Turkey</name>
+  </country>
+  <country id="TM">
+    <name>Turkmenistan</name>
+  </country>
+  <country id="TC">
+    <name>Turks and Caicos Islands</name>
+  </country>
+  <country id="TV">
+    <name>Tuvalu</name>
+  </country>
+  <country id="UG">
+    <name>Uganda</name>
+  </country>
+  <country id="UA">
+    <name>Ukraine</name>
+  </country>
+  <country id="AE">
+    <name>United Arab Emirates</name>
+  </country>
+  <country id="UY">
+    <name>Uruguay</name>
+  </country>
+  <country id="UZ">
+    <name>Uzbekistan</name>
+  </country>
+  <country id="VU">
+    <name>Vanuatu</name>
+  </country>
+  <country id="VE">
+    <name>Venezuela</name>
+  </country>
+  <country id="VN">
+    <name>Vietnam</name>
+  </country>
+  <country id="VG">
+    <name>Virgin Islands (British)</name>
+  </country>
+  <country id="VI">
+    <name>Virgin Islands (U.S.)</name>
+  </country>
+  <country id="WF">
+    <name>Wallis and Futuna</name>
+  </country>
+  <country id="EH">
+    <name>Western Sahara</name>
+  </country>
+  <country id="YE">
+    <name>Yemen</name>
+  </country>
+  <country id="ZM">
+    <name>Zambia</name>
+  </country>
+  <country id="ZW">
+    <name>Zimbabwe</name>
+  </country>
+  <country id="AL">
+    <name>Albania</name>
+  </country>
+  <country id="AF">
+    <name>Afghanistan</name>
+  </country>
+  <country id="AQ">
+    <name>Antarctica</name>
+  </country>
+  <country id="BA">
+    <name>Bosnia and Herzegovina</name>
+  </country>
+  <country id="BV">
+    <name>Bouvet Island</name>
+  </country>
+  <country id="IO">
+    <name>British Indian Ocean Territory</name>
+  </country>
+  <country id="BG">
+    <name>Bulgaria</name>
+  </country>
+  <country id="KY">
+    <name>Cayman Islands</name>
+  </country>
+  <country id="CX">
+    <name>Christmas Island</name>
+  </country>
+  <country id="CC">
+    <name>Cocos (Keeling) Islands</name>
+  </country>
+  <country id="CK">
+    <name>Cook Islands</name>
+  </country>
+  <country id="GF">
+    <name>French Guiana</name>
+  </country>
+  <country id="PF">
+    <name>French Polynesia</name>
+  </country>
+  <country id="TF">
+    <name>French Southern Territories</name>
+  </country>
+  <country id="AX">
+    <name>&#xC5;land Islands</name>
+  </country>
+</entity_country>
diff --git a/install-dev/langs/id/data/gender.xml b/install-dev/langs/id/data/gender.xml
new file mode 100644
index 000000000..d6ca233cc
--- /dev/null
+++ b/install-dev/langs/id/data/gender.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0'?>
+<entity_gender>
+  <gender id='1' name='Tuan'/>
+  <gender id='2' name='Nona'/>
+</entity_gender>
diff --git a/install-dev/langs/id/data/group.xml b/install-dev/langs/id/data/group.xml
new file mode 100644
index 000000000..13c5d0bbe
--- /dev/null
+++ b/install-dev/langs/id/data/group.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<entity_group>
+  <group id='Visitor' name='Visitor'/>
+  <group id='Guest' name='Guest'/>
+  <group id='Customer' name='Customer'/>
+</entity_group>
diff --git a/install-dev/langs/id/data/index.php b/install-dev/langs/id/data/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/id/data/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/id/data/meta.xml b/install-dev/langs/id/data/meta.xml
new file mode 100644
index 000000000..ca55aa033
--- /dev/null
+++ b/install-dev/langs/id/data/meta.xml
@@ -0,0 +1,159 @@
+<?xml version='1.0'?>
+<entity_meta>
+  <meta id='404' id_shop='1'>
+    <title>Eror 404</title>
+    <description>Halaman tidak ditemukan</description>
+    <keywords>error, 404, not found</keywords>
+    <url_rewrite>halaman-tidak-ditemukan</url_rewrite>
+  </meta>
+  <meta id='best-sales' id_shop='1'>
+    <title>Terlaris</title>
+    <description>Produk terlaris</description>
+    <keywords>best sales</keywords>
+    <url_rewrite>terlaris</url_rewrite>
+  </meta>
+  <meta id='contact' id_shop='1'>
+    <title>Hubungi kami</title>
+    <description>Gunakan form ini untuk menghubungi kami</description>
+    <keywords>contact, form, e-mail</keywords>
+    <url_rewrite>hubungi-kami</url_rewrite>
+  </meta>
+  <meta id='index' id_shop='1'>
+    <title/>
+    <description>didukung oleh PrestaShop</description>
+    <keywords>shop, prestashop</keywords>
+    <url_rewrite/>
+  </meta>
+  <meta id='manufacturer' id_shop='1'>
+    <title>Merk</title>
+    <description>Daftar merk</description>
+    <keywords>manufacturer</keywords>
+    <url_rewrite>merk</url_rewrite>
+  </meta>
+  <meta id='new-products' id_shop='1'>
+    <title>Produk terbaru</title>
+    <description>Produk terbaru</description>
+    <keywords>new, products</keywords>
+    <url_rewrite>produk-terbaru</url_rewrite>
+  </meta>
+  <meta id='password' id_shop='1'>
+    <title>Lupa password</title>
+    <description>Isi alamat e-mail dengan alamat e-mail yang Anda gunakan sewaktu mendaftar yang akan digunakan untuk mengirim password baru</description>
+    <keywords>forgot, password, e-mail, new, reset</keywords>
+    <url_rewrite>lupa-password</url_rewrite>
+  </meta>
+  <meta id='prices-drop' id_shop='1'>
+    <title>Turun harga</title>
+    <description>Daftar produk diskon</description>
+    <keywords>special, prices drop</keywords>
+    <url_rewrite>turun-harga</url_rewrite>
+  </meta>
+  <meta id='sitemap' id_shop='1'>
+    <title>Sitemap</title>
+    <description>Tersesat ? Temukan yang anda cari</description>
+    <keywords>sitemap</keywords>
+    <url_rewrite>sitemap</url_rewrite>
+  </meta>
+  <meta id='supplier' id_shop='1'>
+    <title>Supplier</title>
+    <description>Daftar supplier</description>
+    <keywords>supplier</keywords>
+    <url_rewrite>supplier</url_rewrite>
+  </meta>
+  <meta id='address' id_shop='1'>
+    <title>Alamat</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>alamat</url_rewrite>
+  </meta>
+  <meta id='addresses' id_shop='1'>
+    <title>Daftar Alamat</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>daftar-alamat</url_rewrite>
+  </meta>
+  <meta id='authentication' id_shop='1'>
+    <title>Login</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>login</url_rewrite>
+  </meta>
+  <meta id='cart' id_shop='1'>
+    <title>Keranjang belanja</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>keranjang-belanja</url_rewrite>
+  </meta>
+  <meta id='discount' id_shop='1'>
+    <title>Diskon</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>diskon</url_rewrite>
+  </meta>
+  <meta id='history' id_shop='1'>
+    <title>Riwayat pembelian</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>riwayat-pembelian</url_rewrite>
+  </meta>
+  <meta id='identity' id_shop='1'>
+    <title>Identitas</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>identitas</url_rewrite>
+  </meta>
+  <meta id='my-account' id_shop='1'>
+    <title>Akun saya</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>akun-saya</url_rewrite>
+  </meta>
+  <meta id='order-follow' id_shop='1'>
+    <title>Pantau order</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>pantau-order</url_rewrite>
+  </meta>
+  <meta id='order-slip' id_shop='1'>
+    <title>Slip order</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>slip-order</url_rewrite>
+  </meta>
+  <meta id='order' id_shop='1'>
+    <title>Order</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order</url_rewrite>
+  </meta>
+  <meta id='search' id_shop='1'>
+    <title>Cari</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>cari</url_rewrite>
+  </meta>
+  <meta id='stores' id_shop='1'>
+    <title>Toko</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>toko</url_rewrite>
+  </meta>
+  <meta id='order-opc' id_shop='1'>
+    <title>Order</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>quick-order</url_rewrite>
+  </meta>
+  <meta id='guest-tracking' id_shop='1'>
+    <title>Guest tracking</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>guest-tracking</url_rewrite>
+  </meta>
+  <meta id='order-confirmation' id_shop='1'>
+    <title>Konfirmasi pembelian</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>konfirmasi-pembelian</url_rewrite>
+  </meta>
+</entity_meta>
diff --git a/install-dev/langs/id/data/order_return_state.xml b/install-dev/langs/id/data/order_return_state.xml
new file mode 100644
index 000000000..a6c67e83d
--- /dev/null
+++ b/install-dev/langs/id/data/order_return_state.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+<entity_order_return_state>
+  <order_return_state id='Waiting_for_confirmation'>
+    <name>Menunggu konfirmasi</name>
+  </order_return_state>
+  <order_return_state id='Waiting_for_package'>
+    <name>Menunggu paket</name>
+  </order_return_state>
+  <order_return_state id='Package_received'>
+    <name>Paket diterima</name>
+  </order_return_state>
+  <order_return_state id='Return_denied'>
+    <name>Retur ditolak</name>
+  </order_return_state>
+  <order_return_state id='Return_completed'>
+    <name>Retur berhasil</name>
+  </order_return_state>
+</entity_order_return_state>
diff --git a/install-dev/langs/id/data/order_state.xml b/install-dev/langs/id/data/order_state.xml
new file mode 100644
index 000000000..59cde53ff
--- /dev/null
+++ b/install-dev/langs/id/data/order_state.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0'?>
+<entity_order_state>
+  <order_state id='Awaiting_cheque_payment'>
+    <name>Menunggu cek pembayaran</name>
+    <template>cheque</template>
+  </order_state>
+  <order_state id='Payment_accepted'>
+    <name>Pembayaran diterima</name>
+    <template>payment</template>
+  </order_state>
+  <order_state id='Preparation_in_progress'>
+    <name>Barang tengah disiapkan</name>
+    <template>preparation</template>
+  </order_state>
+  <order_state id='Shipped'>
+    <name>Proses pengiriman</name>
+    <template>shipped</template>
+  </order_state>
+  <order_state id='Delivered'>
+    <name>Barang telah diterima</name>
+    <template/>
+  </order_state>
+  <order_state id='Canceled'>
+    <name>Dibatalkan</name>
+    <template>order_canceled</template>
+  </order_state>
+  <order_state id='Refund'>
+    <name>Refund</name>
+    <template>refund</template>
+  </order_state>
+  <order_state id='Payment_error'>
+    <name>Pembayaran eror</name>
+    <template>payment_error</template>
+  </order_state>
+  <order_state id='On_backorder'>
+    <name>Sedang dipesan</name>
+    <template>outofstock</template>
+  </order_state>
+  <order_state id='Awaiting_bank_wire_payment'>
+    <name>Menunggu pembayaran via transfer bank</name>
+    <template>bankwire</template>
+  </order_state>
+  <order_state id='Awaiting_PayPal_payment'>
+    <name>Menunggu pembayaran melalui PayPal</name>
+    <template/>
+  </order_state>
+  <order_state id='Payment_remotely_accepted'>
+    <name>Pembayaran diterima</name>
+    <template>payment</template>
+  </order_state>
+</entity_order_state>
diff --git a/install-dev/langs/id/data/profile.xml b/install-dev/langs/id/data/profile.xml
new file mode 100644
index 000000000..b388d5f2b
--- /dev/null
+++ b/install-dev/langs/id/data/profile.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<entity_profile>
+  <profile id='SuperAdmin'>
+    <name>SuperAdmin</name>
+  </profile>
+</entity_profile>
diff --git a/install-dev/langs/id/data/quick_access.xml b/install-dev/langs/id/data/quick_access.xml
new file mode 100644
index 000000000..7fc7ada78
--- /dev/null
+++ b/install-dev/langs/id/data/quick_access.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<entity_quick_access>
+  <quick_access id='Home' name='Beranda'/>
+  <quick_access id='My_Shop' name='Toko saya'/>
+  <quick_access id='New_category' name='Kategori baru'/>
+  <quick_access id='New_product' name='Produk baru'/>
+  <quick_access id='New_voucher' name='Voucher baru'/>
+</entity_quick_access>
diff --git a/install-dev/langs/id/data/risk.xml b/install-dev/langs/id/data/risk.xml
new file mode 100644
index 000000000..b1c2a985d
--- /dev/null
+++ b/install-dev/langs/id/data/risk.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0'?>
+<entity_risk>
+  <risk id='None' name='None'/>
+  <risk id='Low' name='Rendah'/>
+  <risk id='Medium' name='Sedang'/>
+  <risk id='High' name='Tinggi'/>
+</entity_risk>
diff --git a/install-dev/langs/id/data/stock_mvt_reason.xml b/install-dev/langs/id/data/stock_mvt_reason.xml
new file mode 100644
index 000000000..11225c1bb
--- /dev/null
+++ b/install-dev/langs/id/data/stock_mvt_reason.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0'?>
+<entity_stock_mvt_reason>
+  <stock_mvt_reason id='Increase'>
+    <name>Tambah</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Decrease'>
+    <name>Kurangi</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Customer_Order'>
+    <name>Order dari pelanggan</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Regulation_following_an_inventory_of_stock'>
+    <name>Aturan mengenai stok barang</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Regulation_following_an_inventory_of_stock_1'>
+    <name>Aturan mengenai stok barang</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Transfer_to_another_warehouse'>
+    <name>Transfer ke gudang lain</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Transfer_from_another_warehouse'>
+    <name>Transfer dari gudang lain</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id='Supply_Order'>
+    <name>Supply Order</name>
+  </stock_mvt_reason>
+</entity_stock_mvt_reason>
diff --git a/install-dev/langs/id/data/supplier_order_state.xml b/install-dev/langs/id/data/supplier_order_state.xml
new file mode 100644
index 000000000..7d42ca73a
--- /dev/null
+++ b/install-dev/langs/id/data/supplier_order_state.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<entity_supplier_order_state>
+	<supplier_order_state id='creation_in_progress'>
+		<name>sedang dibuat</name>
+	</supplier_order_state>
+	<supplier_order_state id='Order_validated'>
+		<name>Order berhasil divalidasi</name>
+	</supplier_order_state>
+	<supplier_order_state id='Pending_receipt'>
+		<name>Menunggu barang</name>
+	</supplier_order_state>
+	<supplier_order_state id='Order_received_in_part'>
+		<name>Barang diterima terpisah</name>
+	</supplier_order_state>
+	<supplier_order_state id='Order_received_completely'>
+		<name>Barang berhasil diterima</name>
+	</supplier_order_state>
+	<supplier_order_state id='order_fenced'>
+		<name>barang diproses</name>
+	</supplier_order_state>
+</entity_supplier_order_state>
\ No newline at end of file
diff --git a/install-dev/langs/id/data/supply_order_state.xml b/install-dev/langs/id/data/supply_order_state.xml
new file mode 100644
index 000000000..46d6b3339
--- /dev/null
+++ b/install-dev/langs/id/data/supply_order_state.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0'?>
+<entity_supply_order_state>
+  <supply_order_state id='supply_order_state_1'>
+    <name>1 - Persiapan</name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_2'>
+    <name>2 - Order berhasil divalidasi</name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_3'>
+    <name>3 - Menunggu barang</name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_4'>
+    <name>4 - Order diterima terpisah</name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_5'>
+    <name>5 - Order berhasil diterima</name>
+  </supply_order_state>
+  <supply_order_state id='supply_order_state_6'>
+    <name>6 - Pembelian dibatalkan</name>
+  </supply_order_state>
+</entity_supply_order_state>
diff --git a/install-dev/langs/id/data/tab.xml b/install-dev/langs/id/data/tab.xml
new file mode 100644
index 000000000..e6d9c8f35
--- /dev/null
+++ b/install-dev/langs/id/data/tab.xml
@@ -0,0 +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="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"/>
+</entity_tab>
diff --git a/install-dev/langs/id/flag.jpg b/install-dev/langs/id/flag.jpg
new file mode 100644
index 000000000..1a2b0db48
Binary files /dev/null and b/install-dev/langs/id/flag.jpg differ
diff --git a/install-dev/langs/id/img/id-default-category.jpg b/install-dev/langs/id/img/id-default-category.jpg
new file mode 100644
index 000000000..c28c90de1
Binary files /dev/null and b/install-dev/langs/id/img/id-default-category.jpg differ
diff --git a/install-dev/langs/id/img/id-default-home.jpg b/install-dev/langs/id/img/id-default-home.jpg
new file mode 100644
index 000000000..ae6658431
Binary files /dev/null and b/install-dev/langs/id/img/id-default-home.jpg differ
diff --git a/install-dev/langs/id/img/id-default-large.jpg b/install-dev/langs/id/img/id-default-large.jpg
new file mode 100644
index 000000000..83f20252e
Binary files /dev/null and b/install-dev/langs/id/img/id-default-large.jpg differ
diff --git a/install-dev/langs/id/img/id-default-large_scene.jpg b/install-dev/langs/id/img/id-default-large_scene.jpg
new file mode 100644
index 000000000..0c8b30dbe
Binary files /dev/null and b/install-dev/langs/id/img/id-default-large_scene.jpg differ
diff --git a/install-dev/langs/id/img/id-default-medium.jpg b/install-dev/langs/id/img/id-default-medium.jpg
new file mode 100644
index 000000000..13546aa40
Binary files /dev/null and b/install-dev/langs/id/img/id-default-medium.jpg differ
diff --git a/install-dev/langs/id/img/id-default-small.jpg b/install-dev/langs/id/img/id-default-small.jpg
new file mode 100644
index 000000000..8cb9417b6
Binary files /dev/null and b/install-dev/langs/id/img/id-default-small.jpg differ
diff --git a/install-dev/langs/id/img/id-default-thickbox.jpg b/install-dev/langs/id/img/id-default-thickbox.jpg
new file mode 100644
index 000000000..6bd5603f7
Binary files /dev/null and b/install-dev/langs/id/img/id-default-thickbox.jpg differ
diff --git a/install-dev/langs/id/img/id-default-thumb_scene.jpg b/install-dev/langs/id/img/id-default-thumb_scene.jpg
new file mode 100644
index 000000000..47d2def48
Binary files /dev/null and b/install-dev/langs/id/img/id-default-thumb_scene.jpg differ
diff --git a/install-dev/langs/id/img/id.jpg b/install-dev/langs/id/img/id.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/langs/id/img/id.jpg differ
diff --git a/install-dev/langs/id/img/index.php b/install-dev/langs/id/img/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/id/img/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/id/index.php b/install-dev/langs/id/index.php
new file mode 100644
index 000000000..5e4749107
--- /dev/null
+++ b/install-dev/langs/id/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/id/install.php b/install-dev/langs/id/install.php
new file mode 100644
index 000000000..180621db6
--- /dev/null
+++ b/install-dev/langs/id/install.php
@@ -0,0 +1,259 @@
+<?php
+return array(
+	'informations' => array(
+		'phone' => '+1 (888) 947-6543',
+		'documentation' => 'http://doc.prestashop.com/',
+		'documentation_upgrade' => 'http://docs.prestashop.com/display/PS15/Updating+PrestaShop',
+		'forum' => 'http://www.prestashop.com/forums/viewcategory/85/',
+		'blog' => 'http://www.prestashop.com/blog/',
+		'support' => 'http://support.prestashop.com/en/',
+	),
+	'translations' => array(
+		'menu_welcome' => 'Pilih bahasa',
+		'menu_license' => 'Perjanjian lisensi',
+		'menu_system' => 'Kompabilitas sistem',
+		'menu_database' => 'Konfigurasi sistem',
+		'menu_configure' => 'Informasi toko',
+		'menu_process' => 'Instalasi toko',
+		'Choose the installer language:' => 'Pilih bahasa :',
+		'Field required' => 'Harus diisi',
+		'Invalid shop name' => 'Nama toko tidak valid',
+		'Your firstname contains some invalid characters' => 'Nama depan Anda berisi karakter yang tidak diperbolehkan',
+		'Your lastname contains some invalid characters' => 'Nama belakang Anda berisi karakter yang tidak diperbolehkan',
+		'Must be alphanumeric string with at least 8 characters' => 'Harus alfanumerik minimal 8 karakter',
+		'The password is incorrect (alphanumeric string with at least 8 characters)' => 'Password tidak benar (alfanumerik minimal 8 karakter)',
+		'Password and its confirmation are different' => 'Password dan konfirmasi password tidak sama',
+		'This e-mail address is invalid' => 'Alamat e-mail salah',
+		'The uploaded file exceeds the upload_max_filesize directive in php.ini' => 'File yang diupload melebihi seting upload_max_filesize yang ada di php.ini',
+		'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form' => 'File yang diupload melebihi direktif MAX_FILE_SIZE yang diset pada form HTML',
+		'The uploaded file was only partially uploaded' => 'File yang diupload tidak utuh/terpotong',
+		'No file was uploaded' => 'Tidak ada file yang diupload',
+		'Missing a temporary folder' => 'Folder temporer tidak ditemukan',
+		'Failed to write file to disk' => 'Gagal menulis ke disk',
+		'File upload stopped by extension' => 'Upload file terhenti karena ekstensi',
+		'No error code available' => 'Tidak ada kode eror yang sesuai',
+		'This is not a valid image file' => 'Bukan file gambar yang valid',
+		'Image type is not supported' => 'File image tidak didukung',
+		'Image folder %s is not writable' => 'Folder image % tidak dapat ditulisi',
+		'Cannot upload the file' => 'Tidak dapat mengupload file',
+		'Lingerie and Adult' => 'Lingerie dan perlengkapan dewasa',
+		'Animals and Pets' => 'Binatang dan perliharaan',
+		'Art and Culture' => 'Seni',
+		'Babies' => 'Bayi',
+		'Beauty and Personal Care' => 'Kecantikan',
+		'Cars' => 'Kendaraan bermotor',
+		'Computer Hardware and Software' => 'Komputer hardware dan software ',
+		'Download' => 'Download',
+		'Fashion and accessories' => 'Pakaian dan aksesoris',
+		'Flowers, Gifts and Crafts' => 'Bunga, kado dan kerajinan',
+		'Food and beverage' => 'Makanan dan minuman',
+		'HiFi, Photo and Video' => 'Audio, foto dan vídeo',
+		'Home and Garden' => 'Bunga dan tanaman',
+		'Home Appliances' => 'Perlengkapan rumah tangga',
+		'Jewelry' => 'Perhiasan',
+		'Mobile and Telecom' => 'Telekomunikasi',
+		'Services' => 'Jasa',
+		'Shoes and accessories' => 'Sepatu dan aksesoris',
+		'Sports and Entertainment' => 'Olahraga dan hiburan',
+		'Travel' => 'Travel',
+		'Database is connected' => 'Berhasil terhubung ke database',
+		'A test e-mail has been sent to %s' => 'Tes email berhasil dikirim ke %s',
+		'An error occurred while sending email, please verify your parameters' => 'Eror ketika mengirim email, cek ulang konfigurasi email Anda',
+		'Create settings.inc file' => 'Membuat file settings.inc',
+		'Create database tables' => 'Membuat tabel database',
+		'Create default shop and languages' => 'Membuat toko dan bahasa',
+		'Populate database tables' => 'Mengisi tabel database',
+		'Configure shop information' => 'Konfigurasi toko',
+		'Install modules' => 'Install modul',
+		'Install demonstration data' => 'Install data untuk demo',
+		'Install theme' => 'Install theme',
+		'Send information e-mail' => 'Kirim informasi e-mail',
+		'PHP parameters:' => 'Parameter PHP :',
+		'Is PHP 5.1.2 or later installed ?' => 'Apakah PHP 5.1.2 atau lebih baru terinstall ?',
+		'Can upload files ?' => 'Dapat mengupload file ?',
+		'Can create new files and folders ?' => 'Dapat membuat file dan folder ?',
+		'Is GD Library installed ?' => 'Apakah library GD terinstall ?',
+		'Is MySQL support is on ?' => 'Apakah mendukung MySQL ?',
+		'Recursive write permissions on files and folders:' => 'Hak akses rekursif untuk file dan folder:',
+		'Can open external URLs ?' => 'Dapat membuka URL eksternal ?',
+		'Is PHP register global option off (recommended) ?' => 'Opsi PHP register global dinon-aktifkan (disarankan) ?',
+		'Is GZIP compression activated (recommended) ?' => 'Kompresi GZIP aktif (disarankan) ?',
+		'Is Mcrypt extension available (recommended) ?' => 'Ekstensi Mcrypt tersedia (disarankan) ?',
+		'Is PHP magic quotes option deactivated (recommended) ?' => ' Opsi PHP magic_quotes dinon-aktifkan (disarankan) ?',
+		'Is Dom extension loaded ?' => 'Apakah ekstensi DOM terpasang ?',
+		'Is PDO MySQL extension loaded ?' => 'Apakah PDO MySQL terpasang ?',
+		'Shop settings and merchant account information' => 'Seting toko dan akun',
+		'Shop name:' => 'Nama toko :',
+		'Main activity:' => 'Kegiatan :',
+		'Please choose your main activity' => 'Harap pilih kegiatan utama toko ini',
+		'Other activity...' => 'Kegiatan lainnya...',
+		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Informasi ini tidak harus diisi, hanya untuk keperluan statistik dan tidak ada pengaruh apapun ke toko Anda.',
+		'Install demo products:' => 'Install produk demo :',
+		'Yes' => 'Ya',
+		'No' => 'Tidak',
+		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Demo produk diperlukan jika Anda ingin belajar cara menggunakan PrestaShop. Disarankan untuk diinstall jika Anda masih belum terbiasa dengan Prestashop.',
+		'Default country:' => 'Negara :',
+		'Select your country' => 'Pilih negara Anda',
+		'Shop timezone:' => 'Zona waktu :',
+		'Select your timezone' => 'Pilih zona waktu',
+		'Shop logo:' => 'Logo',
+		'Recommended dimensions:' => 'Dimensi yang direkomendasikan :',
+		'First name:' => 'Nama depan :',
+		'Last name:' => 'Nama belakang :',
+		'E-mail address:' => 'Alamat e-mail :',
+		'Shop password:' => 'Password toko :',
+		'Re-type to confirm:' => 'Tulis ulang password untuk konfirmasi&nbsp;:',
+		'Receive this information by e-mail' => 'Kirim informasi ini melalui e-mail',
+		'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Perhatian: Anda akan menerima informasi ini jika konfigurasi e-mail Anda benar.',
+		'Configure your database by filling out the following fields:' => 'Konfigurasi database Anda dengan mengisi field berikut ini :',
+		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => 'Anda harus membuat database, panduan tersedia di <a href="http://doc.prestashop.com" target="_blank">dokumentasi online Prestashop</a>.',
+		'Database server address:' => 'Alamat server database :',
+		'If you want to use a different port, add :XX after your server address where XX is your port number.' => 'Jika Anda ingin menggunakan port yang berbeda, tambahkan :XX setelah alamat server dimana XX adalah nomor port yang Anda gunakan.',
+		'Database name:' => 'Nama database :',
+		'Database login:' => 'User database :',
+		'Database password:' => 'Password database  :',
+		'Database Engine:' => 'Engine database :',
+		'Tables prefix:' => 'Prefix nama tabel :',
+		'Drop existing tables (mode dev):' => 'Hapus tabel yang ada (dev mode) :',
+		'Verify now!' => 'Cek sekarang !',
+		'E-mail delivery set-up' => 'Setup e-mail',
+		'Configure SMTP manually (advanced users only)' => 'Konfigurasikan SMTP server secara manual (untuk pengguna ahli)',
+		'By default, the PHP mail() function is used' => 'Secara default, fungsi PHP mail() yang digunakan',
+		'SMTP server address:' => 'Alamat server SMTP',
+		'Encryption:' => 'Enkripsi :',
+		'None' => '-',
+		'Port:' => 'Port :',
+		'Login:' => 'Login :',
+		'Password:' => 'Password :',
+		'enter@your.email' => 'alamat@email.anda',
+		'Send me a test email!' => 'Kirim tes email !',
+		'Next' => 'Lanjutkan',
+		'Back' => 'Kembali',
+		'Official forum' => 'Forum resmi',
+		'Support' => 'Support',
+		'Documentation' => 'Dokumentasi',
+		'Contact us' => 'Hubungi kami',
+		'Forum' => 'Forum',
+		'Blog' => 'Blog',
+		'Done!' => 'Selesai !',
+		'An error occured during installation...' => 'Eror ketika proses instalasi... ',
+		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'Anda dapat menggunakan tautan yang ada di kolom sebelah kiri untuk kembali ke langkah sebelumnya the, atau mengulang proses instalasi dengan <a href="%s">klik tautan ini</a>.',
+		'Your installation is finished!' => 'Proses instalasi selesai !',
+		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Proses instalasi berhasil dan selesai. Terima kasih telah menggunakan PrestaShop !',
+		'Please remember your login information:' => 'Harap ingat informasi login Anda berikut ini :',
+		'WARNING: For security purposes, you must delete the "install" folder.' => 'PERHATIAN: Untuk keamanan, Anda harus menghapus folder "install".',
+		'Back Office' => 'Back Office',
+		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'Kelola toko Anda melalui backoffice, dimana Anda dapat mengatur order, pelanggan, memasang modul, merubah theme dan banyak lagi.., ',
+		'Manage your store' => 'Kelola toko Anda',
+		'Front Office' => 'Front Office',
+		'Discover your store as your future customers will see it!' => 'Jelajahi toko Anda sebagaimana pelanggan mengunjungi website Anda !',
+		'Discover your store' => 'Kunjungi website Anda',
+		'Required set-up. Please verify the following checklist items are true.' => 'Harus diseting! Harap pastikan daftar ceklist berikut ini valid.',
+		'Your configuration is valid, click next to continue!' => 'Konfigurasi Anda sudah benar, silahkan klik tombol lanjutkan !',
+		'Your configuration is invalid. Please fix the issues below:' => 'Konfigurasi tidak benar. Harap perbaiki permasalahan berikut ini:',
+		'Optional set-up' => 'Seting opsional',
+		'Refresh these settings' => 'Refresh setting',
+		'Welcome to the PrestaShop %s Installer.' => 'Selamat datang di instalasi Prestashop %s',
+		'The installation process should take only few minutes!' => 'Proses instalasi hanya memerlukan waktu beberapa menit saja!',
+		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Jika memerlukan bantuan, jangan ragu untuk membaca <a href="%1$s" target="_blank">dokumentasi</a> atau hubungi tim kami di : %2$s',
+		'Did you know?' => 'Tahukah Anda ?',
+		'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop dan komunitasnya menawarkan lebih dari %d bahasa secara gratis, tersedia langsung dalam back office Anda pada menu Lokalisasi',
+		'License Agreements' => 'Perjanjian lisensi',
+		'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'PrestaShop core dirilis dibawah OSL 3.0 sementara modul PrestaShop dan themes dirilis dibawah AFL 3.0.',
+		'I agree to the above terms and conditions.' => 'Saya setuju dengan syarat dan ketentuan diatas.',
+		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Saya setuju untuk berpartisipasi mengembangkan Prestashop dengan mengirimkan informasi konfigurasi saya secara anonim.',
+		'If you have any questions, please visit our <a href="%1$s" target="_blank">documentation</a> and <a href="%2$s" target="_blank">community forum</a>.' => 'Jika Anda memiliki pertanyaan, silahkan kunjungi <a href="%1$s" target="_blank">halaman dokumentasi</a> dan <a href="%2$s" target="_blank">forum</a>.',
+		'Test message from PrestaShop' => 'Tes pesan dari PrestaShop',
+		'This is a test message, your server is now available to send email' => 'Tes pesan, server Anda dapat digunakan untuk mengirimkan email.',
+		'%s - Login information' => '%s - Informasi login',
+		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'SQL error untuk objek <i>%1$s</i> : <i>%2$s</i>',
+		'Cannot create image "%1$s" for entity "%2$s"' => 'Tidak dapat membuat image "%1$s" untuk objek "%2$s"',
+		'Cannot create image "%1$s" (bad permissions on folder "%2$s")' => 'Tidak dapat membuat image "%1$s" (masalah hak akses di "%2$s")',
+		'Cannot create image "%s"' => 'Tidak dapat membuat image "%s"',
+		'SQL error on query <i>%s</i>' => 'SQL error pada query <i>%s</i>',
+		'Server name is not valid' => 'Nama server tidak valid',
+		'You must enter a database name' => 'Nama database harus diisi',
+		'You must enter a database login' => 'Login database harus diisi',
+		'Tables prefix is invalid' => 'Prefix tabel tidak valid',
+		'Wrong engine chosen for MySQL' => 'Pilihan database engine untuk MySQL tidak valid',
+		'Cannot convert database data to utf-8' => 'Tidak dapat melakukan konversi data ke utf-8',
+		'At least one table with same prefix was already found, please change your prefix or drop your database' => 'Tabel dengan prefix yang sama ditemukan, harap ganti prefix Anda atau hapus terlebih dahulu databasenya',
+		'Database Server is not found. Please verify the login, password and server fields' => 'Server database tidak ditemukan. Harap cek informasi login, password dan server',
+		'Connection to MySQL server succeeded, but database "%s" not found' => 'Koneksi ke server MySQL berhasil, tapi database "%s" tidak ditemukan',
+		'Engine innoDB is not supported by your MySQL server, please use MyISAM' => 'Engine innoDB tidak didukung oleh server MySQL Anda, harap gunakan MyISAM',
+		'%s file is not writable (check permissions)' => 'File %s tidak dapat ditulisi (cek masalah hak akses)',
+		'%s folder is not writable (check permissions)' => 'Folder %s tidak dapat ditulisi (cek masalah hak akses)',
+		'Cannot write settings file' => 'Tidak dapat menulis file setting',
+		'Database structure file not found' => 'Struktur database tidak ditemukan',
+		'Cannot create group shop' => 'Tidak dapat membuat grup toko',
+		'Cannot create shop' => 'Tidak dapat membuat toko',
+		'Cannot create shop URL' => 'Tidak dapat membuat URL untuk toko Anda',
+		'File "language.xml" not found for language iso "%s"' => 'File "language.xml" tidak ditemukan untuk kode iso bahasa "%s"',
+		'File "language.xml" not valid for language iso "%s"' => 'File "language.xml" tidak ditemukan untuk kode iso bahasa "%s"',
+		'Cannot install language "%s"' => 'Tidak dapat meng-install bahasa "%s"',
+		'Cannot create admin account' => 'Tidak dapat membuat akun admin',
+		'Cannot install module "%s"' => 'Tidak dapat menginstall modul "%s"',
+		'Fixtures class "%s" not found' => 'Class "%s" tidak ditemukan',
+		'"%s" must be an instane of "InstallXmlLoader"' => '"%s" harus instance dari "InstallXmlLoader"',
+		'Display' => 'Display',
+		'<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>Perhatian: Anda tidak dapat menggunakan tool ini untuk melakukan upgrade Prestashop Anda.</b><br /><br />Anda menggunakan <b>PrestaShop versi %1$s</b>.<br /><br />Jika ingin melakukan upgrade, silahkan baca panduannya di: <a href="%2$s">%2$s</a>',
+		'PrestaShop Wizard Installer' => 'Instalasi PrestaShop',
+		'Information about your Store' => 'Informasi tentang toko Anda',
+		'Help us learn more about your store so we can offer you optimal guidance and the best features for your business!' => 'Bantu kami mengenal toko Anda sehingga kami dapat menawarkan bantuan yang optimal dan fitur-fitur terbaik untuk bisnis Anda!',
+		'Optional - You can add you logo at a later time.' => 'Opsional – Anda dapat menambahkan logo nanti.',
+		'Your Account' => 'Akun Anda',
+		'This email address will be your username to access your store\'s back office.' => 'Alamat email ini akan menjadi username Anda untuk mengakses backoffice.',
+		'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 menawarkan artikel dan tips yang dikirim secara teratur yang berisi tentang optimasi atau bagaimana mengatur toko Anda sehingga bisnis Anda berkembang lebih baik lagi. Jika tidak ingin menerima tips ini, silahkan uncheck kotak dibawah ini.',
+		'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.' => 'Untuk menggunakan PrestaShop, Anda harus <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">membuat database</a> untuk menyimpan data.',
+		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Harap lengkapi field dibawah ini agar Prestashop dapat terhubung ke database Anda..',
+		'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".' => 'Port default adalah 3306. Untuk menggunakan port yang berbeda, tambahkan nomor port diakhir nama server, misalnya ":4242".',
+		'Test your database connection now!' => 'Tes koneksi ke database sekarang!',
+		'PrestaShop Installation Assistant' => 'Instalasi Prestashop',
+		'Installation Assistant' => 'Instalasi Prestashop',
+		'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.' => 'Untuk menikmati fitur-fitur yang ditawarkan PrestaShop, harap baca lisensi dibawah. PrestaShop core dilisensikan menggunakan OSL 3.0, sementara modul dan theme dilisensikan menggunakan AFL 3.0.',
+		'Print my login information' => 'Cetak informasi login saya',
+		'We are currently checking PrestaShop compatibility with your system environment' => 'Sedang melakukan cek kompabilitas sistem Anda dengan Prestashop.',
+		'PrestaShop compatibility with your system environment has been verified!' => 'Kompabilitas Prestashop dengan sistem Anda berhasil diverifikasi!',
+		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Oops! Harap perbaiki item-item dibawah terlebih dahulu, lalu klik tombol "Refresh" untuk tes ulang kompabilitas sistem Anda.',
+		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 130,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'Proses instalasi PrestaShop cepat dan mudah. Dalam beberapa saat lagi, Anda akan menjadi bagian dari komunitas aktif yang terdiri dari 130.000 toko online. Andapun akan membuat toko online unik untuk Anda sendiri yang dapat dikelola dengan mudah.',
+		'Continue the installation in:' => 'Lanjutkan instalasi dalam bahasa:',
+		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'Pilihan bahasa diatas hanya berlaku ketika proses instalasi. Setelah terinstall, Anda dapat memilih bahasa untuk toko Anda dari lebih %d bahasa yang tersedia secara gratis!',
+		'The field %s is limited to %d characters' => 'Field %s dibayasi hanya %d karakter',
+		'An error occurred during logo copy.' => 'Eror ketika menyalin logo',
+		'An error occurred during logo upload.' => 'Eror ketika upload logo',
+		'PHP 5.1.2 or later is not enabled' => 'PHP 5.1.2 atau terbaru tidak aktif',
+		'Cannot upload files' => 'Tidak dapat mengupload file',
+		'Cannot create new files and folders' => 'Tidak dapat membuat file dan folder baru',
+		'GD Library is not installed' => 'GD Library tidak tersedia',
+		'MySQL support is not activated' => 'Dukungan MySQL tidak diaktifkan',
+		'Cannot open external URLs' => 'Tidak dapat membuka URL lain, akses diblok.',
+		'PHP register global option is on' => 'Opsi PHP register global aktif',
+		'GZIP compression is not activated' => 'Kompresi GZIP tidak aktif',
+		'Mcrypt extension is not enabled' => 'Ekstensi Mcrypt tidak aktif',
+		'Mbstring extension is not enabled' => 'Ekstensi Mbstring tidak aktif',
+		'PHP magic quotes option is enabled' => 'Opsi PHP magic quotes aktif',
+		'Dom extension is not loaded' => 'Extensi Dom tidak aktif',
+		'PDO MySQL extension is not loaded' => 'Extensi PDO MySQL tidak aktif',
+		'Cannot copy flag language "%s"' => 'Tidak dapat menyalin icon bendera untuk bahasa "%s" ',
+		'Sign-up to the newsletter' => 'Berlangganan newsletter',
+		'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.' => 'Jika memerlukan bantuan selama proses instalasi, hubungi tim kami di %s dan satu dari tim ahli kami dengan senang hati akan membantu Anda.',
+		'Contact us!' => 'Hubungi kami!',
+		'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 membutuhkan memori sedikitnya 32M, harap cek direktif memory_limit di php.ini atau hubungi tempat hosting Anda',
+		'Your PHP sessions path is not writable - check with your hosting provider:' => 'PHP sessions path tidak dapat ditulisi - cek ke tempat hosting Anda',
+		'Database is created' => 'Database berhasil dibuat',
+		'Cannot create the database automatically' => 'Tidak dapat membuat database secara otomatis',
+		'Install modules Addons' => 'Install modul Addons',
+		'Attempt to create the database automatically' => 'Mencoba membuat database secara otomatis',
+		'Country:' => 'Negara :',
+		'Must be letters and numbers with at least 8 characters' => 'Harus huruf atau angka minimum 8 karakter',
+		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Untuk proses instalasi Prestashop, Javascript di browser Anda harus aktif.',
+		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
+		'To enjoy the many features that are offered for free 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.' => 'Untuk menikmati fitur gratis lainnya di Prestashop, harap baca aturan lisensi dibawah. Prestashop core dilisensikan dibawah OSL 3.0, sementara modul dan theme dilisensikan dibawah AFL 3.0.',
+		'For security purposes, you must delete the "install" folder.' => 'Untuk alasan keamanan, folder "install" sebaiknya dihapus.',
+		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'Proses instalasi PrestaShop cepat dan mudah. Dalam beberapa saat lagi, Anda akan menjadi bagian dari komunitas aktif yang terdiri dari 130.000 toko online. Andapun akan membuat toko online unik untuk Anda sendiri yang dapat dikelola dengan mudah.',
+		'Files' => 'File',
+		'All files are not successfuly uploaded on your server' => 'Tidak semua file berhasil diunggah ke server',
+	),
+);
\ No newline at end of file
diff --git a/install-dev/langs/id/language.xml b/install-dev/langs/id/language.xml
new file mode 100644
index 000000000..74c6246b8
--- /dev/null
+++ b/install-dev/langs/id/language.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language>
+	<name><![CDATA[Indonesia (Indonesia)]]></name>
+	<language_code>id</language_code>
+	<date_format_lite>d/m/Y</date_format_lite>
+	<date_format_full>d/m/Y H:i:s</date_format_full>
+	<is_rtl>false</is_rtl>
+</language>
\ No newline at end of file
diff --git a/install-dev/langs/id/mail_identifiers.txt b/install-dev/langs/id/mail_identifiers.txt
new file mode 100644
index 000000000..87c673ef7
--- /dev/null
+++ b/install-dev/langs/id/mail_identifiers.txt
@@ -0,0 +1,10 @@
+Halo {firstname} {lastname},
+
+Berikut adalah informasi login Anda ke {shop_name}:
+
+Password: {passwd}
+E-mail : {email}
+
+{shop_name} - {shop_url}
+
+{shop_url} didukung oleh PrestaShop™
\ No newline at end of file
diff --git a/install-dev/langs/it/data/gender.xml b/install-dev/langs/it/data/gender.xml
index b0939d3c8..516968c14 100644
--- a/install-dev/langs/it/data/gender.xml
+++ b/install-dev/langs/it/data/gender.xml
@@ -2,5 +2,4 @@
 <entity_gender>
   <gender id="1" name="Sig."/>
   <gender id="2" name="Sig.ra"/>
-  <gender id="3" name="Miss"/>
 </entity_gender>
diff --git a/install-dev/langs/nl/data/gender.xml b/install-dev/langs/nl/data/gender.xml
index 75fc2ed2a..efea471a8 100644
--- a/install-dev/langs/nl/data/gender.xml
+++ b/install-dev/langs/nl/data/gender.xml
@@ -2,5 +2,4 @@
 <entity_gender>
   <gender id="1" name="Mr."/>
   <gender id="2" name="Ms."/>
-  <gender id="3" name="Miss"/>
 </entity_gender>
diff --git a/install-dev/langs/pl/data/gender.xml b/install-dev/langs/pl/data/gender.xml
index f78d3643b..dfa256828 100644
--- a/install-dev/langs/pl/data/gender.xml
+++ b/install-dev/langs/pl/data/gender.xml
@@ -2,5 +2,4 @@
 <entity_gender>
   <gender id="1" name="Pan"/>
   <gender id="2" name="Pani"/>
-  <gender id="3" name="Panna"/>
 </entity_gender>
diff --git a/install-dev/langs/ru/data/carrier.xml b/install-dev/langs/ru/data/carrier.xml
index 915e95ae9..b9f5d3fc5 100755
--- a/install-dev/langs/ru/data/carrier.xml
+++ b/install-dev/langs/ru/data/carrier.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <entity_carrier>
   <carrier id="carrier_1" id_shop="1">
-    <delay>Забрать товар в магазине</delay>
+    <delay>Самовывоз</delay>
   </carrier>
 </entity_carrier>
diff --git a/install-dev/langs/ru/data/cms.xml b/install-dev/langs/ru/data/cms.xml
index 5f327f6c7..1d7ef6c17 100755
--- a/install-dev/langs/ru/data/cms.xml
+++ b/install-dev/langs/ru/data/cms.xml
@@ -9,37 +9,37 @@
   </cms>
   <cms id="Legal_Notice">
     <meta_title>Правовое положение</meta_title>
-    <meta_description>Правовое положениеe</meta_description>
+    <meta_description>Правовое положениe</meta_description>
     <meta_keywords>правовое положение, права</meta_keywords>
-    <content>&lt;h2&gt;Законные&lt;/h2&gt;&lt;h3&gt;Права&lt;/h3&gt;&lt;p&gt;Производство:&lt;/p&gt;&lt;p&gt;Этот сайт был создан на &lt;a href="http://www.prestashop.com"&gt;PrestaShop&lt;/a&gt;&amp;торговля; ПО с открытым доступом &lt;/p&gt;</content>
+    <content>&lt;h2&gt;Правовое положение&lt;/h2&gt;&lt;p&gt;Производство:&lt;/p&gt;&lt;p&gt;Этот сайт был создан на &lt;a href="http://www.prestashop.com"&gt;PrestaShop&lt;/a&gt;&amp;trade; ПО с открытым доступом &lt;/p&gt;</content>
     <link_rewrite>legal-notice</link_rewrite>
   </cms>
   <cms id="Terms_and_conditions_of_use">
     <meta_title>Порядок и условия использования</meta_title>
     <meta_description>Порядок и условия использования</meta_description>
     <meta_keywords>условия, порядок, использование, продажа</meta_keywords>
-    <content>&lt;h2&gt;Ваш порядок и условия использования&lt;/h2&gt;&lt;h3&gt;Правило 1&lt;/h3&gt;&lt;p&gt;Прочитайте правило 1 &lt;/p&gt;&#xD;
+    <content>&lt;h2&gt;Порядок и условия использования&lt;/h2&gt;&lt;h3&gt;Правило 1&lt;/h3&gt;&lt;p&gt;Прочитайте правило 1 &lt;/p&gt;&#xD;
 &lt;h3&gt;Правило 2&lt;/h3&gt;&lt;p&gt; Прочитайте правило 2 &lt;/p&gt;&#xD;
 &lt;h3&gt;Правило 3&lt;/h3&gt;&lt;p&gt;Прочитайте правило 3 &lt;/p&gt;</content>
     <link_rewrite>terms-and-conditions-of-use</link_rewrite>
   </cms>
   <cms id="About_us">
-    <meta_title>О нас</meta_title>
-    <meta_description>Узнайте побольше о нас</meta_description>
+    <meta_title>О компании</meta_title>
+    <meta_description>Информация о компании</meta_description>
     <meta_keywords>о нас, информация</meta_keywords>
-    <content>&lt;h2&gt;About us&lt;/h2&gt;&#xD;
+    <content>&lt;h2&gt;О компании&lt;/h2&gt;&#xD;
 &lt;h3&gt;Наша компания&lt;/h3&gt;&lt;p&gt;Наша компания&lt;/p&gt;&#xD;
 &lt;h3&gt;Наша команда&lt;/h3&gt;&lt;p&gt;Наша команда&lt;/p&gt;&#xD;
 &lt;h3&gt;Информация&lt;/h3&gt;&lt;p&gt;Информация&lt;/p&gt;</content>
     <link_rewrite>about-us</link_rewrite>
   </cms>
   <cms id="Secure_payment">
-    <meta_title>Безопасный платеж </meta_title>
-    <meta_description>Безопасный платеж это</meta_description>
+    <meta_title>Безопасность платежей</meta_title>
+    <meta_description>Безопасность платежей</meta_description>
     <meta_keywords>безопасный платеж, ssl, visa, mastercard, paypal</meta_keywords>
-    <content>&lt;h2&gt;Безопасный платеж&lt;/h2&gt;&#xD;
-&lt;h3&gt;Безопасный платеж&lt;/h3&gt;&lt;p&gt;With SSL&lt;/p&gt;&#xD;
-&lt;h3&gt;Использовать Visa/Mastercard/Paypal&lt;/h3&gt;&lt;p&gt;Об этом сервисе&lt;/p&gt;</content>
+    <content>&lt;h2&gt;Безопасность платежей&lt;/h2&gt;&#xD;
+&lt;h3&gt;Безопасный платеж&lt;/h3&gt;&lt;p&gt;С использованием SSL&lt;/p&gt;&#xD;
+&lt;h3&gt;Использование Visa/Mastercard/Paypal&lt;/h3&gt;&lt;p&gt;Об этом сервисе&lt;/p&gt;</content>
     <link_rewrite>secure-payment</link_rewrite>
   </cms>
 </entity_cms>
diff --git a/install-dev/langs/ru/data/contact.xml b/install-dev/langs/ru/data/contact.xml
index 4242d136b..bb3731611 100755
--- a/install-dev/langs/ru/data/contact.xml
+++ b/install-dev/langs/ru/data/contact.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <entity_contact>
-  <contact id="Webmaster" name="Webmaster">
-    <description>Есои на сайте возникнут технические проблемы</description>
+  <contact id="Webmaster" name="Вебмастер">
+    <description>Если на сайте возникнут технические проблемы</description>
   </contact>
-  <contact id="Customer_service" name="Customer service">
+  <contact id="Customer_service" name="Клиентская служба">
     <description>По всем вопросам касательно товаров или заказов</description>
   </contact>
 </entity_contact>
diff --git a/install-dev/langs/ru/data/gender.xml b/install-dev/langs/ru/data/gender.xml
index 75fc2ed2a..cbf14248f 100755
--- a/install-dev/langs/ru/data/gender.xml
+++ b/install-dev/langs/ru/data/gender.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <entity_gender>
-  <gender id="1" name="Mr."/>
-  <gender id="2" name="Ms."/>
-  <gender id="3" name="Miss"/>
+  <gender id="1" name="Г-н"/>
+  <gender id="2" name="Г-жа"/>
 </entity_gender>
diff --git a/install-dev/langs/ru/data/meta.xml b/install-dev/langs/ru/data/meta.xml
index b4ce70180..f53ef2f4a 100755
--- a/install-dev/langs/ru/data/meta.xml
+++ b/install-dev/langs/ru/data/meta.xml
@@ -38,7 +38,7 @@
   </meta>
   <meta id="password" id_shop="1">
     <title>Забыли свой пароль?</title>
-    <description>Введите адрес электронной почты, использованный при регистрации, и мы отправим на него Ваш логин и новый пароль</description>
+    <description>Введите адрес электронной почты, использованный при регистрации, и мы отправим на него ваш логин и новый пароль</description>
     <keywords>забыли пароль, e-mail, новый пароль,восстановить пароль</keywords>
     <url_rewrite>password-recovery</url_rewrite>
   </meta>
@@ -70,7 +70,7 @@
     <title>Адреса</title>
     <description/>
     <keywords/>
-    <url_rewrite>aдреса</url_rewrite>
+    <url_rewrite>address</url_rewrite>
   </meta>
   <meta id="authentication" id_shop="1">
     <title>Аутентификация</title>
diff --git a/install-dev/langs/ru/data/quick_access.xml b/install-dev/langs/ru/data/quick_access.xml
index 72e5a5b9b..79d5ce60f 100644
--- a/install-dev/langs/ru/data/quick_access.xml
+++ b/install-dev/langs/ru/data/quick_access.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <entity_quick_access>
-  <quick_access id="Home" name="Home"/>
-  <quick_access id="My_Shop" name="My Shop"/>
-  <quick_access id="New_category" name="New category"/>
-  <quick_access id="New_product" name="New product"/>
-  <quick_access id="New_voucher" name="New voucher"/>
+  <quick_access id="Home" name="Главная"/>
+  <quick_access id="My_Shop" name="Мой магазин"/>
+  <quick_access id="New_category" name="Новая категория"/>
+  <quick_access id="New_product" name="Новый товар"/>
+  <quick_access id="New_voucher" name="Новый купон"/>
 </entity_quick_access>
diff --git a/install-dev/langs/ru/data/risk.xml b/install-dev/langs/ru/data/risk.xml
index bb8bf6dd1..bc792f621 100644
--- a/install-dev/langs/ru/data/risk.xml
+++ b/install-dev/langs/ru/data/risk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <entity_risk>
-  <risk id="None" name="None"/>
-  <risk id="Low" name="Low"/>
-  <risk id="Medium" name="Medium"/>
-  <risk id="High" name="High"/>
+  <risk id="None" name="Нет"/>
+  <risk id="Low" name="Низкий"/>
+  <risk id="Medium" name="Средний"/>
+  <risk id="High" name="Высокий"/>
 </entity_risk>
diff --git a/install-dev/langs/ru/data/stock_mvt_reason.xml b/install-dev/langs/ru/data/stock_mvt_reason.xml
index e04ec4eb1..ce3672210 100644
--- a/install-dev/langs/ru/data/stock_mvt_reason.xml
+++ b/install-dev/langs/ru/data/stock_mvt_reason.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0"?>
 <entity_stock_mvt_reason>
   <stock_mvt_reason id="Increase">
-    <name>Increase</name>
+    <name>Приход</name>
   </stock_mvt_reason>
   <stock_mvt_reason id="Decrease">
-    <name>Decrease</name>
+    <name>Расход</name>
   </stock_mvt_reason>
   <stock_mvt_reason id="Customer_Order">
-    <name>Customer Order</name>
+    <name>Заказ покупателя</name>
   </stock_mvt_reason>
   <stock_mvt_reason id="Regulation_following_an_inventory_of_stock">
-    <name>Regulation following an inventory of stock</name>
+    <name>Регулирование после инвентаризации</name>
   </stock_mvt_reason>
   <stock_mvt_reason id="Regulation_following_an_inventory_of_stock_1">
-    <name>Regulation following an inventory of stock</name>
+    <name>Регулирование после инвентаризации</name>
   </stock_mvt_reason>
   <stock_mvt_reason id="Transfer_to_another_warehouse">
-    <name>Transfer to another warehouse</name>
+    <name>Передача на другой склад</name>
   </stock_mvt_reason>
   <stock_mvt_reason id="Transfer_from_another_warehouse">
-    <name>Transfer from another warehouse</name>
+    <name>Передача с другого склада</name>
   </stock_mvt_reason>
   <stock_mvt_reason id="Supply_Order">
-    <name>Supply Order</name>
+    <name>Заказ на поставку</name>
   </stock_mvt_reason>
 </entity_stock_mvt_reason>
diff --git a/install-dev/langs/ru/data/supplier_order_state.xml b/install-dev/langs/ru/data/supplier_order_state.xml
index dfc4ce42e..be7f926ee 100644
--- a/install-dev/langs/ru/data/supplier_order_state.xml
+++ b/install-dev/langs/ru/data/supplier_order_state.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_supplier_order_state>
 	<supplier_order_state id="creation_in_progress">
-		<name><![CDATA[creation in progress]]></name>
+		<name><![CDATA[В процессе создания]]></name>
 	</supplier_order_state>
 	<supplier_order_state id="Order_validated">
-		<name><![CDATA[Order validated]]></name>
+		<name><![CDATA[Заказ одобрен]]></name>
 	</supplier_order_state>
 	<supplier_order_state id="Pending_receipt">
-		<name><![CDATA[Pending receipt]]></name>
+		<name><![CDATA[Ожидает оплаты]]></name>
 	</supplier_order_state>
 	<supplier_order_state id="Order_received_in_part">
-		<name><![CDATA[Order received in part]]></name>
+		<name><![CDATA[Получен частично]]></name>
 	</supplier_order_state>
 	<supplier_order_state id="Order_received_completely">
-		<name><![CDATA[Order received completely]]></name>
+		<name><![CDATA[Получен]]></name>
 	</supplier_order_state>
 	<supplier_order_state id="order_fenced">
-		<name><![CDATA[order fenced]]></name>
+		<name><![CDATA[Отклонен]]></name>
 	</supplier_order_state>
-</entity_supplier_order_state>
\ No newline at end of file
+</entity_supplier_order_state>
diff --git a/install-dev/langs/ru/data/supply_order_state.xml b/install-dev/langs/ru/data/supply_order_state.xml
index 1e8903f0f..8d267c213 100644
--- a/install-dev/langs/ru/data/supply_order_state.xml
+++ b/install-dev/langs/ru/data/supply_order_state.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <entity_supply_order_state>
   <supply_order_state id="supply_order_state_1">
-    <name>1 - Creation in progress</name>
+    <name>1 - В процессе создания</name>
   </supply_order_state>
   <supply_order_state id="supply_order_state_2">
-    <name>2 - Order validated</name>
+    <name>2 - Заказ одобрен</name>
   </supply_order_state>
   <supply_order_state id="supply_order_state_3">
-    <name>3 - Pending receipt</name>
+    <name>3 - Ожидает оплаты</name>
   </supply_order_state>
   <supply_order_state id="supply_order_state_4">
-    <name>4 - Order received in part</name>
+    <name>4 - Получен частично</name>
   </supply_order_state>
   <supply_order_state id="supply_order_state_5">
-    <name>5 - Order received completely</name>
+    <name>5 - Получен</name>
   </supply_order_state>
   <supply_order_state id="supply_order_state_6">
-    <name>6 - Order canceled</name>
+    <name>6 - Отклонен</name>
   </supply_order_state>
 </entity_supply_order_state>
diff --git a/install-dev/langs/ru/data/tab.xml b/install-dev/langs/ru/data/tab.xml
index 61e2c4856..7b7017095 100644
--- a/install-dev/langs/ru/data/tab.xml
+++ b/install-dev/langs/ru/data/tab.xml
@@ -1,103 +1,103 @@
 <?xml version="1.0"?>
 <entity_tab>
-  <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="Addresses" name="Адреса"/>
+  <tab id="Administration" name="Администрация"/>
+  <tab id="Advanced_Parameters" name="Конфигурация"/>
+  <tab id="Attachments" name="Загрузить"/>
+  <tab id="Attributes_and_Values" name="Атрибуты и комбинации"/>
+  <tab id="Carriers" name="Курьеры"/>
+  <tab id="Cart_Rules" name="Правила корзины"/>
+  <tab id="Catalog" name="Каталог"/>
+  <tab id="Catalog_Price_Rules" name="Правила каталога"/>
+  <tab id="Categories" name="категории"/>
+  <tab id="CMS" name="Страницы"/>
+  <tab id="CMS_Categories" name="Категории CMS"/>
+  <tab id="CMS_Pages" name="Страницы CMS"/>
+  <tab id="Combinations_Generator" name="Комбинации Генератор"/>
+  <tab id="Configuration" name="Конфигурация"/>
+  <tab id="Configuration_Information" name="Информация"/>
+  <tab id="Contacts" name="Контакты"/>
+  <tab id="Countries" name="Страны"/>
+  <tab id="Credit_Slips" name="Кредитные счета"/>
+  <tab id="CSV_Import" name="Импорт CSV"/>
+  <tab id="Currencies" name="Валюта"/>
+  <tab id="Customer_Service" name="Служба поддержки"/>
+  <tab id="Customers" name="Клиенты"/>
+  <tab id="Customers_2" name="Клиенты"/>
+  <tab id="Customers_1" name="Клиенты"/>
   <tab id="DB_Backup" name="DB Backup"/>
-  <tab id="Delivery_Slips" name="&#x421;&#x447;&#x435;&#x442;&#x430; &#x43D;&#x430; &#x434;&#x43E;&#x441;&#x442;&#x430;&#x432;&#x43A;&#x443;"/>
+  <tab id="Delivery_Slips" name="Счета на доставку"/>
   <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_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="&#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
-  <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="Zones" name="&#x417;&#x43E;&#x43D;&#x44B;"/>
+  <tab id="Employees" name="Сотрудники"/>
+  <tab id="Features" name="Свойства"/>
+  <tab id="General" name="Общие настройки"/>
+  <tab id="Geolocation" name="Геолокация"/>
+  <tab id="Groups" name="Группы"/>
+  <tab id="Home" name="Домой"/>
+  <tab id="Image_Mapping" name="Карта картинок"/>
+  <tab id="Images" name="изображения"/>
+  <tab id="Instant_Stock_Status" name="Текущее состояние склада"/>
+  <tab id="Invoices" name="Инвойсы"/>
+  <tab id="Languages" name="Языки"/>
+  <tab id="Localization" name="Локализация"/>
+  <tab id="Localization_1" name="Локализация"/>
+  <tab id="Login" name="Логин"/>
+  <tab id="Logs" name="Журналы"/>
+  <tab id="Maintenance" name="Обслуживание"/>
+  <tab id="Manufacturers" name="производители"/>
+  <tab id="Marketing" name="Маркетинг"/>
+  <tab id="Menus" name="Закладки"/>
+  <tab id="Merchandise_Returns" name="Возвраты товаров"/>
+  <tab id="Modules_1" name="Модули"/>
+  <tab id="Modules" name="Модули"/>
+  <tab id="Modules_Themes_Catalog" name="Модули &amp; Шаблоны"/>
+  <tab id="Monitoring" name="Мониторинг"/>
+  <tab id="Multistore" name="Мульти-магазин"/>
+  <tab id="Order_Messages" name="Сообщения"/>
+  <tab id="Orders_2" name="Заказы"/>
+  <tab id="Orders" name="Заказы"/>
+  <tab id="Orders_1" name="Заказы"/>
+  <tab id="Outstanding" name="Неоплаченный(е)"/>
+  <tab id="Payment" name="Способ оплаты"/>
+  <tab id="Performance" name="Результат"/>
+  <tab id="Permissions" name="Права"/>
+  <tab id="Positions" name="Расположение"/>
+  <tab id="Preferences_1" name="Настройки"/>
+  <tab id="Preferences" name="Настройки"/>
+  <tab id="Price_Rules" name="Ценовые правила"/>
+  <tab id="Products_1" name="товары"/>
+  <tab id="Products" name="товары"/>
+  <tab id="Profiles" name="Профили"/>
+  <tab id="Quick_Access" name="Быстрый доступ"/>
+  <tab id="Referrers" name="Реферы"/>
+  <tab id="Search_1" name="Поиск"/>
+  <tab id="Search" name="Поиск"/>
+  <tab id="Search_Engines" name="Поисковые с-мы"/>
+  <tab id="SEO_URLs" name="SEO и URLs"/>
+  <tab id="Shipping" name="Доставка"/>
+  <tab id="Shipping_1" name="Настройки"/>
+  <tab id="Shop_URLs" name="URL магазина"/>
+  <tab id="Shopping_Carts" name="Корзины"/>
+  <tab id="Shops" name="Магазины"/>
+  <tab id="SQL_Manager" name="Менеджер SQL"/>
+  <tab id="States" name="Область"/>
+  <tab id="Stats" name="Статистика"/>
+  <tab id="Stats_1" name="Статистика"/>
+  <tab id="Statuses" name="Статусы"/>
+  <tab id="Stock" name="Запас"/>
+  <tab id="Stock_Coverage" name="Покрытие запасов"/>
+  <tab id="Stock_Management" name="Управление складом"/>
+  <tab id="Stock_Movement" name="Движение товаров"/>
+  <tab id="Store_Contacts" name="Контакты магазина"/>
+  <tab id="Suppliers" name="поставщики"/>
+  <tab id="Supply_orders" name="Заказы поставки"/>
+  <tab id="Tags" name="Метки"/>
+  <tab id="Tax_Rules" name="Налоги"/>
+  <tab id="Taxes" name="Налоги"/>
+  <tab id="Themes" name="Шаблоны"/>
+  <tab id="Titles" name="Формы обращения"/>
+  <tab id="Translations" name="Переводы"/>
+  <tab id="Warehouses" name="Склады"/>
+  <tab id="Webservice" name="WEB службы"/>
+  <tab id="Zones" name="Зоны"/>
 </entity_tab>
diff --git a/install-dev/langs/ru/img/ru-default-category.jpg b/install-dev/langs/ru/img/ru-default-category.jpg
index c28c90de1..535a3a0b1 100644
Binary files a/install-dev/langs/ru/img/ru-default-category.jpg and b/install-dev/langs/ru/img/ru-default-category.jpg differ
diff --git a/install-dev/langs/ru/img/ru-default-home.jpg b/install-dev/langs/ru/img/ru-default-home.jpg
index ae6658431..77e3628a5 100644
Binary files a/install-dev/langs/ru/img/ru-default-home.jpg and b/install-dev/langs/ru/img/ru-default-home.jpg differ
diff --git a/install-dev/langs/ru/img/ru-default-large.jpg b/install-dev/langs/ru/img/ru-default-large.jpg
index 83f20252e..f3ae81b01 100644
Binary files a/install-dev/langs/ru/img/ru-default-large.jpg and b/install-dev/langs/ru/img/ru-default-large.jpg differ
diff --git a/install-dev/langs/ru/img/ru-default-large_scene.jpg b/install-dev/langs/ru/img/ru-default-large_scene.jpg
index 0c8b30dbe..535a3a0b1 100644
Binary files a/install-dev/langs/ru/img/ru-default-large_scene.jpg and b/install-dev/langs/ru/img/ru-default-large_scene.jpg differ
diff --git a/install-dev/langs/ru/img/ru-default-medium.jpg b/install-dev/langs/ru/img/ru-default-medium.jpg
index 13546aa40..634f83a33 100644
Binary files a/install-dev/langs/ru/img/ru-default-medium.jpg and b/install-dev/langs/ru/img/ru-default-medium.jpg differ
diff --git a/install-dev/langs/ru/img/ru-default-small.jpg b/install-dev/langs/ru/img/ru-default-small.jpg
index 8cb9417b6..550113efc 100644
Binary files a/install-dev/langs/ru/img/ru-default-small.jpg and b/install-dev/langs/ru/img/ru-default-small.jpg differ
diff --git a/install-dev/langs/ru/img/ru-default-thickbox.jpg b/install-dev/langs/ru/img/ru-default-thickbox.jpg
index 6bd5603f7..a4003216b 100644
Binary files a/install-dev/langs/ru/img/ru-default-thickbox.jpg and b/install-dev/langs/ru/img/ru-default-thickbox.jpg differ
diff --git a/install-dev/langs/ru/img/ru-default-thumb_scene.jpg b/install-dev/langs/ru/img/ru-default-thumb_scene.jpg
index 47d2def48..560e6c86d 100644
Binary files a/install-dev/langs/ru/img/ru-default-thumb_scene.jpg and b/install-dev/langs/ru/img/ru-default-thumb_scene.jpg differ
diff --git a/install-dev/langs/ru/img/ru.jpg b/install-dev/langs/ru/img/ru.jpg
index 7d07b871d..f3ae81b01 100644
Binary files a/install-dev/langs/ru/img/ru.jpg and b/install-dev/langs/ru/img/ru.jpg differ
diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index cfa04da4a..395fe5f71 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -2,8 +2,8 @@
 return array(
 	'informations' => array(
 		'phone' => '+33 (0)1.40.18.30.04',
-        'support' => 'https://www.prestashop.com/ru/support',
-        'blog' => 'http://www.prestashop.com/blog/ru/'
+		'support' => 'https://www.prestashop.com/ru/support',
+		'blog' => 'http://www.prestashop.com/blog/ru/',
 	),
 	'translations' => array(
 		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'В SQL произошла ошибка для значения <i>%1$s</i>: <i>%2$s</i>',
@@ -242,5 +242,7 @@ return array(
 		'To enjoy the many features that are offered for free 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.' => 'Чтобы пользоваться всем функционалом PrestaShop, прочтите лицензионное соглашение. Ядро PrestaShop разработано на OSL 3.0, модули и темы - на AFL 3.0.',
 		'For security purposes, you must delete the "install" folder.' => 'В целях безопасности, удалите папку "install\'.',
 		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+		'Files' => 'Файлы',
+		'All files are not successfuly uploaded on your server' => 'Все файлы успешно загружены на ваш сервер',
 	),
-);
+);
\ No newline at end of file
diff --git a/install-dev/langs/ru/mail_identifiers.txt b/install-dev/langs/ru/mail_identifiers.txt
index 3f768acb3..7915e5aa1 100644
--- a/install-dev/langs/ru/mail_identifiers.txt
+++ b/install-dev/langs/ru/mail_identifiers.txt
@@ -1,10 +1,10 @@
-Hi {firstname} {lastname},
+Здравствуйте, {firstname} {lastname},
 
-Here is your personal login information for {shop_name}:
+Ваши персональные данные для входа в {shop_name}:
 
-Password: {passwd}
-E-mail address: {email}
+Электронная почта: {email}
+Пароль: {passwd}
 
 {shop_name} - {shop_url}
 
-{shop_url} powered by PrestaShop™
\ No newline at end of file
+{shop_url} под управлением PrestaShop™
\ No newline at end of file
diff --git a/install-dev/langs/tw/data/carrier.xml b/install-dev/langs/tw/data/carrier.xml
new file mode 100644
index 000000000..e7105114a
--- /dev/null
+++ b/install-dev/langs/tw/data/carrier.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<entity_carrier>
+  <carrier id="carrier_1" id_shop="1">
+    <delay>到店提貨</delay>
+  </carrier>
+</entity_carrier>
diff --git a/install-dev/langs/tw/data/category.xml b/install-dev/langs/tw/data/category.xml
new file mode 100644
index 000000000..53f14132b
--- /dev/null
+++ b/install-dev/langs/tw/data/category.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<entity_category>
+  <category id="Root" id_shop="1">
+    <name>根分類</name>
+    <description/>
+    <link_rewrite>root</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+  <category id="Home" id_shop="1">
+    <name>首頁</name>
+    <description/>
+    <link_rewrite>home</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </category>
+</entity_category>
diff --git a/install-dev/langs/tw/data/cms.xml b/install-dev/langs/tw/data/cms.xml
new file mode 100644
index 000000000..5d0edaff4
--- /dev/null
+++ b/install-dev/langs/tw/data/cms.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<entity_cms>
+  <cms id="Delivery">
+    <meta_title>配送</meta_title>
+    <meta_description>配送說明與條件</meta_description>
+    <meta_keywords>conditions, delivery, delay, shipment, pack</meta_keywords>
+    <content>請在這裡填入網站的配送說明與條件</content>
+    <link_rewrite>delivery</link_rewrite>
+  </cms>
+  <cms id="Legal_Notice">
+    <meta_title>法律聲明</meta_title>
+    <meta_description>法律聲明</meta_description>
+    <meta_keywords>notice, legal, credits</meta_keywords>
+    <content>請在這裡填入網站的法律聲明</content>
+    <link_rewrite>legal-notice</link_rewrite>
+  </cms>
+  <cms id="Terms_and_conditions_of_use">
+    <meta_title>網站使用條款</meta_title>
+    <meta_description>網站使用條款</meta_description>
+    <meta_keywords>conditions, terms, use, sell</meta_keywords>
+    <content>請在這裡填入網站的使用條款</content>
+    <link_rewrite>terms-and-conditions-of-use</link_rewrite>
+  </cms>
+  <cms id="About_us">
+    <meta_title>關於我們</meta_title>
+    <meta_description>關於我們</meta_description>
+    <meta_keywords>about us, informations</meta_keywords>
+    <content>請在這裡填入網站的關於我們</content>
+    <link_rewrite>about-us</link_rewrite>
+  </cms>
+  <cms id="Secure_payment">
+    <meta_title>付款安全說明</meta_title>
+    <meta_description>付款安全說明</meta_description>
+    <meta_keywords>secure payment, ssl, visa, mastercard, paypal</meta_keywords>
+    <content>請在這裡填入網站的付款安全說明</content>
+    <link_rewrite>secure-payment</link_rewrite>
+  </cms>
+</entity_cms>
diff --git a/install-dev/langs/tw/data/cms_category.xml b/install-dev/langs/tw/data/cms_category.xml
new file mode 100644
index 000000000..440abcbd7
--- /dev/null
+++ b/install-dev/langs/tw/data/cms_category.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<entity_cms_category>
+  <cms_category id="Home">
+    <name>首頁</name>
+    <description/>
+    <link_rewrite>home</link_rewrite>
+    <meta_title/>
+    <meta_keywords/>
+    <meta_description/>
+  </cms_category>
+</entity_cms_category>
diff --git a/install-dev/langs/tw/data/configuration.xml b/install-dev/langs/tw/data/configuration.xml
new file mode 100644
index 000000000..e9c3d7aee
--- /dev/null
+++ b/install-dev/langs/tw/data/configuration.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<entity_configuration>
+  <configuration id="PS_INVOICE_PREFIX">
+    <value>IN</value>
+  </configuration>
+  <configuration id="PS_DELIVERY_PREFIX">
+    <value>DE</value>
+  </configuration>
+  <configuration id="PS_SEARCH_BLACKLIST">
+    <value>a|the|of|on|in|and|to</value>
+  </configuration>
+  <configuration id="PS_META_KEYWORDS">
+    <value>0</value>
+  </configuration>
+  <configuration id="PS_CUSTOMER_SERVICE_SIGNATURE">
+    <value>親愛的客戶 &#xD;
+&#xD;
+敬祝平安，&#xD;
+客戶服務部門</value>
+  </configuration>
+</entity_configuration>
diff --git a/install-dev/langs/tw/data/contact.xml b/install-dev/langs/tw/data/contact.xml
new file mode 100644
index 000000000..fb3b89e1c
--- /dev/null
+++ b/install-dev/langs/tw/data/contact.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<entity_contact>
+  <contact id="Webmaster" name="網站管理員">
+    <description>如果在網站發現了技術性問題</description>
+  </contact>
+  <contact id="Customer_service" name="客戶服務">
+    <description>任何關於產品、訂單的問題</description>
+  </contact>
+</entity_contact>
diff --git a/install-dev/langs/tw/data/country.xml b/install-dev/langs/tw/data/country.xml
new file mode 100644
index 000000000..4e6bde1bf
--- /dev/null
+++ b/install-dev/langs/tw/data/country.xml
@@ -0,0 +1,735 @@
+<?xml version="1.0"?>
+<entity_country>
+  <country id="DE">
+    <name>Germany</name>
+  </country>
+  <country id="AT">
+    <name>Austria</name>
+  </country>
+  <country id="BE">
+    <name>Belgium</name>
+  </country>
+  <country id="CA">
+    <name>Canada</name>
+  </country>
+  <country id="CN">
+    <name>China</name>
+  </country>
+  <country id="ES">
+    <name>Spain</name>
+  </country>
+  <country id="FI">
+    <name>Finland</name>
+  </country>
+  <country id="FR">
+    <name>France</name>
+  </country>
+  <country id="GR">
+    <name>Greece</name>
+  </country>
+  <country id="IT">
+    <name>Italy</name>
+  </country>
+  <country id="JP">
+    <name>Japan</name>
+  </country>
+  <country id="LU">
+    <name>Luxemburg</name>
+  </country>
+  <country id="NL">
+    <name>Netherlands</name>
+  </country>
+  <country id="PL">
+    <name>Poland</name>
+  </country>
+  <country id="PT">
+    <name>Portugal</name>
+  </country>
+  <country id="CZ">
+    <name>Czech Republic</name>
+  </country>
+  <country id="GB">
+    <name>United Kingdom</name>
+  </country>
+  <country id="SE">
+    <name>Sweden</name>
+  </country>
+  <country id="CH">
+    <name>Switzerland</name>
+  </country>
+  <country id="DK">
+    <name>Denmark</name>
+  </country>
+  <country id="US">
+    <name>United States</name>
+  </country>
+  <country id="HK">
+    <name>HongKong</name>
+  </country>
+  <country id="NO">
+    <name>Norway</name>
+  </country>
+  <country id="AU">
+    <name>Australia</name>
+  </country>
+  <country id="SG">
+    <name>Singapore</name>
+  </country>
+  <country id="IE">
+    <name>Ireland</name>
+  </country>
+  <country id="NZ">
+    <name>New Zealand</name>
+  </country>
+  <country id="KR">
+    <name>South Korea</name>
+  </country>
+  <country id="IL">
+    <name>Israel</name>
+  </country>
+  <country id="ZA">
+    <name>South Africa</name>
+  </country>
+  <country id="NG">
+    <name>Nigeria</name>
+  </country>
+  <country id="CI">
+    <name>Ivory Coast</name>
+  </country>
+  <country id="TG">
+    <name>Togo</name>
+  </country>
+  <country id="BO">
+    <name>Bolivia</name>
+  </country>
+  <country id="MU">
+    <name>Mauritius</name>
+  </country>
+  <country id="RO">
+    <name>Romania</name>
+  </country>
+  <country id="SK">
+    <name>Slovakia</name>
+  </country>
+  <country id="DZ">
+    <name>Algeria</name>
+  </country>
+  <country id="AS">
+    <name>American Samoa</name>
+  </country>
+  <country id="AD">
+    <name>Andorra</name>
+  </country>
+  <country id="AO">
+    <name>Angola</name>
+  </country>
+  <country id="AI">
+    <name>Anguilla</name>
+  </country>
+  <country id="AG">
+    <name>Antigua and Barbuda</name>
+  </country>
+  <country id="AR">
+    <name>Argentina</name>
+  </country>
+  <country id="AM">
+    <name>Armenia</name>
+  </country>
+  <country id="AW">
+    <name>Aruba</name>
+  </country>
+  <country id="AZ">
+    <name>Azerbaijan</name>
+  </country>
+  <country id="BS">
+    <name>Bahamas</name>
+  </country>
+  <country id="BH">
+    <name>Bahrain</name>
+  </country>
+  <country id="BD">
+    <name>Bangladesh</name>
+  </country>
+  <country id="BB">
+    <name>Barbados</name>
+  </country>
+  <country id="BY">
+    <name>Belarus</name>
+  </country>
+  <country id="BZ">
+    <name>Belize</name>
+  </country>
+  <country id="BJ">
+    <name>Benin</name>
+  </country>
+  <country id="BM">
+    <name>Bermuda</name>
+  </country>
+  <country id="BT">
+    <name>Bhutan</name>
+  </country>
+  <country id="BW">
+    <name>Botswana</name>
+  </country>
+  <country id="BR">
+    <name>Brazil</name>
+  </country>
+  <country id="BN">
+    <name>Brunei</name>
+  </country>
+  <country id="BF">
+    <name>Burkina Faso</name>
+  </country>
+  <country id="MM">
+    <name>Burma (Myanmar)</name>
+  </country>
+  <country id="BI">
+    <name>Burundi</name>
+  </country>
+  <country id="KH">
+    <name>Cambodia</name>
+  </country>
+  <country id="CM">
+    <name>Cameroon</name>
+  </country>
+  <country id="CV">
+    <name>Cape Verde</name>
+  </country>
+  <country id="CF">
+    <name>Central African Republic</name>
+  </country>
+  <country id="TD">
+    <name>Chad</name>
+  </country>
+  <country id="CL">
+    <name>Chile</name>
+  </country>
+  <country id="CO">
+    <name>Colombia</name>
+  </country>
+  <country id="KM">
+    <name>Comoros</name>
+  </country>
+  <country id="CD">
+    <name>Congo, Dem. Republic</name>
+  </country>
+  <country id="CG">
+    <name>Congo, Republic</name>
+  </country>
+  <country id="CR">
+    <name>Costa Rica</name>
+  </country>
+  <country id="HR">
+    <name>Croatia</name>
+  </country>
+  <country id="CU">
+    <name>Cuba</name>
+  </country>
+  <country id="CY">
+    <name>Cyprus</name>
+  </country>
+  <country id="DJ">
+    <name>Djibouti</name>
+  </country>
+  <country id="DM">
+    <name>Dominica</name>
+  </country>
+  <country id="DO">
+    <name>Dominican Republic</name>
+  </country>
+  <country id="TL">
+    <name>East Timor</name>
+  </country>
+  <country id="EC">
+    <name>Ecuador</name>
+  </country>
+  <country id="EG">
+    <name>Egypt</name>
+  </country>
+  <country id="SV">
+    <name>El Salvador</name>
+  </country>
+  <country id="GQ">
+    <name>Equatorial Guinea</name>
+  </country>
+  <country id="ER">
+    <name>Eritrea</name>
+  </country>
+  <country id="EE">
+    <name>Estonia</name>
+  </country>
+  <country id="ET">
+    <name>Ethiopia</name>
+  </country>
+  <country id="FK">
+    <name>Falkland Islands</name>
+  </country>
+  <country id="FO">
+    <name>Faroe Islands</name>
+  </country>
+  <country id="FJ">
+    <name>Fiji</name>
+  </country>
+  <country id="GA">
+    <name>Gabon</name>
+  </country>
+  <country id="GM">
+    <name>Gambia</name>
+  </country>
+  <country id="GE">
+    <name>Georgia</name>
+  </country>
+  <country id="GH">
+    <name>Ghana</name>
+  </country>
+  <country id="GD">
+    <name>Grenada</name>
+  </country>
+  <country id="GL">
+    <name>Greenland</name>
+  </country>
+  <country id="GI">
+    <name>Gibraltar</name>
+  </country>
+  <country id="GP">
+    <name>Guadeloupe</name>
+  </country>
+  <country id="GU">
+    <name>Guam</name>
+  </country>
+  <country id="GT">
+    <name>Guatemala</name>
+  </country>
+  <country id="GG">
+    <name>Guernsey</name>
+  </country>
+  <country id="GN">
+    <name>Guinea</name>
+  </country>
+  <country id="GW">
+    <name>Guinea-Bissau</name>
+  </country>
+  <country id="GY">
+    <name>Guyana</name>
+  </country>
+  <country id="HT">
+    <name>Haiti</name>
+  </country>
+  <country id="HM">
+    <name>Heard Island and McDonald Islands</name>
+  </country>
+  <country id="VA">
+    <name>Vatican City State</name>
+  </country>
+  <country id="HN">
+    <name>Honduras</name>
+  </country>
+  <country id="IS">
+    <name>Iceland</name>
+  </country>
+  <country id="IN">
+    <name>India</name>
+  </country>
+  <country id="ID">
+    <name>Indonesia</name>
+  </country>
+  <country id="IR">
+    <name>Iran</name>
+  </country>
+  <country id="IQ">
+    <name>Iraq</name>
+  </country>
+  <country id="IM">
+    <name>Man Island</name>
+  </country>
+  <country id="JM">
+    <name>Jamaica</name>
+  </country>
+  <country id="JE">
+    <name>Jersey</name>
+  </country>
+  <country id="JO">
+    <name>Jordan</name>
+  </country>
+  <country id="KZ">
+    <name>Kazakhstan</name>
+  </country>
+  <country id="KE">
+    <name>Kenya</name>
+  </country>
+  <country id="KI">
+    <name>Kiribati</name>
+  </country>
+  <country id="KP">
+    <name>Korea, Dem. Republic of</name>
+  </country>
+  <country id="KW">
+    <name>Kuwait</name>
+  </country>
+  <country id="KG">
+    <name>Kyrgyzstan</name>
+  </country>
+  <country id="LA">
+    <name>Laos</name>
+  </country>
+  <country id="LV">
+    <name>Latvia</name>
+  </country>
+  <country id="LB">
+    <name>Lebanon</name>
+  </country>
+  <country id="LS">
+    <name>Lesotho</name>
+  </country>
+  <country id="LR">
+    <name>Liberia</name>
+  </country>
+  <country id="LY">
+    <name>Libya</name>
+  </country>
+  <country id="LI">
+    <name>Liechtenstein</name>
+  </country>
+  <country id="LT">
+    <name>Lithuania</name>
+  </country>
+  <country id="MO">
+    <name>Macau</name>
+  </country>
+  <country id="MK">
+    <name>Macedonia</name>
+  </country>
+  <country id="MG">
+    <name>Madagascar</name>
+  </country>
+  <country id="MW">
+    <name>Malawi</name>
+  </country>
+  <country id="MY">
+    <name>Malaysia</name>
+  </country>
+  <country id="MV">
+    <name>Maldives</name>
+  </country>
+  <country id="ML">
+    <name>Mali</name>
+  </country>
+  <country id="MT">
+    <name>Malta</name>
+  </country>
+  <country id="MH">
+    <name>Marshall Islands</name>
+  </country>
+  <country id="MQ">
+    <name>Martinique</name>
+  </country>
+  <country id="MR">
+    <name>Mauritania</name>
+  </country>
+  <country id="HU">
+    <name>Hungary</name>
+  </country>
+  <country id="YT">
+    <name>Mayotte</name>
+  </country>
+  <country id="MX">
+    <name>Mexico</name>
+  </country>
+  <country id="FM">
+    <name>Micronesia</name>
+  </country>
+  <country id="MD">
+    <name>Moldova</name>
+  </country>
+  <country id="MC">
+    <name>Monaco</name>
+  </country>
+  <country id="MN">
+    <name>Mongolia</name>
+  </country>
+  <country id="ME">
+    <name>Montenegro</name>
+  </country>
+  <country id="MS">
+    <name>Montserrat</name>
+  </country>
+  <country id="MA">
+    <name>Morocco</name>
+  </country>
+  <country id="MZ">
+    <name>Mozambique</name>
+  </country>
+  <country id="NA">
+    <name>Namibia</name>
+  </country>
+  <country id="NR">
+    <name>Nauru</name>
+  </country>
+  <country id="NP">
+    <name>Nepal</name>
+  </country>
+  <country id="AN">
+    <name>Netherlands Antilles</name>
+  </country>
+  <country id="NC">
+    <name>New Caledonia</name>
+  </country>
+  <country id="NI">
+    <name>Nicaragua</name>
+  </country>
+  <country id="NE">
+    <name>Niger</name>
+  </country>
+  <country id="NU">
+    <name>Niue</name>
+  </country>
+  <country id="NF">
+    <name>Norfolk Island</name>
+  </country>
+  <country id="MP">
+    <name>Northern Mariana Islands</name>
+  </country>
+  <country id="OM">
+    <name>Oman</name>
+  </country>
+  <country id="PK">
+    <name>Pakistan</name>
+  </country>
+  <country id="PW">
+    <name>Palau</name>
+  </country>
+  <country id="PS">
+    <name>Palestinian Territories</name>
+  </country>
+  <country id="PA">
+    <name>Panama</name>
+  </country>
+  <country id="PG">
+    <name>Papua New Guinea</name>
+  </country>
+  <country id="PY">
+    <name>Paraguay</name>
+  </country>
+  <country id="PE">
+    <name>Peru</name>
+  </country>
+  <country id="PH">
+    <name>Philippines</name>
+  </country>
+  <country id="PN">
+    <name>Pitcairn</name>
+  </country>
+  <country id="PR">
+    <name>Puerto Rico</name>
+  </country>
+  <country id="QA">
+    <name>Qatar</name>
+  </country>
+  <country id="RE">
+    <name>Reunion Island</name>
+  </country>
+  <country id="RU">
+    <name>Russian Federation</name>
+  </country>
+  <country id="RW">
+    <name>Rwanda</name>
+  </country>
+  <country id="BL">
+    <name>Saint Barthelemy</name>
+  </country>
+  <country id="KN">
+    <name>Saint Kitts and Nevis</name>
+  </country>
+  <country id="LC">
+    <name>Saint Lucia</name>
+  </country>
+  <country id="MF">
+    <name>Saint Martin</name>
+  </country>
+  <country id="PM">
+    <name>Saint Pierre and Miquelon</name>
+  </country>
+  <country id="VC">
+    <name>Saint Vincent and the Grenadines</name>
+  </country>
+  <country id="WS">
+    <name>Samoa</name>
+  </country>
+  <country id="SM">
+    <name>San Marino</name>
+  </country>
+  <country id="ST">
+    <name>S&#xE3;o Tom&#xE9; and Pr&#xED;ncipe</name>
+  </country>
+  <country id="SA">
+    <name>Saudi Arabia</name>
+  </country>
+  <country id="SN">
+    <name>Senegal</name>
+  </country>
+  <country id="RS">
+    <name>Serbia</name>
+  </country>
+  <country id="SC">
+    <name>Seychelles</name>
+  </country>
+  <country id="SL">
+    <name>Sierra Leone</name>
+  </country>
+  <country id="SI">
+    <name>Slovenia</name>
+  </country>
+  <country id="SB">
+    <name>Solomon Islands</name>
+  </country>
+  <country id="SO">
+    <name>Somalia</name>
+  </country>
+  <country id="GS">
+    <name>South Georgia and the South Sandwich Islands</name>
+  </country>
+  <country id="LK">
+    <name>Sri Lanka</name>
+  </country>
+  <country id="SD">
+    <name>Sudan</name>
+  </country>
+  <country id="SR">
+    <name>Suriname</name>
+  </country>
+  <country id="SJ">
+    <name>Svalbard and Jan Mayen</name>
+  </country>
+  <country id="SZ">
+    <name>Swaziland</name>
+  </country>
+  <country id="SY">
+    <name>Syria</name>
+  </country>
+  <country id="TW">
+    <name>Taiwan 臺灣</name>
+  </country>
+  <country id="TJ">
+    <name>Tajikistan</name>
+  </country>
+  <country id="TZ">
+    <name>Tanzania</name>
+  </country>
+  <country id="TH">
+    <name>Thailand</name>
+  </country>
+  <country id="TK">
+    <name>Tokelau</name>
+  </country>
+  <country id="TO">
+    <name>Tonga</name>
+  </country>
+  <country id="TT">
+    <name>Trinidad and Tobago</name>
+  </country>
+  <country id="TN">
+    <name>Tunisia</name>
+  </country>
+  <country id="TR">
+    <name>Turkey</name>
+  </country>
+  <country id="TM">
+    <name>Turkmenistan</name>
+  </country>
+  <country id="TC">
+    <name>Turks and Caicos Islands</name>
+  </country>
+  <country id="TV">
+    <name>Tuvalu</name>
+  </country>
+  <country id="UG">
+    <name>Uganda</name>
+  </country>
+  <country id="UA">
+    <name>Ukraine</name>
+  </country>
+  <country id="AE">
+    <name>United Arab Emirates</name>
+  </country>
+  <country id="UY">
+    <name>Uruguay</name>
+  </country>
+  <country id="UZ">
+    <name>Uzbekistan</name>
+  </country>
+  <country id="VU">
+    <name>Vanuatu</name>
+  </country>
+  <country id="VE">
+    <name>Venezuela</name>
+  </country>
+  <country id="VN">
+    <name>Vietnam</name>
+  </country>
+  <country id="VG">
+    <name>Virgin Islands (British)</name>
+  </country>
+  <country id="VI">
+    <name>Virgin Islands (U.S.)</name>
+  </country>
+  <country id="WF">
+    <name>Wallis and Futuna</name>
+  </country>
+  <country id="EH">
+    <name>Western Sahara</name>
+  </country>
+  <country id="YE">
+    <name>Yemen</name>
+  </country>
+  <country id="ZM">
+    <name>Zambia</name>
+  </country>
+  <country id="ZW">
+    <name>Zimbabwe</name>
+  </country>
+  <country id="AL">
+    <name>Albania</name>
+  </country>
+  <country id="AF">
+    <name>Afghanistan</name>
+  </country>
+  <country id="AQ">
+    <name>Antarctica</name>
+  </country>
+  <country id="BA">
+    <name>Bosnia and Herzegovina</name>
+  </country>
+  <country id="BV">
+    <name>Bouvet Island</name>
+  </country>
+  <country id="IO">
+    <name>British Indian Ocean Territory</name>
+  </country>
+  <country id="BG">
+    <name>Bulgaria</name>
+  </country>
+  <country id="KY">
+    <name>Cayman Islands</name>
+  </country>
+  <country id="CX">
+    <name>Christmas Island</name>
+  </country>
+  <country id="CC">
+    <name>Cocos (Keeling) Islands</name>
+  </country>
+  <country id="CK">
+    <name>Cook Islands</name>
+  </country>
+  <country id="GF">
+    <name>French Guiana</name>
+  </country>
+  <country id="PF">
+    <name>French Polynesia</name>
+  </country>
+  <country id="TF">
+    <name>French Southern Territories</name>
+  </country>
+  <country id="AX">
+    <name>&#xC5;land Islands</name>
+  </country>
+</entity_country>
diff --git a/install-dev/langs/tw/data/gender.xml b/install-dev/langs/tw/data/gender.xml
new file mode 100644
index 000000000..0f04043c0
--- /dev/null
+++ b/install-dev/langs/tw/data/gender.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<entity_gender>
+  <gender id="1" name="先生"/>
+  <gender id="2" name="女士"/>
+</entity_gender>
diff --git a/install-dev/langs/tw/data/group.xml b/install-dev/langs/tw/data/group.xml
new file mode 100644
index 000000000..b3a4d4f57
--- /dev/null
+++ b/install-dev/langs/tw/data/group.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<entity_group>
+  <group id="Visitor" name="訪客"/>
+  <group id="Guest" name="匿名客戶"/>
+  <group id="Customer" name="正式客戶"/>
+</entity_group>
diff --git a/install-dev/langs/tw/data/index.php b/install-dev/langs/tw/data/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/tw/data/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/tw/data/meta.xml b/install-dev/langs/tw/data/meta.xml
new file mode 100644
index 000000000..0b086d7ba
--- /dev/null
+++ b/install-dev/langs/tw/data/meta.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<entity_meta>
+  <meta id="404" id_shop="1">
+    <title>404 error</title>
+    <description>找不到網頁</description>
+    <keywords>error, 404, not found</keywords>
+    <url_rewrite>page-not-found</url_rewrite>
+  </meta>
+  <meta id="best-sales" id_shop="1">
+    <title>熱賣產品</title>
+    <description>我們的熱賣產品</description>
+    <keywords>best sales</keywords>
+    <url_rewrite>best-sales</url_rewrite>
+  </meta>
+  <meta id="contact" id_shop="1">
+    <title>聯絡我們</title>
+    <description>使用這個表單與我們聯繫</description>
+    <keywords>contact, form, e-mail</keywords>
+    <url_rewrite>contact-us</url_rewrite>
+  </meta>
+  <meta id="index" id_shop="1">
+    <title/>
+    <description>網站以 PrestaShop 建置</description>
+    <keywords>shop, prestashop</keywords>
+    <url_rewrite/>
+  </meta>
+  <meta id="manufacturer" id_shop="1">
+    <title>製造商</title>
+    <description>製造商列表</description>
+    <keywords>manufacturer</keywords>
+    <url_rewrite>manufacturers</url_rewrite>
+  </meta>
+  <meta id="new-products" id_shop="1">
+    <title>新產品</title>
+    <description>我們的新產品</description>
+    <keywords>new, products</keywords>
+    <url_rewrite>new-products</url_rewrite>
+  </meta>
+  <meta id="password" id_shop="1">
+    <title>忘記密碼</title>
+    <description>輸入您過去用來註冊的信箱，系統會為您產生新密碼後寄送到您的信箱</description>
+    <keywords>forgot, password, e-mail, new, reset</keywords>
+    <url_rewrite>password-recovery</url_rewrite>
+  </meta>
+  <meta id="prices-drop" id_shop="1">
+    <title>降價</title>
+    <description>我們的特價產品</description>
+    <keywords>special, prices drop</keywords>
+    <url_rewrite>prices-drop</url_rewrite>
+  </meta>
+  <meta id="sitemap" id_shop="1">
+    <title>網站地圖</title>
+    <description>找不到網頁？可以參考這兒</description>
+    <keywords>sitemap</keywords>
+    <url_rewrite>sitemap</url_rewrite>
+  </meta>
+  <meta id="supplier" id_shop="1">
+    <title>供應商</title>
+    <description>供應商列表</description>
+    <keywords>supplier</keywords>
+    <url_rewrite>supplier</url_rewrite>
+  </meta>
+  <meta id="address" id_shop="1">
+    <title>地址</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>address</url_rewrite>
+  </meta>
+  <meta id="addresses" id_shop="1">
+    <title>地址</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>addresses</url_rewrite>
+  </meta>
+  <meta id="authentication" id_shop="1">
+    <title>認證</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>authentication</url_rewrite>
+  </meta>
+  <meta id="cart" id_shop="1">
+    <title>購物車</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>cart</url_rewrite>
+  </meta>
+  <meta id="discount" id_shop="1">
+    <title>折扣</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>discount</url_rewrite>
+  </meta>
+  <meta id="history" id_shop="1">
+    <title>訂購記錄</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order-history</url_rewrite>
+  </meta>
+  <meta id="identity" id_shop="1">
+    <title>識別</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>identity</url_rewrite>
+  </meta>
+  <meta id="my-account" id_shop="1">
+    <title>我的帳號</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>my-account</url_rewrite>
+  </meta>
+  <meta id="order-follow" id_shop="1">
+    <title>訂單追蹤</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order-follow</url_rewrite>
+  </meta>
+  <meta id="order-slip" id_shop="1">
+    <title>訂購單</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order-slip</url_rewrite>
+  </meta>
+  <meta id="order" id_shop="1">
+    <title>訂單</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order</url_rewrite>
+  </meta>
+  <meta id="search" id_shop="1">
+    <title>搜尋</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>search</url_rewrite>
+  </meta>
+  <meta id="stores" id_shop="1">
+    <title>商店</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>stores</url_rewrite>
+  </meta>
+  <meta id="order-opc" id_shop="1">
+    <title>訂單</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>quick-order</url_rewrite>
+  </meta>
+  <meta id="guest-tracking" id_shop="1">
+    <title>匿名追蹤</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>guest-tracking</url_rewrite>
+  </meta>
+  <meta id="order-confirmation" id_shop="1">
+    <title>訂單確認</title>
+    <description/>
+    <keywords/>
+    <url_rewrite>order-confirmation</url_rewrite>
+  </meta>
+</entity_meta>
diff --git a/install-dev/langs/tw/data/order_return_state.xml b/install-dev/langs/tw/data/order_return_state.xml
new file mode 100644
index 000000000..d1ebbcb22
--- /dev/null
+++ b/install-dev/langs/tw/data/order_return_state.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<entity_order_return_state>
+  <order_return_state id="Waiting_for_confirmation">
+    <name>等待確認</name>
+  </order_return_state>
+  <order_return_state id="Waiting_for_package">
+    <name>等待包裝</name>
+  </order_return_state>
+  <order_return_state id="Package_received">
+    <name>包裹簽收</name>
+  </order_return_state>
+  <order_return_state id="Return_denied">
+    <name>拒絕退貨</name>
+  </order_return_state>
+  <order_return_state id="Return_completed">
+    <name>退貨完成</name>
+  </order_return_state>
+</entity_order_return_state>
diff --git a/install-dev/langs/tw/data/order_state.xml b/install-dev/langs/tw/data/order_state.xml
new file mode 100644
index 000000000..4ba7394d5
--- /dev/null
+++ b/install-dev/langs/tw/data/order_state.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<entity_order_state>
+  <order_state id="Awaiting_cheque_payment">
+    <name>等待支票付款</name>
+    <template>cheque</template>
+  </order_state>
+  <order_state id="Payment_accepted">
+    <name>付款完成</name>
+    <template>payment</template>
+  </order_state>
+  <order_state id="Preparation_in_progress">
+    <name>備貨中</name>
+    <template>preparation</template>
+  </order_state>
+  <order_state id="Shipped">
+    <name>已配送</name>
+    <template>shipped</template>
+  </order_state>
+  <order_state id="Delivered">
+    <name>已簽收</name>
+    <template/>
+  </order_state>
+  <order_state id="Canceled">
+    <name>已取消</name>
+    <template>order_canceled</template>
+  </order_state>
+  <order_state id="Refund">
+    <name>退款</name>
+    <template>refund</template>
+  </order_state>
+  <order_state id="Payment_error">
+    <name>付款錯誤</name>
+    <template>payment_error</template>
+  </order_state>
+  <order_state id="On_backorder">
+    <name>預約訂購</name>
+    <template>outofstock</template>
+  </order_state>
+  <order_state id="Awaiting_bank_wire_payment">
+    <name>等待銀行匯款</name>
+    <template>bankwire</template>
+  </order_state>
+  <order_state id="Awaiting_PayPal_payment">
+    <name>等待 PayPal 付款</name>
+    <template/>
+  </order_state>
+  <order_state id="Payment_remotely_accepted">
+    <name>遠端付款完成</name>
+    <template>payment</template>
+  </order_state>
+</entity_order_state>
diff --git a/install-dev/langs/tw/data/profile.xml b/install-dev/langs/tw/data/profile.xml
new file mode 100644
index 000000000..59c9a8ede
--- /dev/null
+++ b/install-dev/langs/tw/data/profile.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<entity_profile>
+  <profile id="SuperAdmin">
+    <name>超級管理者</name>
+  </profile>
+</entity_profile>
diff --git a/install-dev/langs/tw/data/quick_access.xml b/install-dev/langs/tw/data/quick_access.xml
new file mode 100644
index 000000000..fb571bda8
--- /dev/null
+++ b/install-dev/langs/tw/data/quick_access.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<entity_quick_access>
+  <quick_access id="Home" name="首頁"/>
+  <quick_access id="My_Shop" name="我的商店"/>
+  <quick_access id="New_category" name="新分類"/>
+  <quick_access id="New_product" name="新產品"/>
+  <quick_access id="New_voucher" name="新優惠券"/>
+</entity_quick_access>
diff --git a/install-dev/langs/tw/data/risk.xml b/install-dev/langs/tw/data/risk.xml
new file mode 100644
index 000000000..de418b249
--- /dev/null
+++ b/install-dev/langs/tw/data/risk.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<entity_risk>
+  <risk id="None" name="無"/>
+  <risk id="Low" name="低"/>
+  <risk id="Medium" name="中"/>
+  <risk id="High" name="高"/>
+</entity_risk>
diff --git a/install-dev/langs/tw/data/stock_mvt_reason.xml b/install-dev/langs/tw/data/stock_mvt_reason.xml
new file mode 100644
index 000000000..824ab79f4
--- /dev/null
+++ b/install-dev/langs/tw/data/stock_mvt_reason.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<entity_stock_mvt_reason>
+  <stock_mvt_reason id="Increase">
+    <name>增加</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id="Decrease">
+    <name>減少</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id="Customer_Order">
+    <name>客戶訂購</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id="Regulation_following_an_inventory_of_stock">
+    <name>庫存調整1</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id="Regulation_following_an_inventory_of_stock_1">
+    <name>庫存調整2</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id="Transfer_to_another_warehouse">
+    <name>調貨給另一個倉庫</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id="Transfer_from_another_warehouse">
+    <name>從另一個倉庫調貨</name>
+  </stock_mvt_reason>
+  <stock_mvt_reason id="Supply_Order">
+    <name>採購單</name>
+  </stock_mvt_reason>
+</entity_stock_mvt_reason>
diff --git a/install-dev/langs/tw/data/supplier_order_state.xml b/install-dev/langs/tw/data/supplier_order_state.xml
new file mode 100644
index 000000000..c36627715
--- /dev/null
+++ b/install-dev/langs/tw/data/supplier_order_state.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity_supplier_order_state>
+	<supplier_order_state id="creation_in_progress">
+		<name><![CDATA[建立中]]></name>
+	</supplier_order_state>
+	<supplier_order_state id="Order_validated">
+		<name><![CDATA[訂購確認]]></name>
+	</supplier_order_state>
+	<supplier_order_state id="Pending_receipt">
+		<name><![CDATA[等待配送]]></name>
+	</supplier_order_state>
+	<supplier_order_state id="Order_received_in_part">
+		<name><![CDATA[部份驗收]]></name>
+	</supplier_order_state>
+	<supplier_order_state id="Order_received_completely">
+		<name><![CDATA[完整驗收]]></name>
+	</supplier_order_state>
+	<supplier_order_state id="order_fenced">
+		<name><![CDATA[放棄訂購]]></name>
+	</supplier_order_state>
+</entity_supplier_order_state>
diff --git a/install-dev/langs/tw/data/supply_order_state.xml b/install-dev/langs/tw/data/supply_order_state.xml
new file mode 100644
index 000000000..24a1656a4
--- /dev/null
+++ b/install-dev/langs/tw/data/supply_order_state.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<entity_supply_order_state>
+  <supply_order_state id="supply_order_state_1">
+    <name>1 - 建立中</name>
+  </supply_order_state>
+  <supply_order_state id="supply_order_state_2">
+    <name>2 - 訂購確認</name>
+  </supply_order_state>
+  <supply_order_state id="supply_order_state_3">
+    <name>3 - 等待配送</name>
+  </supply_order_state>
+  <supply_order_state id="supply_order_state_4">
+    <name>4 - 部份驗收</name>
+  </supply_order_state>
+  <supply_order_state id="supply_order_state_5">
+    <name>5 - 完整驗收</name>
+  </supply_order_state>
+  <supply_order_state id="supply_order_state_6">
+    <name>6 - 取消訂購</name>
+  </supply_order_state>
+</entity_supply_order_state>
diff --git a/install-dev/langs/tw/data/tab.xml b/install-dev/langs/tw/data/tab.xml
new file mode 100644
index 000000000..cca15fbae
--- /dev/null
+++ b/install-dev/langs/tw/data/tab.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<entity_tab>
+  <tab id="Home" name="首頁"/>
+  <tab id="CMS_Pages" name="靜態網頁"/>
+  <tab id="CMS_Categories" name="網頁分類"/>
+  <tab id="Combinations_Generator" name="組合產生器"/>
+  <tab id="Search" name="搜尋"/>
+  <tab id="Login" name="登入"/>
+  <tab id="Shops" name="商店"/>
+  <tab id="Shop_URLs" name="商店網址"/>
+  <tab id="Catalog" name="產品目錄"/>
+  <tab id="Orders" name="訂單"/>
+  <tab id="Customers" name="客戶"/>
+  <tab id="Price_Rules" name="價格規則"/>
+  <tab id="Shipping" name="配送"/>
+  <tab id="Localization" name="在地化"/>
+  <tab id="Modules" name="模組"/>
+  <tab id="Preferences" name="設定"/>
+  <tab id="Advanced_Parameters" name="進階設定"/>
+  <tab id="Administration" name="管理"/>
+  <tab id="Stats" name="狀態"/>
+  <tab id="Stock" name="庫存"/>
+  <tab id="Products" name="產品"/>
+  <tab id="Categories" name="分類"/>
+  <tab id="Monitoring" name="追蹤"/>
+  <tab id="Attributes_and_Values" name="屬性與數值"/>
+  <tab id="Features" name="功能"/>
+  <tab id="Manufacturers" name="製造商"/>
+  <tab id="Suppliers" name="供應商"/>
+  <tab id="Image_Mapping" name="引導圖片"/>
+  <tab id="Tags" name="標籤"/>
+  <tab id="Attachments" name="附加檔案"/>
+  <tab id="Orders_1" name="訂單"/>
+  <tab id="Invoices" name="發票"/>
+  <tab id="Merchandise_Returns" name="退貨"/>
+  <tab id="Delivery_Slips" name="出貨單"/>
+  <tab id="Credit_Slips" name="折讓單"/>
+  <tab id="Statuses" name="狀態"/>
+  <tab id="Order_Messages" name="訂單訊息"/>
+  <tab id="Customers_1" name="客戶"/>
+  <tab id="Addresses" name="地址"/>
+  <tab id="Groups" name="群組"/>
+  <tab id="Shopping_Carts" name="購物車"/>
+  <tab id="Customer_Service" name="客戶服務"/>
+  <tab id="Contacts" name="聯絡人"/>
+  <tab id="Titles" name="稱謂"/>
+  <tab id="Outstanding" name="特色"/>
+  <tab id="Cart_Rules" name="購物車規則"/>
+  <tab id="Catalog_Price_Rules" name="產品目錄價格規則"/>
+  <tab id="Marketing" name="行銷"/>
+  <tab id="Shipping_1" name="配送"/>
+  <tab id="Carriers" name="貨運商"/>
+  <tab id="Price_Ranges" name="價格範圍"/>
+  <tab id="Weight_Ranges" name="重量範圍"/>
+  <tab id="Localization_1" name="在地化"/>
+  <tab id="Languages" name="語言"/>
+  <tab id="Zones" name="區域"/>
+  <tab id="Countries" name="國家"/>
+  <tab id="States" name="縣市"/>
+  <tab id="Currencies" name="貨幣"/>
+  <tab id="Taxes" name="稅務"/>
+  <tab id="Tax_Rules" name="稅務規則"/>
+  <tab id="Translations" name="翻譯"/>
+  <tab id="Modules_1" name="模組"/>
+  <tab id="Modules_Themes_Catalog" name="目錄模組與佈景"/>
+  <tab id="Positions" name="位置"/>
+  <tab id="Payment" name="付款"/>
+  <tab id="General" name="一般"/>
+  <tab id="Orders_2" name="訂單"/>
+  <tab id="Products_1" name="產品"/>
+  <tab id="Customers_2" name="客戶"/>
+  <tab id="Themes" name="佈景"/>
+  <tab id="SEO_URLs" name="SEO 網址"/>
+  <tab id="CMS" name="網頁"/>
+  <tab id="Images" name="圖片"/>
+  <tab id="Store_Contacts" name="商店聯絡人"/>
+  <tab id="Search_1" name="搜尋"/>
+  <tab id="Maintenance" name="維護"/>
+  <tab id="Geolocation" name="地理定位"/>
+  <tab id="Configuration_Information" name="設定資訊"/>
+  <tab id="Performance" name="效能"/>
+  <tab id="E-mail" name="電子郵件"/>
+  <tab id="Multistore" name="多商店"/>
+  <tab id="CSV_Import" name="CSV 匯入"/>
+  <tab id="DB_Backup" name="資料庫備份"/>
+  <tab id="SQL_Manager" name="SQL 管理器"/>
+  <tab id="Logs" name="記錄"/>
+  <tab id="Webservice" name="網頁服務"/>
+  <tab id="Preferences_1" name="偏好設定"/>
+  <tab id="Quick_Access" name="快速存取"/>
+  <tab id="Employees" name="員工"/>
+  <tab id="Profiles" name="角色"/>
+  <tab id="Permissions" name="權限"/>
+  <tab id="Menus" name="選單"/>
+  <tab id="Stats_1" name="狀態"/>
+  <tab id="Search_Engines" name="搜尋引擎"/>
+  <tab id="Referrers" name="來源"/>
+  <tab id="Warehouses" name="倉庫"/>
+  <tab id="Stock_Management" name="庫存管理"/>
+  <tab id="Stock_Movement" name="調貨"/>
+  <tab id="Instant_Stock_Status" name="目前庫存狀態"/>
+  <tab id="Stock_Coverage" name="庫存範圍"/>
+  <tab id="Supply_orders" name="採購單"/>
+  <tab id="Configuration" name="設定"/>
+</entity_tab>
diff --git a/install-dev/langs/tw/flag.jpg b/install-dev/langs/tw/flag.jpg
new file mode 100644
index 000000000..d706a774e
Binary files /dev/null and b/install-dev/langs/tw/flag.jpg differ
diff --git a/install-dev/langs/tw/img/index.php b/install-dev/langs/tw/img/index.php
new file mode 100644
index 000000000..10edbfe91
--- /dev/null
+++ b/install-dev/langs/tw/img/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/tw/img/tw-default-category.jpg b/install-dev/langs/tw/img/tw-default-category.jpg
new file mode 100644
index 000000000..c28c90de1
Binary files /dev/null and b/install-dev/langs/tw/img/tw-default-category.jpg differ
diff --git a/install-dev/langs/tw/img/tw-default-home.jpg b/install-dev/langs/tw/img/tw-default-home.jpg
new file mode 100644
index 000000000..ae6658431
Binary files /dev/null and b/install-dev/langs/tw/img/tw-default-home.jpg differ
diff --git a/install-dev/langs/tw/img/tw-default-large.jpg b/install-dev/langs/tw/img/tw-default-large.jpg
new file mode 100644
index 000000000..83f20252e
Binary files /dev/null and b/install-dev/langs/tw/img/tw-default-large.jpg differ
diff --git a/install-dev/langs/tw/img/tw-default-large_scene.jpg b/install-dev/langs/tw/img/tw-default-large_scene.jpg
new file mode 100644
index 000000000..0c8b30dbe
Binary files /dev/null and b/install-dev/langs/tw/img/tw-default-large_scene.jpg differ
diff --git a/install-dev/langs/tw/img/tw-default-medium.jpg b/install-dev/langs/tw/img/tw-default-medium.jpg
new file mode 100644
index 000000000..13546aa40
Binary files /dev/null and b/install-dev/langs/tw/img/tw-default-medium.jpg differ
diff --git a/install-dev/langs/tw/img/tw-default-small.jpg b/install-dev/langs/tw/img/tw-default-small.jpg
new file mode 100644
index 000000000..8cb9417b6
Binary files /dev/null and b/install-dev/langs/tw/img/tw-default-small.jpg differ
diff --git a/install-dev/langs/tw/img/tw-default-thickbox.jpg b/install-dev/langs/tw/img/tw-default-thickbox.jpg
new file mode 100644
index 000000000..6bd5603f7
Binary files /dev/null and b/install-dev/langs/tw/img/tw-default-thickbox.jpg differ
diff --git a/install-dev/langs/tw/img/tw-default-thumb_scene.jpg b/install-dev/langs/tw/img/tw-default-thumb_scene.jpg
new file mode 100644
index 000000000..47d2def48
Binary files /dev/null and b/install-dev/langs/tw/img/tw-default-thumb_scene.jpg differ
diff --git a/install-dev/langs/tw/img/tw.jpg b/install-dev/langs/tw/img/tw.jpg
new file mode 100644
index 000000000..7d07b871d
Binary files /dev/null and b/install-dev/langs/tw/img/tw.jpg differ
diff --git a/install-dev/langs/tw/index.php b/install-dev/langs/tw/index.php
new file mode 100644
index 000000000..5e4749107
--- /dev/null
+++ b/install-dev/langs/tw/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../');
+exit;
\ No newline at end of file
diff --git a/install-dev/langs/tw/install.php b/install-dev/langs/tw/install.php
new file mode 100644
index 000000000..e93160980
--- /dev/null
+++ b/install-dev/langs/tw/install.php
@@ -0,0 +1,258 @@
+<?php
+return array(
+	'informations' => array(
+		'phone' => '+1 (888) 947-6543',
+		'documentation' => 'http://doc.prestashop.com/',
+		'documentation_upgrade' => 'http://docs.prestashop.com/display/PS15/Updating+PrestaShop',
+		'forum' => 'http://www.prestashop.com/forums/',
+		'blog' => 'http://www.prestashop.com/blog/',
+		'support' => 'https://www.prestashop.com/en/support',
+	),
+	'translations' => array(
+		'menu_welcome' => '選擇語言',
+		'menu_license' => '授權聲明',
+		'menu_system' => '系統相容性',
+		'menu_database' => '系統設定',
+		'menu_configure' => '商店資訊',
+		'menu_process' => '商店安裝',
+		'Choose the installer language:' => '選擇安裝語言：',
+		'Field required' => '必填欄位',
+		'Invalid shop name' => '商店名稱有誤',
+		'Your firstname contains some invalid characters' => '您的姓名包含錯誤字元',
+		'Your lastname contains some invalid characters' => '您的姓氏包含錯誤字元',
+		'The password is incorrect (alphanumeric string with at least 8 characters)' => '密碼有誤（只接受英文字母與數字，且至少 8 個字）',
+		'Password and its confirmation are different' => '密碼與確認不同',
+		'This e-mail address is invalid' => '電子信箱有誤',
+		'The uploaded file exceeds the upload_max_filesize directive in php.ini' => '上傳的檔案大小超過 php.ini upload_max_filesize 所設定的數值',
+		'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form' => '上傳的檔案大小超過表單 MAX_FILE_SIZE 所設定的數值',
+		'The uploaded file was only partially uploaded' => '上傳的檔案不完整',
+		'No file was uploaded' => '沒有任何檔案上傳',
+		'Missing a temporary folder' => '缺少一個暫存資料夾',
+		'Failed to write file to disk' => '寫入檔案時發生錯誤',
+		'File upload stopped by extension' => '檔案上傳被外掛中斷',
+		'No error code available' => '沒有可用的錯誤代碼',
+		'This is not a valid image file' => '這不是正確的圖片檔案',
+		'Image type is not supported' => '不支援這種格式的圖片',
+		'Image folder %s is not writable' => '圖片資料夾 %s 無法寫入',
+		'Cannot upload the file' => '無法上傳檔案',
+		'Database is connected' => '資料庫已經連結',
+		'A test e-mail has been sent to %s' => '測試信已經發送到 %s',
+		'An error occurred while sending email, please verify your parameters' => '發送信件時出現錯誤，請檢查您的參數',
+		'Create settings.inc file' => '建立 settings.inc 檔案',
+		'Create database tables' => '建立資料表',
+		'Populate database tables' => '佈署資料表',
+		'Configure shop information' => '設定商店資訊',
+		'Install modules' => '安裝模組',
+		'Install demonstration data' => '安裝展示資料',
+		'Install theme' => '安裝佈景',
+		'PHP parameters:' => 'PHP參數：',
+		'Is PHP 5.1.2 or later installed ?' => '是否安裝 PHP 5.1.2 或更新版本？',
+		'Can upload files ?' => '是否能夠上傳檔案？',
+		'Can create new files and folders ?' => '是否能夠建立檔案與資料夾？',
+		'Is GD Library installed ?' => '是否安裝 GD 函式庫？',
+		'Is MySQL support is on ?' => '是否支援 MySQL ？',
+		'Recursive write permissions on files and folders:' => '檔案與資料夾的遞迴寫入權限：',
+		'Can open external URLs ?' => '是否能夠開啟外部網址？',
+		'Is PHP register global option off (recommended) ?' => '是否停用 PHP register global 選項？',
+		'Is GZIP compression activated (recommended) ?' => '是否支援 GZIP 壓縮（建議）？',
+		'Is Mcrypt extension available (recommended) ?' => '是否安裝 Mcrypt 外掛（建議）？',
+		'Is PHP magic quotes option deactivated (recommended) ?' => '是否停用 PHP magic quotes 選項（建議）？',
+		'Is Dom extension loaded ?' => '是否載入 Dom 外掛？',
+		'Is PDO MySQL extension loaded ?' => '是否載入 PDO MySQL 外掛？',
+		'Shop settings and merchant account information' => '商店設定與帳號資訊',
+		'Shop name:' => '商店名稱：',
+		'Main activity:' => '主要活動：',
+		'Please choose your main activity' => '請選擇主要活動',
+		'Other activity...' => '其他活動...',
+		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.',
+		'Install demo products:' => '安裝展示用產品：',
+		'Yes' => '是',
+		'No' => '否',
+		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => '展示用產品適合用來學習使用 PrestaShop ，如果還不熟悉系統就建議安裝',
+		'Default country:' => '預設國家：',
+		'Select your country' => '選擇您的國家',
+		'Shop timezone:' => '商店時區：',
+		'Select your timezone' => '選擇您的時區',
+		'Shop logo:' => '商店圖示：',
+		'Recommended dimensions:' => '建議的大小：',
+		'First name:' => '姓名：',
+		'Last name:' => '姓氏：',
+		'E-mail address:' => '電子信箱：',
+		'Shop password:' => '商店密碼：',
+		'Re-type to confirm:' => '再次輸入確認：',
+		'Receive this information by e-mail' => '透過電子郵件收取這個資訊',
+		'Warning: You will receive this information only if your e-mail configuration is correct.' => '警告：只有在郵件設定正確時您才能夠收到這個資訊',
+		'Configure your database by filling out the following fields:' => '填寫下面欄位來設定資料庫：',
+		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => 'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.',
+		'Database server address:' => '伺服器位址：',
+		'If you want to use a different port, add :XX after your server address where XX is your port number.' => '如果您想要用其他的連接埠，可以在位址後面加入 :XX ， XX 就代表您使用的連接埠',
+		'Database name:' => '資料庫名稱：',
+		'Database login:' => '帳號：',
+		'Database password:' => '密碼：',
+		'Database Engine:' => '引擎：',
+		'Tables prefix:' => '資料表前綴：',
+		'Drop existing tables (mode dev):' => '移除現有資料表（開發用）：',
+		'Verify now!' => '現在檢查！',
+		'E-mail delivery set-up' => '電子郵件寄發設定',
+		'Configure SMTP manually (advanced users only)' => '手動設定 SMTP （只適合進階使用者）',
+		'By default, the PHP mail() function is used' => '預設會使用 PHP mail() 方式',
+		'SMTP server address:' => 'SMTP 伺服器位址：',
+		'Encryption:' => '加密方式：',
+		'None' => '無',
+		'Port:' => '連接埠：',
+		'Login:' => '帳號：',
+		'Password:' => '密碼：',
+		'enter@your.email' => 'enter@your.email ',
+		'Send me a test email!' => '發送測試信件！',
+		'Next' => '下一步',
+		'Back' => '上一步',
+		'Official forum' => '討論區',
+		'Support' => '支援',
+		'Documentation' => '文件',
+		'Contact us' => '與我們聯繫',
+		'Forum' => '討論區',
+		'Blog' => 'Blog',
+		'Done!' => '完成！',
+		'An error occured during installation...' => '安裝時發生錯誤',
+		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => '您可以使用左邊的連結來回到上一步，或是 <a href="%s">點選這裡</a> 重新開始安裝程序',
+		'Your installation is finished!' => '您的安裝已經完成！',
+		'You have just finished installing your shop. Thank you for using PrestaShop!' => '您已經安裝完成，歡迎使用 PrestaShop ！',
+		'Please remember your login information:' => '請記住您的帳號資訊：',
+		'WARNING: For security purposes, you must delete the "install" folder.' => '警告：基於安全考量，您必須刪除 "install" 資料夾',
+		'Back Office' => '後台',
+		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => '透過後台可以管理您的商店，包括訂單、客戶、模組與佈景等等',
+		'Manage your store' => '管理您的商店',
+		'Front Office' => '前台',
+		'Discover your store as your future customers will see it!' => '瀏覽未來您的客戶會看到的商店畫面！',
+		'Discover your store' => '瀏覽您的商店',
+		'Required set-up. Please verify the following checklist items are true.' => '必要的安裝，請檢查下面清單的項目',
+		'Your configuration is valid, click next to continue!' => '您的設定正確，請點選下一步繼續！',
+		'Your configuration is invalid. Please fix the issues below:' => '您的設定有誤，請修正下面問題：',
+		'Optional set-up' => '選擇性安裝',
+		'Refresh these settings' => '重新整理這些設定',
+		'Welcome to the PrestaShop %s Installer.' => '歡迎安裝 PrestaShop %s',
+		'The installation process should take only few minutes!' => '安裝過程只要幾分鐘時間！',
+		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => '如果您需要協助，可以瀏覽 <a href="%1$s" target="_blank">線上文件</a> 或是聯絡我們的支援團隊： %2$s',
+		'Did you know?' => '您知道嗎？',
+		'PrestaShop and its community offers over %d different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop 與社群免費提供了超過 %d 個語言，可以直接從後台的在地化功能使用',
+		'License Agreements' => '授權聲明',
+		'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'PrestaShop 核心是以 OSL 3.0 發布，相關模組與佈景則是 AFL 3.0',
+		'I agree to the above terms and conditions.' => '我同意上面的規則與條件',
+		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => '我願意透過匿名方式送出網站資訊來參與改善這個軟體',
+		'If you have any questions, please visit our <a href="%1$s" target="_blank">documentation</a> and <a href="%2$s" target="_blank">community forum</a>.' => '如果有任何問題，請瀏覽我們的 <a href="%1$s" target="_blank">文件</a> 與 <a href="%2$s" target="_blank">討論區</a>',
+		'Test message from PrestaShop' => 'PrestaShop 寄出的測試信',
+		'This is a test message, your server is now available to send email' => '這是個測試信，您的伺服器確認可以發送郵件',
+		'%s - Login information' => '%s - 登入資訊',
+		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => '實體 <i>%1$s</i> 發生一個 SQL 錯誤： <i>%2$s</i>',
+		'Cannot create image "%1$s" for entity "%2$s"' => '無法建立圖片 "%s"，於 "%2$s"',
+		'Cannot create image "%1$s" (bad permissions on folder "%2$s")' => '無法建立圖片 "%s"（資料夾 "%2$s" 權限有誤）',
+		'Cannot create image "%s"' => '無法建立圖片 "%s"',
+		'SQL error on query <i>%s</i>' => 'SQL查詢錯誤 <i>%s</i>',
+		'Server name is not valid' => '伺服器名稱有誤',
+		'You must enter a database name' => '您必須輸入資料庫名稱',
+		'You must enter a database login' => '您必須輸入資料庫帳號',
+		'Tables prefix is invalid' => '資料表前綴有誤',
+		'Wrong engine chosen for MySQL' => '選擇了錯誤的 MySQL 引擎',
+		'Cannot convert database data to utf-8' => '無法轉換資料到 UTF-8 ',
+		'At least one table with same prefix was already found, please change your prefix or drop your database' => '發現使用同樣前綴的資料表存在，請修改前綴或是移除現有資料庫',
+		'Database Server is not found. Please verify the login, password and server fields' => '找不到資料庫伺服器，請確認帳號、密碼與伺服器欄位',
+		'Connection to MySQL server succeeded, but database "%s" not found' => '成功連線伺服器，不過找不到資料庫 "%s"',
+		'Engine innoDB is not supported by your MySQL server, please use MyISAM' => '您的伺服器不支援 innoDB ，請改用 MyISAM',
+		'%s file is not writable (check permissions)' => '%s 檔案無法寫入（請檢查權限）',
+		'%s folder is not writable (check permissions)' => '%s 資料夾無法寫入（請檢查權限）',
+		'Cannot write settings file' => '無法寫入設定檔',
+		'Database structure file not found' => '找不到資料庫結構檔案',
+		'Cannot create group shop' => '無法建立商店群組',
+		'Cannot create shop' => '無法建立商店',
+		'Cannot create shop URL' => '無法建立商店網址',
+		'File "language.xml" not found for language iso "%s"' => '找不到語言代碼 "%s" 的 "language.xml"',
+		'File "language.xml" not valid for language iso "%s"' => '語言代碼 "%s" 的 "language.xml" 有誤',
+		'Cannot install language "%s"' => '無法安裝語言 "%s"',
+		'Cannot create admin account' => '無法建立管理者',
+		'Cannot install module "%s"' => '無法安裝模組 "%s" ',
+		'Fixtures class "%s" not found' => '找不到測試資料物件 "%s"',
+		'"%s" must be an instane of "InstallXmlLoader"' => '"%s" 必須是 "InstallXmlLoader" 的一個實例',
+		'Information about your Store' => '您的商店資訊',
+		'Help us learn more about your store so we can offer you optimal guidance and the best features for your business!' => '協助我們學習您的商店運作，這樣一來我們就可以為您的生意提供更好的建議與功能！',
+		'Optional - You can add you logo at a later time.' => '選擇性 – 您可以晚點再加入圖示',
+		'Your Account' => '您的帳號',
+		'This email address will be your username to access your store\'s back office.' => '這個信箱會成為您登入商店後台的帳號',
+		'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 可以定期提供您建議，協助您最佳化商店的管理，藉此提昇業績。如果您不想收到這些建議，請取消勾選',
+		'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> 來儲存商店的活動相關資料',
+		'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 ，要使用其他連接埠，請將連接埠編號加入到伺服器網址後面，例如 "localhost:4242"',
+		'Test your database connection now!' => '現在測試您的資料庫連線！',
+		'PrestaShop Installation Assistant' => '安裝協助',
+		'Contact us!' => '聯絡我們！',
+		'Installation Assistant' => '安裝協助',
+		'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.' => '為了使用 PrestaShop 提供的許多功能，請閱讀下面的授權聲明。PrestaShop 核心是以 OSL 3.0 授權，而模組與佈景則是 AFL 3.0',
+		'Print my login information' => '列印我的登入資訊',
+		'We are currently checking PrestaShop compatibility with your system environment' => '正在檢查系統環境的相容性',
+		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => '請修正下面項目，然後點選 "重新整理資訊" 來測試系統相容性',
+		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 130,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => '安裝 PrestaShop 快又容易，只要一下子，您就可以加入超過 130,000 個網站使用的軟體社群。您正在建立屬於自己獨一無二的線上商店，每天都可以輕鬆管理。',
+		'Continue the installation in:' => '繼續安裝：',
+		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => '上面選擇的語言只用在安裝過程，一旦完成安裝，您可以為商店加入超過 %d 種翻譯，而且都是免費的！',
+		'An error occurred during logo copy.' => '複製圖示時發生錯誤',
+		'The field %s is limited to %d characters' => '欄位 %s 限制長度為 %s 字元',
+		'An error occurred during logo upload.' => '上傳圖示時發生錯誤',
+		'Create default shop and languages' => '建立預設商店及語言',
+		'PHP 5.1.2 or later is not enabled' => '沒有安裝 PHP 5.1.2 或更新版本',
+		'Cannot upload files' => '無法上傳檔案',
+		'Cannot create new files and folders' => '無法建立新檔案與資料夾',
+		'GD Library is not installed' => '沒有安裝 GD 函式庫',
+		'MySQL support is not activated' => '沒有啟用 MySQL 支援',
+		'Cannot open external URLs' => '無法開啟外部網址',
+		'PHP register global option is on' => 'PHP register global 啟用中',
+		'GZIP compression is not activated' => '沒有啟用 GZIP 壓縮',
+		'Mcrypt extension is not enabled' => '沒有啟用 Mcrypt 外掛',
+		'Mbstring extension is not enabled' => '沒有啟用 Mbstring 外掛',
+		'PHP magic quotes option is enabled' => 'PHP magic quotes 選項啟用中',
+		'Dom extension is not loaded' => '沒有載入 Dom 外掛',
+		'PDO MySQL extension is not loaded' => '沒有載入 PDO MySQL 外掛',
+		'Cannot copy flag language "%s"' => '無法複製語言圖示 "%s" ',
+		'Must be alphanumeric string with at least 8 characters' => '必須是英文字母或數字，至少 8 個字元',
+		'Sign-up to the newsletter' => '訂閱電子報',
+		'Please complete the fields below in order for PrestaShop to connect to your 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.' => '如果您在安裝過程遇到問題，請聯絡我們的團隊 %s ，我們的專家會很樂意協助',
+		'E-mail:' => '電子信箱：',
+		'Display' => '顯示',
+		'PrestaShop compatibility with your system environment has been verified!' => '您的系統環境相容於 PrestaShop ！',
+		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop 需要至少 32M 記憶體來執行，請檢查 php.ini 的 memory_limit 設定或是聯絡主機提供者',
+		'Your PHP sessions path is not writable - check with your hosting provider:' => '無法寫入 PHP sessions ，請與主機提供者檢查：',
+		'Lingerie and Adult' => '內衣與成人用品',
+		'Animals and Pets' => '動物與寵物',
+		'Art and Culture' => '藝術與文化',
+		'Babies' => '嬰幼兒',
+		'Beauty and Personal Care' => '美容與個人保養',
+		'Cars' => '汽車',
+		'Computer Hardware and Software' => '電腦軟硬體',
+		'Download' => '下載',
+		'Fashion and accessories' => '流行服飾與配件',
+		'Flowers, Gifts and Crafts' => '花藝、工藝與禮品',
+		'Food and beverage' => '食物與飲料',
+		'HiFi, Photo and Video' => '音響、相片與影音',
+		'Home and Garden' => '家居與花園',
+		'Home Appliances' => '家用電器',
+		'Jewelry' => '珠寶',
+		'Mobile and Telecom' => '行動通訊',
+		'Services' => '服務',
+		'Shoes and accessories' => '鞋與配件',
+		'Sports and Entertainment' => '運動與娛樂',
+		'Travel' => '旅遊',
+		'Database is created' => '資料庫已經建立',
+		'Cannot create the database automatically' => '無法自動建立資料庫',
+		'Install modules Addons' => '安裝模組與外掛',
+		'Files' => '檔案',
+		'All files are not successfuly uploaded on your server' => '所有檔案成功上傳到伺服器',
+		'Attempt to create the database automatically' => '嘗試自動建立資料庫',
+		'Country:' => '國家：',
+		'Must be letters and numbers with at least 8 characters' => '必須是英文字母與數字的組合，至少 8 個字',
+		'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> 來儲存商店的資料與相關操作',
+		'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 與我們聯繫，我們的專家會很樂意協助',
+		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => '要安裝 PrestaShop ，您必須啟用瀏覽器的 JavaScript 估能',
+		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
+		'To enjoy the many features that are offered for free 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.' => '要自由使用 PrestaShop 的許多功能，請先詳閱下面的授權條款。PrestaShop 程式碼是以 OSL 3.0 發布，模組與佈景則是 AFL 3.0 。',
+		'For security purposes, you must delete the "install" folder.' => '基於安全考量，您必須刪除 install 資料夾',
+		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'PrestaShop 的安裝快又容易，只要一下子，您就可以加入超過 150,000 個網站構成的社群。您正在建立一個屬於自己且獨一無二的線上商店，每天都可以輕鬆的管理。',
+	),
+);
\ No newline at end of file
diff --git a/install-dev/langs/tw/language.xml b/install-dev/langs/tw/language.xml
new file mode 100644
index 000000000..44ba0e145
--- /dev/null
+++ b/install-dev/langs/tw/language.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language>
+	<name><![CDATA[正體中文 (Traditional Chinese)]]></name>
+	<language_code>tw-tw</language_code>
+	<date_format_lite>Y-m-d</date_format_lite>
+	<date_format_full>Y-m-d H:i:s</date_format_full>
+	<is_rtl>false</is_rtl>
+</language>
\ No newline at end of file
diff --git a/install-dev/langs/tw/mail_identifiers.txt b/install-dev/langs/tw/mail_identifiers.txt
new file mode 100644
index 000000000..e4774a978
--- /dev/null
+++ b/install-dev/langs/tw/mail_identifiers.txt
@@ -0,0 +1,10 @@
+{lastname}{firstname}您好，
+
+您在 {shop_name} 的帳號資訊如下：
+
+密碼： {passwd}
+信箱： {email}
+
+{shop_name} - {shop_url}
+
+{shop_url} 是透過 PrestaShop™ 建置
\ No newline at end of file
diff --git a/install-dev/models/install.php b/install-dev/models/install.php
index 249d7cddd..7c2b5dbb5 100644
--- a/install-dev/models/install.php
+++ b/install-dev/models/install.php
@@ -367,9 +367,6 @@ class InstallModelInstall extends InstallAbstractModel
 	 */
 	public function configureShop(array $data = array())
 	{
-		// Clear smarty cache
-		Tools::clearSmartyCache();
-
 		//clear image cache in tmp folder
 		if (file_exists(_PS_TMP_IMG_DIR_))
 			foreach (scandir(_PS_TMP_IMG_DIR_) as $file)
diff --git a/install-dev/upgrade/php/p15012_add_missing_columns.php b/install-dev/upgrade/php/p15012_add_missing_columns.php
index 21dce2f94..66977b3b1 100755
--- a/install-dev/upgrade/php/p15012_add_missing_columns.php
+++ b/install-dev/upgrade/php/p15012_add_missing_columns.php
@@ -111,6 +111,9 @@ function p15012_add_missing_columns()
   $q_list['order_invoice']['note']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'order_invoice`
 		CHANGE `note` note text';
 
+  $q_list['order_payment']['id_order_payment']['mod'] = 'UPDATE `'._DB_PREFIX_.'order_payment`
+		SET `id_order_invoice` = 0 WHERE `id_order_invoice` LIKE "" OR `id_order_invoice` IS NULL';
+
   $q_list['order_payment']['id_order_invoice']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'order_payment`
 		CHANGE `id_order_invoice` id_order_invoice int(10) unsigned DEFAULT NULL';
 
diff --git a/install-dev/upgrade/sql/1.5.0.2.sql b/install-dev/upgrade/sql/1.5.0.2.sql
index e42871126..0d7ec1a63 100755
--- a/install-dev/upgrade/sql/1.5.0.2.sql
+++ b/install-dev/upgrade/sql/1.5.0.2.sql
@@ -345,11 +345,11 @@ INSERT INTO `PREFIX_order_invoice` (`id_order`, `number`, `total_discount_tax_ex
 ALTER TABLE `PREFIX_tab` ADD `active` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1';
 
 UPDATE `PREFIX_order_detail` od
-SET od.`id_order_invoice` = (
+SET od.`id_order_invoice` = IFNULL((
 	SELECT oi.`id_order_invoice`
 	FROM `PREFIX_order_invoice` oi
 	WHERE oi.`id_order` = od.`id_order`
-);
+), 0);
 
 INSERT INTO `PREFIX_order_carrier` (`id_order`, `id_carrier`, `id_order_invoice`, `weight`, `shipping_cost_tax_excl`, `shipping_cost_tax_incl`, `tracking_number`, `date_add`) (
 	SELECT `id_order`, `id_carrier`, (
diff --git a/install-dev/upgrade/sql/1.5.0.6.sql b/install-dev/upgrade/sql/1.5.0.6.sql
index f03bc0be2..29bcb05b7 100644
--- a/install-dev/upgrade/sql/1.5.0.6.sql
+++ b/install-dev/upgrade/sql/1.5.0.6.sql
@@ -1,11 +1,11 @@
 SET NAMES 'utf8';
 
 UPDATE `PREFIX_orders` o
-SET o.`current_state` = (
+SET o.`current_state` = IFNULL((
 	SELECT oh.`id_order_state`
 	FROM `PREFIX_order_history` oh
 	WHERE oh.`id_order` = o.`id_order`
 	ORDER BY oh.`date_add` DESC
 	LIMIT 1
-);
+), 0);
 
diff --git a/install-dev/upgrade/sql/1.5.1.0.sql b/install-dev/upgrade/sql/1.5.1.0.sql
index b365cf584..035ef027d 100644
--- a/install-dev/upgrade/sql/1.5.1.0.sql
+++ b/install-dev/upgrade/sql/1.5.1.0.sql
@@ -12,7 +12,7 @@ INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALU
 ALTER TABLE `PREFIX_product` CHANGE `width` `width` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `height` `height` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `depth` `depth` DECIMAL(20, 6) NOT NULL DEFAULT '0', CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_product_attribute` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_product_attribute_shop` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
-ALTER TABLE `PREFIX_order_carrier` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
+ALTER IGNORE TABLE `PREFIX_order_carrier` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_attribute_impact` CHANGE `weight` `weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_order_detail` CHANGE `product_weight` `product_weight` DECIMAL(20, 6) NOT NULL DEFAULT '0';
 ALTER TABLE `PREFIX_stock_available` DROP INDEX `product_sqlstock`;
diff --git a/install-dev/upgrade/sql/1.5.3.0.sql b/install-dev/upgrade/sql/1.5.3.0.sql
index abc00ff4a..2f8108f90 100644
--- a/install-dev/upgrade/sql/1.5.3.0.sql
+++ b/install-dev/upgrade/sql/1.5.3.0.sql
@@ -24,7 +24,7 @@ INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALU
 
 ALTER TABLE `PREFIX_order_cart_rule` CHANGE `name` `name` VARCHAR(254);
 
-ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+ALTER IGNORE TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
 
 ALTER TABLE `PREFIX_currency_shop` ADD `conversion_rate` DECIMAL( 13, 6 ) NOT NULL;
 UPDATE `PREFIX_currency_shop` a SET `conversion_rate` = (SELECT `conversion_rate` FROM `PREFIX_currency` b WHERE a.id_currency = b.id_currency);
diff --git a/install-dev/upgrade/sql/1.5.3.1.sql b/install-dev/upgrade/sql/1.5.3.1.sql
index 381567a73..4146e75a1 100644
--- a/install-dev/upgrade/sql/1.5.3.1.sql
+++ b/install-dev/upgrade/sql/1.5.3.1.sql
@@ -2,4 +2,4 @@ SET NAMES 'utf8';
 
 /* PHP:p1531_redirect_type(); */;
 
-ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT NOT NULL;
+ALTER IGNORE TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT NOT NULL;
diff --git a/install-dev/upgrade/sql/1.5.6.0.sql b/install-dev/upgrade/sql/1.5.6.0.sql
index abc16c24a..84f374101 100644
--- a/install-dev/upgrade/sql/1.5.6.0.sql
+++ b/install-dev/upgrade/sql/1.5.6.0.sql
@@ -14,4 +14,4 @@ ALTER TABLE `PREFIX_manufacturer_lang` CHANGE `short_description` `short_descrip
 /* PHP:remove_tab(AdminRangePrice); */;
 /* PHP:remove_tab(AdminRangeWeight); */;
 
-UPDATE `PREFIX_employee` SET default_tab =  1 WHERE default_tab = 0;
+UPDATE `PREFIX_employee` SET default_tab =  (SELECT `id_tab` FROM `PREFIX_tab` WHERE `class_name` LIKE 'AdminOrders' LIMIT 0 , 1) WHERE default_tab = 0;
diff --git a/js/admin.js b/js/admin.js
index f0d210359..3c33b504b 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -477,32 +477,6 @@ function validateImportation(mandatory)
 		}
 }
 
-function askFeatureName(selected, selector)
-{
-	var elem;
-
-	if (selected.value == 'features')
-	{
-		$('#features_' + selector).show();
-		$('#feature_name_' + selector).attr('name', selected.name);
-	}
-}
-
-function replaceFeature(toReplace, selector)
-{
-	var elem;
-
-	if ($('#feature_name_' + selector).val() == '')
-		return false;
-
-	elem = getE(toReplace);
-	elem.options[elem.selectedIndex].text = $('#feature_name_' + selector).val();
-	elem.options[elem.selectedIndex].value = '#F_' + $('#feature_name_' + selector).val();
-	$('#features_' + selector).toggle();
-	$('#feature_name_' + selector).val('');
-	$('#feature_name_' + selector).attr('name', '');
-}
-
 function chooseTypeTranslation(id_lang)
 {
 	getE('translation_lang').value = id_lang;
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index d2bb9f401..fd9c46c89 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -368,7 +368,6 @@ function bind_inputs()
 function is_freeClick(elt)
 {
 	var is_free = $(elt);
-
 	if (parseInt(is_free.val()))
 		hideFees();
 	else
@@ -389,7 +388,7 @@ function hideFees()
 function showFees()
 {
 	$('tr.range_inf td, tr.range_sup td, tr.fees_all td, tr.fees td').each( function () {
-		if ($(this).index() > 2)
+		if ($(this).index() >= 2)
 		{
 			//enable only if zone is active
 			tr = $(this).parent('tr');
@@ -474,7 +473,8 @@ function validateRange(index)
 function enableZone(index)
 {
 	$('tr.fees').each( function () {
-		$(this).find('td:eq('+index+')').children('input').removeAttr('disabled');
+		if ($(this).find('td:eq(1)').children('input[type=checkbox]:checked').length)	
+			$(this).find('td:eq('+index+')').children('input').removeAttr('disabled');
 	});
 }
 
@@ -492,12 +492,18 @@ function enableRange(index)
 		if ($(this).children('td').children('input:checkbox').attr('checked') == 'checked')
 			enableZone(index);
 	});
+	$('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated');
+	if ($('.zone input[type=checkbox]:checked').length)
+		enableGlobalFees(index);
+	bind_inputs();
+}
+
+function enableGlobalFees(index)
+{
 	$('span.fees_all').show();
 	$('tr.fees_all td:eq('+index+')').children('input').show().removeAttr('disabled');
 	$('tr.fees_all td:eq('+index+')').children('.currency_sign').show();
-	$('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated');
-	$('tr.fees_all td:eq('+index+')').children('button').remove();
-	bind_inputs();
+	
 }
 
 function disableRange(index)
@@ -636,7 +642,8 @@ function checkAllZones(elt)
 	{
 		$('.input_zone').attr('checked', 'checked');
 		$('.fees input:text').each( function () {
-			index = $(this).parent().index();
+			index = $(this).closest('td').index();
+			enableGlobalFees(index);
 			if ($('tr.fees_all td:eq('+index+')').hasClass('validated'))
 			{
 				$(this).removeAttr('disabled');
diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index 6f1da33a4..a6d2e8272 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -398,8 +398,7 @@ var ajaxCart = {
 		else
 		{
 			$('#vouchers tbody').html('');
-
-			for (i=0;i<jsonData.discounts.length;i++)
+			for (i=0; i < jsonData.discounts.length; i++)
 			{
 				if (parseFloat(jsonData.discounts[i].price_float) > 0)
 				{
@@ -408,15 +407,14 @@ var ajaxCart = {
 						delete_link = '<a class="delete_voucher" href="'+jsonData.discounts[i].link+'" title="'+delete_txt+'"><img src="'+img_dir+'icon/delete.gif" alt="'+delete_txt+'" class="icon" /></a>';
 					$('#vouchers tbody').append($(
 						'<tr class="bloc_cart_voucher" id="bloc_cart_voucher_'+jsonData.discounts[i].id+'">'
-						+'	<td class="quantity">1x</td>'
-						+'	<td class="name" title="'+jsonData.discounts[i].description+'">'+jsonData.discounts[i].name+'</td>'
-						+'	<td class="price">-'+jsonData.discounts[i].price+'</td>'
-						+'	<td class="delete">' + delete_link + '</td>'
-						+'</tr>'
+						+ '<td class="quantity">1x</td>'
+						+ '<td class="name" title="'+jsonData.discounts[i].description+'">'+jsonData.discounts[i].name+'</td>'
+						+ '<td class="price">-'+jsonData.discounts[i].price+'</td>'
+						+ '<td class="delete">' + delete_link + '</td>'
+						+ '</tr>'
 					));
 				}
 			}
-
 			$('#vouchers').show();
 		}
 
diff --git a/modules/blockcart/blockcart.css b/modules/blockcart/blockcart.css
index e5ad3e71b..9c39dc597 100644
--- a/modules/blockcart/blockcart.css
+++ b/modules/blockcart/blockcart.css
@@ -36,7 +36,7 @@
 #cart_block #cart_block_summary {display:none}
 #cart_block .quantity-formated {
 	display:inline-block;
-	margin-right:5px;
+	padding-right:2px;
 	min-width:18px;
 	vertical-align: top;
 }
@@ -62,7 +62,7 @@
 	padding-bottom:10px
 }
 #cart_block #cart_block_list dt {padding:4px 0}
-#cart_block #cart_block_list dt a {font-weight:bold; display: inline-block; width: 95px}
+#cart_block #cart_block_list dt a {font-weight:bold; display: inline-block; max-width: 95px}
 #cart_block #cart_block_list dd {
 	margin-left:20px
 }
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index ddac2554b..3d2039ed9 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -1949,6 +1949,11 @@ class BlockLayered extends Module
 								$($(\'#categories-treeview li\')[0]).removeClass(\'static\');
 								$($(\'#categories-treeview li span\')[0]).trigger(\'click\');
 								$($(\'#categories-treeview li\')[0]).children(\'div\').remove();
+								$($(\'#categories-treeview li\')[0]).removeClass(\'collapsable lastCollapsable\');
+								$(\'.hitarea\').live(\'click\', function(it)
+								{
+									$(this).parent().find(\'> .category_label\').click();
+								});
 							}
 						});
 
diff --git a/modules/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php
index a5eb3b3c5..a28b4c0bc 100644
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
@@ -543,21 +543,21 @@ class Blocktopmenu extends Module
 					$selected = ($this->page_name == 'product' && (Tools::getValue('id_product') == $id)) ? ' class="sfHover"' : '';
 					$product = new Product((int)$id, true, (int)$id_lang);
 					if (!is_null($product->id))
-						$this->_menu .= '<li'.$selected.'><a href="'.htmlentities($product->getLink()).'">'.$product->name.'</a></li>'.PHP_EOL;
+						$this->_menu .= '<li'.$selected.'><a href="'.Tools::HtmlEntitiesUTF8($product->getLink()).'">'.$product->name.'</a></li>'.PHP_EOL;
 					break;
 
 				case 'CMS':
 					$selected = ($this->page_name == 'cms' && (Tools::getValue('id_cms') == $id)) ? ' class="sfHover"' : '';
 					$cms = CMS::getLinks((int)$id_lang, array($id));
 					if (count($cms))
-						$this->_menu .= '<li'.$selected.'><a href="'.htmlentities($cms[0]['link']).'">'.$cms[0]['meta_title'].'</a></li>'.PHP_EOL;
+						$this->_menu .= '<li'.$selected.'><a href="'.Tools::HtmlEntitiesUTF8($cms[0]['link']).'">'.$cms[0]['meta_title'].'</a></li>'.PHP_EOL;
 					break;
 
 				case 'CMS_CAT':
 					$category = new CMSCategory((int)$id, (int)$id_lang);
 					if (count($category))
 					{
-						$this->_menu .= '<li><a href="'.htmlentities($category->getLink()).'">'.$category->name.'</a>';
+						$this->_menu .= '<li><a href="'.Tools::HtmlEntitiesUTF8($category->getLink()).'">'.$category->name.'</a>';
 						$this->getCMSMenuItems($category->id);
 						$this->_menu .= '</li>'.PHP_EOL;
 					}
@@ -583,7 +583,7 @@ class Blocktopmenu extends Module
 						else
 							$manufacturer->link_rewrite = 0;
 						$link = new Link;
-						$this->_menu .= '<li'.$selected.'><a href="'.htmlentities($link->getManufacturerLink((int)$id, $manufacturer->link_rewrite)).'">'.$manufacturer->name.'</a></li>'.PHP_EOL;
+						$this->_menu .= '<li'.$selected.'><a href="'.Tools::HtmlEntitiesUTF8($link->getManufacturerLink((int)$id, $manufacturer->link_rewrite)).'">'.$manufacturer->name.'</a></li>'.PHP_EOL;
 					}
 					break;
 
@@ -603,7 +603,7 @@ class Blocktopmenu extends Module
 					if (!is_null($supplier->id))
 					{
 						$link = new Link;
-						$this->_menu .= '<li'.$selected.'><a href="'.htmlentities($link->getSupplierLink((int)$id, $supplier->link_rewrite)).'">'.$supplier->name.'</a></li>'.PHP_EOL;
+						$this->_menu .= '<li'.$selected.'><a href="'.Tools::HtmlEntitiesUTF8($link->getSupplierLink((int)$id, $supplier->link_rewrite)).'">'.$supplier->name.'</a></li>'.PHP_EOL;
 					}
 					break;
 
@@ -613,7 +613,7 @@ class Blocktopmenu extends Module
 					if (Validate::isLoadedObject($shop))
 					{
 						$link = new Link;
-						$this->_menu .= '<li'.$selected.'><a href="'.htmlentities($shop->getBaseURL()).'">'.$shop->name.'</a></li>'.PHP_EOL;
+						$this->_menu .= '<li'.$selected.'><a href="'.Tools::HtmlEntitiesUTF8($shop->getBaseURL()).'">'.$shop->name.'</a></li>'.PHP_EOL;
 					}
 					break;
 				case 'LNK':
@@ -625,7 +625,7 @@ class Blocktopmenu extends Module
 							$default_language = Configuration::get('PS_LANG_DEFAULT');
 							$link = MenuTopLinks::get($link[0]['id_linksmenutop'], $default_language, (int)Shop::getContextShopID());
 						}
-						$this->_menu .= '<li><a href="'.htmlentities($link[0]['link']).'"'.(($link[0]['new_window']) ? ' target="_blank"': '').'>'.$link[0]['label'].'</a></li>'.PHP_EOL;
+						$this->_menu .= '<li><a href="'.Tools::HtmlEntitiesUTF8($link[0]['link']).'"'.(($link[0]['new_window']) ? ' target="_blank"': '').'>'.$link[0]['label'].'</a></li>'.PHP_EOL;
 					}
 					break;
 			}
@@ -677,7 +677,7 @@ class Blocktopmenu extends Module
 		if (!empty($is_intersected))
 		{
 			$this->_menu .= '<li '.$selected.'>';
-			$this->_menu .= '<a href="'.htmlentities($category_link).'">'.$category->name.'</a>';
+			$this->_menu .= '<a href="'.Tools::HtmlEntitiesUTF8($category_link).'">'.$category->name.'</a>';
 
 			if (count($children))
 			{
diff --git a/themes/default/modules/blockcart/blockcart.tpl b/themes/default/modules/blockcart/blockcart.tpl
index 53e3a7c23..41517bd9e 100644
--- a/themes/default/modules/blockcart/blockcart.tpl
+++ b/themes/default/modules/blockcart/blockcart.tpl
@@ -22,17 +22,11 @@
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
-
-{* IMPORTANT : If you change some data here, you have to report these changes in the ./blockcart-json.js (to let ajaxCart available) *}
-
-{if $ajax_allowed}
 <script type="text/javascript">
+{if $ajax_allowed}
 var CUSTOMIZE_TEXTFIELD = {$CUSTOMIZE_TEXTFIELD};
 var img_dir = '{$img_dir|addslashes}';
-</script>
 {/if}
-<script type="text/javascript">
 var customizationIdMessage = '{l s='Customization #' mod='blockcart' js=1}';
 var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' js=1}';
 var freeShippingTranslation = '{l s='Free shipping!' mod='blockcart' js=1}';
@@ -40,8 +34,6 @@ var freeProductTranslation = '{l s='Free!' mod='blockcart' js=1}';
 var delete_txt = '{l s='Delete' mod='blockcart' js=1}';
 var generated_date = {$smarty.now|intval};
 </script>
-
-
 <!-- MODULE Block cart -->
 <div id="cart_block" class="block exclusive">
 	<p class="title_block">
@@ -76,10 +68,7 @@ var generated_date = {$smarty.now|intval};
 			{assign var='productId' value=$product.id_product}
 			{assign var='productAttributeId' value=$product.id_product_attribute}
 			<dt id="cart_block_product_{$product.id_product}_{if $product.id_product_attribute}{$product.id_product_attribute}{else}0{/if}_{if $product.id_address_delivery}{$product.id_address_delivery}{else}0{/if}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">
-				<span class="quantity-formated"><span class="quantity">{$product.cart_quantity}</span>x</span>
-				<a class="cart_block_product_name" href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html'}" title="{$product.name|escape:html:'UTF-8'}">
-				{$product.name|truncate:13:'...'|escape:html:'UTF-8'}</a>
-				<span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId) && (!isset($product.is_gift) || !$product.is_gift)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$static_token}", true)|escape:'html'}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
+				<span class="quantity-formated"><span class="quantity">{$product.cart_quantity}</span>x</span><a class="cart_block_product_name" href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html'}" title="{$product.name|escape:html:'UTF-8'}">{$product.name|truncate:13:'...'|escape:html:'UTF-8'}</a><span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId) && (!isset($product.is_gift) || !$product.is_gift)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$static_token}", true)|escape:'html'}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
 				<span class="price">
 					{if !isset($product.is_gift) || !$product.is_gift}
 						{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total`"}{else}{displayWtPrice p="`$product.total_wt`"}{/if}
@@ -92,7 +81,6 @@ var generated_date = {$smarty.now|intval};
 			<dd id="cart_block_combination_of_{$product.id_product}{if $product.id_product_attribute}_{$product.id_product_attribute}{/if}_{$product.id_address_delivery|intval}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">
 				<a href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html'}" title="{l s='Product detail' mod='blockcart'}">{$product.attributes_small}</a>
 			{/if}
-
 			<!-- Customizable datas -->
 			{if isset($customizedDatas.$productId.$productAttributeId[$product.id_address_delivery])}
 				{if !isset($product.attributes_small)}<dd id="cart_block_combination_of_{$product.id_product}_{if $product.id_product_attribute}{$product.id_product_attribute}{else}0{/if}_{if $product.id_address_delivery}{$product.id_address_delivery}{else}0{/if}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">{/if}
@@ -110,31 +98,33 @@ var generated_date = {$smarty.now|intval};
 				</ul>
 				{if !isset($product.attributes_small)}</dd>{/if}
 			{/if}
-
 			{if isset($product.attributes_small)}</dd>{/if}
-
 		{/foreach}
 		</dl>
 	{/if}
 		<p class="cart_block_no_products{if $products} hidden{/if}" id="cart_block_no_products">{l s='No products' mod='blockcart'}</p>
-		{if $discounts|@count > 0}
 		<table id="vouchers"{if $discounts|@count == 0} style="display:none;"{/if}>
+			<tbody>
 			{foreach from=$discounts item=discount}
 				{if $discount.value_real > 0}
-				<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
-					<td class="quantity">1x</td>
-					<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
-					<td class="price">-{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}</td>
-					<td class="delete">
-						{if strlen($discount.code)}
-							<a class="delete_voucher" href="{$link->getPageLink('$order_process', true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete' mod='blockcart'}" rel="nofollow"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete' mod='blockcart'}" class="icon" /></a>
-						{/if}
-					</td>
-				</tr>
+					<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
+						<td class="quantity">1x</td>
+						<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
+						<td class="price">-{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}</td>
+						<td class="delete">
+							{if strlen($discount.code)}
+								<a class="delete_voucher" href="{$link->getPageLink('$order_process', true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete' mod='blockcart'}" rel="nofollow"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete' mod='blockcart'}" class="icon" /></a>
+							{/if}
+						</td>
+					</tr>
 				{/if}
+			{foreachelse}{* W3C and cart rule vouchers *}
+					<tr class="bloc_cart_voucher">
+						<td>&nbsp;</td>
+					</tr>
 			{/foreach}
+			</tbody>
 		</table>
-		{/if}
 		<p id="cart-prices">
 			<span id="cart_block_shipping_cost" class="price ajax_cart_shipping_cost">{$shipping_cost}</span>
 			<span>{l s='Shipping' mod='blockcart'}</span>
@@ -172,5 +162,4 @@ var generated_date = {$smarty.now|intval};
 	</div>
 	</div>
 </div>
-<!-- /MODULE Block cart -->
-
+<!-- /MODULE Block cart -->
\ No newline at end of file
diff --git a/translations/br.gzip b/translations/br.gzip
deleted file mode 100644
index 8c1772ee4..000000000
Binary files a/translations/br.gzip and /dev/null differ
diff --git a/translations/de.gzip b/translations/de.gzip
deleted file mode 100644
index bafdfd1b9..000000000
Binary files a/translations/de.gzip and /dev/null differ
diff --git a/translations/en.gzip b/translations/en.gzip
index a43fe55a1..e9ba5fcc8 100644
Binary files a/translations/en.gzip and b/translations/en.gzip differ
diff --git a/translations/es.gzip b/translations/es.gzip
deleted file mode 100644
index 1dffffe1c..000000000
Binary files a/translations/es.gzip and /dev/null differ
diff --git a/translations/fr.gzip b/translations/fr.gzip
index 733390e04..960058ab7 100644
Binary files a/translations/fr.gzip and b/translations/fr.gzip differ
diff --git a/translations/it.gzip b/translations/it.gzip
deleted file mode 100644
index 96285a813..000000000
Binary files a/translations/it.gzip and /dev/null differ
diff --git a/translations/nl.gzip b/translations/nl.gzip
deleted file mode 100644
index bb17d5865..000000000
Binary files a/translations/nl.gzip and /dev/null differ
diff --git a/translations/pl.gzip b/translations/pl.gzip
deleted file mode 100644
index f38d6f128..000000000
Binary files a/translations/pl.gzip and /dev/null differ
diff --git a/translations/ru.gzip b/translations/ru.gzip
deleted file mode 100644
index 1af1cb113..000000000
Binary files a/translations/ru.gzip and /dev/null differ