Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer

indra/newview/skins/default/xui/es/floater_merchant_outbox.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="floater_merchant_outbox" title="Buzón de Salida de Comerciante">
+	<string name="OutboxFolderCount0">Sin Carpetas</string>
+	<string name="OutboxFolderCount1">1 Carpeta</string>
+	<string name="OutboxFolderCountN">[NUM] Carpetas</string>
+	<string name="OutboxImporting">Enviando Carpetas...</string>
+	<string name="OutboxInitializing">Inicializando...</string>
+	<!--panel
+      name="panel_1 this panel killed xui names, for some reason"
+      follows="all"
+      layout="topleft"
+      left="0"
+      top="0"
+      label=""
+      height="440"
+      width="333"-->
+	<panel name="outbox_inventory_placeholder_panel">
+		<text name="outbox_inventory_placeholder_title">
+			Cargando...
+		</text>
+	</panel>
+	<panel name="panel_2">
+		<panel name="outbox_generic_drag_target">
+			<text name="text_1">
+				Arrastra los Ítems aquí para crear las carpetas
+			</text>
+		</panel>
+		<button label="Enviar al Mercado" tool_tip="Poner en el escaparate de mi Tienda en el Mercado" name="outbox_import_btn"/>
+	</panel>
+	<text name="import_progress_indicator" left="180">
+		Importación en progreso
+	</text>
+	<!--/panel-->
+</floater>

indra/newview/skins/default/xui/es/floater_region_debug_console.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="region_debug_console" title="Depurador de la Región">
+</floater>

indra/newview/skins/default/xui/es/panel_outbox_inventory.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="Arrastra y suelta aquí los ítems para prepararlos para la venta en el escaparate de tu Tienda">
+</outbox_inventory_panel>