diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index 6c5cc4368..dff8cbde7 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -29,6 +29,19 @@
 	<h4>{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}</h4>	<div class="separation"></div><br />
 
 	<table cellpadding="5" style="width:100%">
+		<tr>
+			<td class="col-left">
+				<label>{l s='Legend:'}</label>
+			</td>
+			<td style="padding-bottom:5px;" class="translatable">
+			{foreach from=$languages item=language}
+				<div class="lang_{$language.id_lang}" style="{if !$language.is_default}display: none;{/if} float: left;">
+					<input class="updateCurrentText" size="43" type="text" {if !$product->id}disabled="disabled"{/if} id="legend_{$language.id_lang}" name="legend_{$language.id_lang}" value="{$product->name[$language.id_lang]|escape:'htmlall':'UTF-8'}"/>
+					<span class="hint" name="help_box">{l s='Invalid characters:'} <>;=#{}<span class="hint-pointer">&nbsp;</span></span>
+				</div>
+			{/foreach}
+			</td>
+		</tr>
 		<tr>
 			<td class="col-left"><label class="file_upload_label">{l s='File:'}</label></td>
 			<td style="padding-bottom:5px;">
@@ -57,6 +70,7 @@
 						<thead>
 						<tr class="nodrag nodrop"> 
 							<th style="width: 100px;">{l s='Image'}</th>
+							<th>{l s='Legend'}</th>
 							<th>{l s='Position'}</th>
 							{if $shops}
 							{foreach from=$shops item=shop}
@@ -81,6 +95,7 @@
 					<img src="{$smarty.const._THEME_PROD_DIR_}{$iso_lang}-default-small_default.jpg" alt="image_id" title="image_id" />
 				</a>
 			</td>
+			<td>legend</td>
 			<td id="td_image_id" class="pointer dragHandle center positionImage">
 				image_position
 			</td>
@@ -101,7 +116,6 @@
 			</td>
 		</tr>
 	</table>
-
 	<script type="text/javascript">
 		var upbutton = '{l s='Upload an image'}';
 		var token = '{$token}';
@@ -128,7 +142,7 @@
 				}
 				else
 					assoc = false;
-				imageLine({$image->id}, "{$image->getExistingImgPath()}", {$image->position}, "{if $image->cover}enabled{else}forbbiden{/if}", assoc);
+				imageLine({$image->id}, "{$image->getExistingImgPath()}", {$image->position}, "{if $image->cover}enabled{else}forbbiden{/if}", assoc, "{$image->legend[$default_language]|@addcslashes:'\"'}");
 			{/foreach}
 			{literal}
 			$("#imageTable").tableDnD(
@@ -147,20 +161,20 @@
 				updateImagePosition(image_up);
 				}
 			});
+		
 			var filecheck = 1;
-			var uploader = new qq.FileUploader(
+			var params = new Array;
+			params['id_product'] = {/literal}{$id_product|intval}{literal};
+			params['id_category'] = {/literal}{$id_category_default|intval}{literal};
+			params['token'] = "{/literal}{$token}{literal}";
+			params['tab'] = "AdminProducts";
+			params['action'] = "addImage";
+			params['ajax'] = 1;
+			uploader = new qq.FileUploader(
 			{
 				element: document.getElementById("file-uploader"),
 				action: "ajax-tab.php",
 				debug: false,
-				params: {
-					id_product : {/literal}{$id_product}{literal},
-					id_category : {/literal}{$id_category_default}{literal},
-					token : "{/literal}{$token}{literal}",
-					tab : "AdminProducts",
-					action : 'addImage',
-					ajax: 1
-				},
 				onComplete: function(id, fileName, responseJSON)
 				{
 					var percent = ((filecheck * 100) / nbfile);
@@ -185,7 +199,7 @@
 						cover = "forbbiden";
 						if (responseJSON.cover == "1")
 							cover = "enabled";
-						imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, responseJSON.shops)
+						imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, responseJSON.shops, responseJSON.legend[{/literal}{$default_language|intval}{literal}])
 						$("#imageTable tr:last").after(responseJSON.html);
 						$("#countImage").html(parseInt($("#countImage").html()) + 1);
 						$("#img" + id).remove();
@@ -198,6 +212,12 @@
 				},
 				onSubmit: function(id, filename)
 				{
+					$('input[id^="legend_"]').each(function()
+					{
+						id = $(this).prop("id").replace("legend_", "legend[") + "]";
+						params[id] = $(this).val();
+					});
+					uploader.setParams(params);					
 					$("#imageTable").show();
 					$("#listImage").append("<li id='img"+id+"'><div class=\"float\" >" + filename + "</div></div><a style=\"margin-left:10px\"href=\"javascript:delQueue(" + id +");\"><img src=\"../img/admin/disabled.gif\" alt=\"\" border=\"0\"></a><p class=\"errorImg\"></p></li>");
 				}
@@ -309,13 +329,14 @@
 				$("#img" + id).remove();
 			}
 			
