diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 9aaac12a7..f871b3fab 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -3156,7 +3156,8 @@ The
 	<string name="InventoryOutboxErrorSubs">Marketplace store</string>
 	<string name="InventoryOutboxError2">is returning errors.</string>
 	<string name="InventoryMarketplaceError">
-This feature is currently in Beta. Please add your name to this [http://goo.gl/forms/FCQ7UXkakz Google form] if you would like to participate.
+An error occurred while opening Marketplace Listings.
+If you continue to receive this message, please contact Second Life support for assistance at http://support.secondlife.com
 	</string>
 	<string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string>
 	<string name="InventoryMarketplaceListingsNoItemsTooltip"></string>
@@ -3166,7 +3167,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 
 	<string name="Marketplace Validation Log"></string>
 	<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
-	<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
+	<string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string>
 	<string name="Marketplace Validation Error Subfolder In Stock">: Error: stock folder cannot contain subfolders</string>
 	<string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any items</string>
 	<string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string>
diff --git a/indra/newview/skins/default/xui/es/floater_associate_listing.xml b/indra/newview/skins/default/xui/es/floater_associate_listing.xml
new file mode 100644
index 000000000..a2f09ba8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_associate_listing.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="associate listing" title="Asociar Artículos">
+    <text name="message">
+        ID de Artículo:
+    </text>
+    <line_editor name="listing_id">
+        Escribe aquí el Id.
+    </line_editor>
+    <button label="OK" name="OK"/>
+    <button label="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_favs.xml b/indra/newview/skins/default/xui/es/floater_inventory_favs.xml
index 7a4915727..49ec800f0 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_favs.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_favs.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_inventory_favs.xml" title="Favoritos">
-  <inventory_panel name="inventory_favs" start_folder="Favorites"/>
+  <inventory_panel name="inventory_favs"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/es/floater_marketplace_listings.xml
new file mode 100644
index 000000000..58b2a637a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_marketplace_listings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater title="Artículos del Mercado" name="floater_marketplace_listings" >
+	<panel name="marketplace_listings_panel">
+		<panel>
+			<panel name="marketplace_listings_inventory_placeholder_panel">
+				<text name="marketplace_listings_inventory_placeholder_title">
+					Cargando...
+				</text>
+				<text_editor name="marketplace_listings_inventory_placeholder_text"/>
+			</panel>
+			<panel name="panel_marketplace_listing"/>
+		</panel>
+		<panel name="marketplace_panel_status">
+			<text name="marketplace_status"/>
+		</panel>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/es/floater_marketplace_validation.xml
new file mode 100644
index 000000000..cfae4d5b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_marketplace_validation.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater title="Auditar artículos del Mercado" name="floater_marketplace_validation">
+    <button name="OK" label="OK" label_selected="OK"/>
+    <text_editor name="validation_text">
+        MARKETPLACE_VALIDATION_TEXT
+    </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_my_outfits.xml b/indra/newview/skins/default/xui/es/floater_my_outfits.xml
index 1a241e0f9..9f7195449 100644
--- a/indra/newview/skins/default/xui/es/floater_my_outfits.xml
+++ b/indra/newview/skins/default/xui/es/floater_my_outfits.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_my_outfits.xml" title="Mis Vestuarios">
-	<inventory_panel name="my_outfits" start_folder="My Outfits"/>
+	<inventory_panel name="my_outfits"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_toolbar_prefs.xml b/indra/newview/skins/default/xui/es/floater_toolbar_prefs.xml
index e2ac03770..a4740038f 100644
--- a/indra/newview/skins/default/xui/es/floater_toolbar_prefs.xml
+++ b/indra/newview/skins/default/xui/es/floater_toolbar_prefs.xml
@@ -80,7 +80,7 @@
   <check_box label="Hacer Vestuario" name="make_outfit_btn"/>
   <check_box label="Vestuarios" name="outfits_btn"/>
   <check_box label="Favoritos" name="favs_btn"/>
-  <check_box label="Buzón de Salida" name="outbox_btn"/>
+  <check_box label="Artículos del Mercado" name="marketplace_listings_btn"/>
   <check_box label="Preferencias" name="preferences_btn"/>
   <check_box label="Configuración Joystick" name="joystick_btn"/>
   <check_box label="Reemplazo Automático" name="auto_replace_btn"/>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index c485a8232..2992075de 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="Popup">
+	<menu_item_call label="Crear artículos" name="Marketplace Create Listing"/>
+	<menu_item_call label="Asociar artículos" name="Marketplace Associate Listing"/>
+	<menu_item_call label="Obener (Actualizar) artículos" name="Marketplace Get Listing"/>
+	<menu_item_call label="Comprobar errores" name="Marketplace Check Listing"/>
+	<menu_item_call label="Editar artículos" name="Marketplace Edit Listing"/>
+	<menu_item_call label="Incluir en la Lista" name="Marketplace List"/>
+	<menu_item_call label="Retirar de la Lista" name="Marketplace Unlist"/>
+	<menu_item_call label="Activar" name="Marketplace Activate"/>
+	<menu_item_call label="Desactivar" name="Marketplace Deactivate"/>
+	<menu_item_call label="Copiar ID del artículo" name="Marketplace Copy ID"/>
 	<menu_item_call name="Task Buy" label="Comprar"/>
 	<menu_item_call name="Task Open" label="Abrir"/>
 	<menu_item_call name="Task Play" label="Reproducir"/>
@@ -93,8 +103,8 @@
 	<menu_item_call name="Detach From Yourself" label="Quitarse"/>
 	<menu_item_call name="Wearable Edit" label="Editar"/>
 	<menu_item_call name="Take Off" label="Quitarse"/>
-	<menu_item_call name="Merchant Copy" label="Copiar al Buzón de Salida del Comerciante"/>
-	<menu_item_call name="Marketplace Send" label="Enviar al Mercado en Línea"/>
+	<menu_item_call label="Copiar en artículos del Mercado" name="Marketplace Copy"/>
+	<menu_item_call label="Mover a artículos del Mercado" name="Marketplace Move"/>
 	<menu_item_call label="Compartir" name="Share"/>
 	<menu_item_call name="--no options--" label="--sin opciones--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_marketplace_view.xml b/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
new file mode 100644
index 000000000..f0cfa051c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="menu_marketplace_sort">
+    <menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+    <menu_item_check label="Ordenar por más reciente" name="sort_by_recent"/>
+    <menu_item_check label="Ordenar por cantidad en stock (de baja a alta)" name="sort_by_stock_amount"/>
+    <menu_item_check label="Mostrar solamente las carpetas de artículos" name="show_only_listing_folders"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 09c96b1fd..8185b0237 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -126,7 +126,7 @@
 		<menu_item_call label="Liberar Teclas" name="Release Keys"/>
 		<menu_item_call label="Historial de la Cuenta..." name="Account History..."/>
 		<menu_item_call label="Administrar mi Cuenta..." name="Manage My Account..."/>
-        <menu_item_check label="Buzón de Salida de Comerciante..." name="MerchantOutbox"/>
+        <menu_item_check label="Artículos del Mercado..." name="MarketplaceListings"/>
 		<menu_item_call label="Comprar [CURRENCY]..." name="Buy and Sell L$..."/>
         <menu_item_call label="Mis Vestuarios" name="My Outfits"/>
         <menu_item_call label="Favoritos" name="Favorites"/>
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings.xml
new file mode 100644
index 000000000..9f0c50817
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Mercado" name="Marketplace Panel">
+	<panel name="tool_panel">
+		<button name="sort_btn" label="" tool_tip="Opciones de vista/orden"/>
+		<button name="add_btn" tool_tip="Crear una carpeta de artículos nueva"/>
+		<button name="audit_btn" label="Comprobar errores" tool_tip="Comprobar tus artículos del Mercado"/>
+	</panel>
+	<panel name="tab_container_panel">
+		<filter_editor label="Filtrar artículos del Mercado" name="filter_editor"/>
+		<tab_container name="marketplace_filter_tabs">
+			<inventory_panel label="Todos" name="All Items"/>
+			<inventory_panel label="Activos" name="Active Items"/>
+			<inventory_panel label="Inactivos" name="Inactive Items"/>
+			<inventory_panel label="Sin Asociar" name="Unassociated Items"/>
+		</tab_container>
+	</panel>
+	<panel name="marketplace_drop_zone">
+		<text>
+			Arrastra y suelta carpetas aquí para crear nuevos artículos
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings_inventory.xml
new file mode 100644
index 000000000..95d00cd99
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel label="Todos" name="All Items" tool_tip="Arrastra y suelta aquí los artículos para incluirlos en la lista de artículos"/>
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings_listed.xml
new file mode 100644
index 000000000..d6466e89a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings_listed.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel label="Incluidos en la lista" name="Active Items"/>
+
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings_unassociated.xml
new file mode 100644
index 000000000..c1b0d72a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings_unassociated.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel label="Sin Asociar" name="Unassociated Items"/>
+
diff --git a/indra/newview/skins/default/xui/es/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/es/panel_marketplace_listings_unlisted.xml
new file mode 100644
index 000000000..8232ebbc3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_marketplace_listings_unlisted.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel label="Retirados de la lista" name="Inactive Items"/>
+