-			function imageLine(id, path, position, cover, shops)
+			function imageLine(id, path, position, cover, shops, legend)
 			{
 				line = $("#lineType").html();
 				line = line.replace(/image_id/g, id);
 				line = line.replace(/[a-z]{2}-default/g, path);
 				line = line.replace(/image_path/g, path);
 				line = line.replace(/image_position/g, position);
+				line = line.replace(/legend/g, legend);
 				line = line.replace(/blank/g, cover);
 				line = line.replace(/<tbody>/gi, "");
 				line = line.replace(/<\/tbody>/gi, "");
@@ -330,7 +351,6 @@
 
 				$("#imageList").append(line);
 			}
-
 			$('.fancybox').fancybox();
 		});
 		{/literal}
diff --git a/classes/FileUploader.php b/classes/FileUploader.php
index be70593df..9c3758244 100755
--- a/classes/FileUploader.php
+++ b/classes/FileUploader.php
@@ -102,6 +102,11 @@ class QqUploadedFileForm
 			$image = new Image();
 			$image->id_product = (int)$product->id;
 			$image->position = Image::getHighestPosition($product->id) + 1;
+			$legends = Tools::getValue('legend');
+			if (is_array($legends))
+				foreach ($legends as $key => $legend)
+					if (!empty($legend))
+						$image->legend[(int)$key] = $legend;
 			if (!Image::getCover($image->id_product))
 				$image->cover = 1;
 			else
@@ -136,7 +141,7 @@ class QqUploadedFileForm
 
 		if (!$image->update())
 			return array('error' => Tools::displayError('Error while updating status'));
-		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName());
+		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName(), 'legend' => $image->legend);
 		return array('success' => $img);
 	}
 
@@ -184,6 +189,11 @@ class QqUploadedFileXhr
 			$image = new Image();
 			$image->id_product = (int)($product->id);
 			$image->position = Image::getHighestPosition($product->id) + 1;
+			$legends = Tools::getValue('legend');
+			if (is_array($legends))
+				foreach ($legends as $key => $legend)
+					if (!empty($legend))
+						$image->legend[(int)$key] = $legend;
 			if (!Image::getCover($image->id_product))
 				$image->cover = 1;
 			else
@@ -223,7 +233,7 @@ class QqUploadedFileXhr
 
 		if (!$image->update())
 			return array('error' => Tools::displayError('Error while updating status'));
-		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName());
+		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName(), 'legend' => $image->legend);
 		return array('success' => $img);
 	}
 
diff --git a/classes/Image.php b/classes/Image.php
index a7ce28b2f..8761dbf17 100644
--- a/classes/Image.php
+++ b/classes/Image.php
@@ -40,6 +40,9 @@ class ImageCore extends ObjectModel
 	/** @var boolean Image is cover */
 	public $cover;
 
+	/** @var string Legend */
+	public $legend;
+
 	/** @var string image extension */
 	public $image_format = 'jpg';
 
@@ -66,6 +69,7 @@ class ImageCore extends ObjectModel
 			'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'position' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'cover' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'shop' => true),
+			'legend' => 	array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
 		),
 	);
 
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 4c50f38de..a0d049152 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1341,7 +1341,6 @@ class AdminProductsControllerCore extends AdminController
 		if (isset($result['success']))
 		{
 			$obj = new Image((int)$result['success']['id_image']);
-
 			// Associate image to shop from context
 			$shops = Shop::getContextListShopID();
 			$obj->associateTo($shops);
@@ -1355,6 +1354,7 @@ class AdminProductsControllerCore extends AdminController
 				'id'=>$obj->id,
 				'path' => $obj->getExistingImgPath(),
 				'position' => $obj->position,
+				'legend' => $obj->legend,
 				'cover' => $obj->cover,
 				'shops' => $json_shops,
 			);
@@ -3613,7 +3613,9 @@ class AdminProductsControllerCore extends AdminController
 						'max_image_size' => $this->max_image_size / 1024 / 1024,
 						'up_filename' => (string)Tools::getValue('virtual_product_filename_attribute'),
 						'currency' => $this->context->currency,
-						'current_shop_id' => $current_shop_id
+						'current_shop_id' => $current_shop_id,
+						'languages' => $this->_languages,
+						'default_language' => (int)Configuration::get('PS_LANG_DEFAULT')
 				));
 			}
 			else
diff --git a/js/admin-products.js b/js/admin-products.js
index b187ac55e..c0f52b2f5 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -1103,6 +1103,12 @@ product_tabs['Pack'] = new function(){
 	}
 }
 
+product_tabs['Images'] = new function(){
+	this.onReady = function(){
+		displayFlags(languages, id_language, allowEmployeeFormLang);
+	}
+}
+
 product_tabs['Features'] = new function(){
 	this.onReady = function(){
 		displayFlags(languages, id_language, allowEmployeeFormLang);