diff --git a/indra/newview/skins/default/xui/es/floater_instant_message_group.xml b/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
index 6159f07e6..fd8143cc4 100644
--- a/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
@@ -32,10 +32,10 @@
 	</string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
-			<button label="Info del Grupo" name="group_info_btn"/>
+			<button label="Info del Grupo" name="group_info_btn" width="100"/>
+			<button label="Historial" name="history_btn" left_delta="100"/>			
 			<button label="Unirse" name="start_call_btn"/>
 			<button label="Finalizar" name="end_call_btn"/>
-			<button label="Historial" name="history_btn"/>
 			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulsa aquí para mostrar/ocultar la lista de participantes activos en esta sesión de MI."/>
 			<button label="Enviar" name="send_btn"/>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/es/floater_mute.xml b/indra/newview/skins/default/xui/es/floater_mute.xml
index 1724896d9..55b4f2f6b 100644
--- a/indra/newview/skins/default/xui/es/floater_mute.xml
+++ b/indra/newview/skins/default/xui/es/floater_mute.xml
@@ -3,7 +3,7 @@
   <name_list name="mutes" tool_tip="Lista de residentes ignorados actualmente">
     <column label="Nombre" name="name" tool_tip="Nombre"/>
   </name_list>
-	<button label="Residente Ignorado..." label_selected="Residente Ignorado..." name="Mute resident..." tool_tip="Selecciona un residente para ignorar" />
+	<button label="Ignorar Residente..." label_selected="Ignorar Residente..." name="Mute resident..." tool_tip="Selecciona un residente para ignorar" />
 	<button label="Ignorar objeto por su nombre..." label_selected="Ignorar objeto por su nombre..." name="Mute object by name..."/>
 	<button label="No Ignorar" label_selected="No Ignorar" name="Unmute" tool_tip="Quitar un residente u objeto de la lista de ignorados" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
index 7d296d79c..3702fa168 100644
--- a/indra/newview/skins/default/xui/es/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/es/floater_post_process.xml
@@ -6,19 +6,19 @@
 			<text name="ColorFilterGammaText">
 				Gama
 			</text>
-			<slider label="" name="gamma" />
+			<slider name="gamma"/>
 			<text name="ColorFilterBrightnessText">
 				Brillo
 			</text>
-			<slider label="" name="brightness" />
+			<slider name="brightness"/>
 			<text name="ColorFilterSaturationText">
 				Saturación
 			</text>
-			<slider label="" name="saturation"/>
+			<slider name="saturation"/>
 			<text name="ColorFilterContrastText">
 				Contraste
 			</text>
-			<slider label="" name="contrast"/>
+			<slider name="contrast"/>
 			<text name="ColorFilterBaseText">
 				Color base del contraste
 			</text>
@@ -27,29 +27,115 @@
 			<slider label="B" name="contrast_base[2]"/>
 			<slider label="I" name="contrast_base[3]"/>
 		</panel>
-		<panel label="Desenfoque Gaussiano" name="GaussBlurPanel">
-			<check_box label="Activar" name="enable_gauss_blur"/>
-			<text name="GaussBlurPassesText">
+		<!-- ============================= -->
+		<panel label="Desenfoque Gaussiano" name="GaussBlurPanel" width="498">
+			<check_box label="Activar" name="enable_gauss_blur" left="14"/>
+			<text name="GaussBlurPassesText" left="20">
 				Pasos a aplicar
 			</text>
-			<slider label="" name="gauss_blur_passes"/>
+			<slider name="gauss_blur_passes" left="24"/>
 		</panel>
-		<panel label="Visión Nocturna" name="NightVisionPanel">
-			<check_box label="Activar" name="enable_night_vision"/>
-			<text name="NightVisionBrightMultText">
+		<!-- ============================= -->		
+		<panel label="Visión Nocturna" name="NightVisionPanel"  width="498">
+			<check_box label="Activar" name="enable_night_vision" left="14"/>
+			<text name="NightVisionBrightMultText" left="20">
 					Amplificación Múltiple de luz
 			</text>
-			<slider label="" name="brightness_multiplier"/>
-			<text name="NightVisionNoiseSizeText">
+			<slider label="" name="brightness_multiplier" left="24"/>
+			<text name="NightVisionNoiseSizeText" left="20">
 				Tamaño del Ruido
 			</text>
-			<slider label="" name="noise_size"/>
-			<text name="NightVisionNoiseStrengthText">
+			<slider label="" name="noise_size" left="24"/>
+			<text name="NightVisionNoiseStrengthText" left="20">
 					Fuerza del Ruido
 			</text>
-			<slider label="" name="noise_strength"/>
+			<slider label="" name="noise_strength" left="24"/>
 		</panel>
-		<panel label="Extras" name="Extras">
+		<!-- ============================= -->
+		<panel label="Posterizado" name="PosterizePanel" width="498">
+			<check_box label="Activar" left="14" name="enable_posterize"/>
+			<text left="10" name="PosterLayersText">
+				Número de Capa
+			</text>
+			<slider left="24" name="posterize_layers"/>
+		</panel>
+		<!-- ============================= -->		
+		<panel height="484" label="Desenfoque de Movimiento" name="MotionBlurPanel" width="498">
+			<check_box label="Activar" left="14" name="enable_motionblur"/>
+			<text left="20" name="MotionBlurText">
+		  		Intensidad desenfoque
+			</text>
+			<slider left="24" name="blur_strength"/>
+		</panel>
+		<!-- ============================= -->				
+		<panel label="Viñeta" name="VignettePanel" width="498">
+			<check_box label="Activar" left="14" name="enable_vignette"/>
+			<text left="20" name="VignetteStrengthText">
+				Intensidad
+			</text>
+			<slider left="24" name="vignette_strength"/>
+			<text left="20" name="VignetteRadiusText">
+				Radio
+			</text>
+			<slider left="24" name="vignette_radius"/>
+			<text left="20" name="VignetteDarknessText">
+				Oscuridad
+			</text>
+			<slider left="24" name="vignette_darkness"/>
+			<text left="20" name="VignetteDesaturateText">
+				Intensidad de Desaturación
+			</text>
+			<slider left="24" name="vignette_desaturation"/>
+			<text left="20" name="VignetteChormaticAberrationText">
+				Aberración Cromática
+			</text>
+			<slider left="24" name="vignette_chromatic_aberration"/>
+		</panel>
+		<!-- ============================= -->		
+		<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+			 label="Bloom" left="1" mouse_opaque="true"
+			 name="BloomPanel" width="398">
+			<check_box control_name="BloomToggle" follows="left|top"
+				 font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+				 left="4" mouse_opaque="true" name="BloomToggle" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				 bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+				 font="SansSerif" h_pad="0" halign="left" height="16"
+				 left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
+				 width="355">
+				Luminosity Extraction
+			</text>
+			<slider bottom_delta="-35" can_edit_text="true" control_name="BloomExtract"
+				 decimal_digits="3" follows="left" height="18" increment="0.01"
+				 initial_val="0.9" label="" left="14" max_val="1" min_val="0" val_width="41"
+				 mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
+				 width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				 bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				 font="SansSerif" h_pad="0" halign="left" height="16"
+				 left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
+				Bloom Size
+			</text>
+			<slider bottom_delta="-35" can_edit_text="true" control_name="BloomSize"
+				 decimal_digits="3" follows="left" height="18" increment="0.01"
+				 initial_val="3.0" label="" left="14" max_val="20" min_val="0" val_width="41"
+				 mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
+				 width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				 bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				 font="SansSerif" h_pad="0" halign="left" height="16"
+				 left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
+				 width="355">
+				Bloom Strength
+			</text>
+			<slider bottom_delta="-35" can_edit_text="true" control_name="BloomStrength"
+				 decimal_digits="3" follows="left" height="18" increment="0.01"
+				 initial_val="1.2" label="" left="14" max_val="10" min_val="0" val_width="41"
+				 mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
+				 width="200" />
+		 </panel>-->
+		<!-- ============================= -->		
+		<panel label="Extras" name="Extras" width="498">
 			<combo_box name="PPEffectsCombo"/>
 			<line_editor label="Nombre del Efecto" name="PPEffectNameEditor"/>		
 			<button label="Cargar Efecto" label_selected="Cargar Efecto" name="PPLoadEffect"/>
diff --git a/indra/newview/skins/default/xui/es/floater_radar.xml b/indra/newview/skins/default/xui/es/floater_radar.xml
index 8e6dd3714..32bad7e50 100644
--- a/indra/newview/skins/default/xui/es/floater_radar.xml
+++ b/indra/newview/skins/default/xui/es/floater_radar.xml
@@ -21,14 +21,13 @@
 			<button name="offer_btn" label="Ofrecer TP" tool_tip="Ofrecer Teleporte"/>
 			<button name="teleport_btn" label="TP a" tool_tip="Teleportarse a la posición del avatar"/>			
 			<!-- lower middle row-->
-			<button name="mark_btn" label="(No)Marcar" tool_tip="Marca/Desmarca a este avatar de la lista"/>
+			<button name="mark_btn" label="(Des)Marcar" tool_tip="Marca/Desmarca a este avatar de la lista"/>
 			<button name="prev_marked_btn" label="Marcado Ant." tool_tip="Enfoca la cámara en el avatar marcado previo de la lista"/>
 			<button name="next_marked_btn" label="Marcado Sig." tool_tip="Enfoca la cámara en el avatar marcado siguiente de la lista"/>
 			<!-- lower row-->
 			<button name="focus_btn" label="Foco" tool_tip="Enfoca la cámara en este avatar de la lista"/>
 			<button name="prev_in_list_btn" label="Anterior" tool_tip="Enfoca la cámara en el anterior avatar de la lista"/>
 			<button name="next_in_list_btn" label="Siguiente" tool_tip="Enfoca la cámara en el siguiente avatar de la lista"/>
-
 		</panel>
 
 		<panel label="Alertas" name="alerts_tab">
@@ -44,15 +43,15 @@
 		</panel>
 
 		<panel label="Moderación" name="land_tab">
-			
 			<!-- Upper row -->
 			<button name="mute_btn" label="(No)Ignorar" tool_tip="Ignorar o dejar de ignorar a este avatar (los nombre de los avatares ignorados se resaltan en rojo en la lista)."/>
 			<button name="freeze_btn" label="Congelar" tool_tip="Congelar al avatar, para evitar que se pueda mover"/>
-			<button name="ar_btn" label="AR" tool_tip="Enviar un Reporte de Abuso sobre este avatar"/>
+			<button name="ar_btn" label="Denunciar" tool_tip="Enviar un Reporte de Abuso sobre este avatar"/>
 			<!-- Lower row -->
 			<button name="eject_btn" label="Expulsar" tool_tip="Expulsar a este avatar de la parcela"/>
-			
 			<button name="estate_eject_btn" label="Expulsar del Estado" tool_tip="Expulsar a este avatar del estado"/>
+			<!-- Lowest row -->
+			<button name="estate_ban_btn" label="Expulsar y Prohibir en el Estado" tool_tip="Expulsa y prohibe en el Estado a este avatar"/>			
 		</panel>
 
 		<panel label="Opciones" name="options_tab">
@@ -76,12 +75,10 @@
 			<button name="send_keys_btn" label="Anunciar Ahora" tool_tip="Envia todas las keys al HUD ahora"/>
 		</panel>
 	</tab_container>
-	<string name="template">[NAME] [ACTION] [RANGE].</string>
-	<!-- [ACTION] -->
+	<!-- [ACTION] -->	
 	<string name="has_entered">ha entrado en</string>
 	<string name="has_left">se ha retirado de</string>
-	<!-- [RANGE] -->
-	<string name="the_sim">el sim</string>
+	<string name="the_sim">este sim</string>
 	<string name="draw_distance">la distancia de dibujo</string>
 	<string name="shout_range">la distancia de grito</string>
 	<string name="chat_range">la distancia de chat</string>	
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index 4715df69b..92df07ce8 100644
--- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_report_abuse" title="Reportar Abuso">
+    <string name="Screenshot">
+        Captura de Pantalla
+    </string>
 	<texture_picker label="" name="screenshot"/>
 	<check_box label="Incluir captura" name="screen_check"/>
 	<text name="reporter_title">
@@ -41,7 +44,7 @@
 			Seleccionar categoría
 		</combo_item>
 		<combo_item name="Age__Age_play">
-			Edad > Jugar a se niño
+			Edad > Jugar a ser niño
 		</combo_item>
 		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
 			Edad > Residente adulto en Teen Second Life
@@ -78,7 +81,7 @@
 			Alterar la Paz > Objetos basura
 		</combo_item>
 		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Alterar la Paz > Spam (Mensajes no solicitados) repetitivo
+			Alterar la Paz > Spam (Mensajes no solicitados) reiterado
 		</combo_item>
 		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
 			Alterar la Paz > Publicidad no deseada
@@ -96,7 +99,7 @@
 			Fraude > US$
 		</combo_item>
 		<combo_item name="Ridiculous3">
-			Freud > Un usuario a manifestado interes en su madre
+			Freud > Un usuario ha manifestado interes en su madre
 		</combo_item>
 		<combo_item name="Harassment__Advert_farms___visual_spam">
 			Acoso > Anuncios múltiples / spam visual
@@ -117,7 +120,7 @@
 			Acoso > Abuso verbal
 		</combo_item>
 		<combo_item name="Ridiculous1">
-			Acoso > El usuario se lame los dedos y me toca
+			Acoso > El usuario se lame los dedos y luego me toca
 		</combo_item>
 		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
 			Indecencia > En general, contenido o conducta ofensivos
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 100bd97f5..7b8941017 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -9,16 +9,17 @@
 	<text name="unknown">
 		Medidas: [DIMENSIONS]
 	</text>
-	<button label="Predeterminda" label_selected="Predeterminada" name="Default"/>
+	<button label="Predeterminada" label_selected="Predeterminada" name="Default"/>
 	<button label="Alfa" label_selected="Alfa" name="Alpha"/>
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<button label="Invisible" label_selected="Invisible" name="Invisible"/>
+	<button label="Ninguna" label_selected="Ninguna" name="None"/>	
 	<check_box label="Mostrar Carpetas" name="show_folders_check"/>
 	<check_box label="Aplicar inmediatamente" name="apply_immediate_check"/>
 	<button label="" label_selected="" name="Pipette"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 	<button label="Seleccionar" label_selected="Seleccionar" name="Select"/>
-	<button label="Aplciar UUID" label_selected="Aplicar UUID" name="ApplyUUID"/>
+	<button label="Aplicar UUID" label_selected="Aplicar UUID" name="ApplyUUID"/>
 	<string name="pick title">
 		Seleccionar:
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index fe4683435..54a153485 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -45,7 +45,9 @@
 	<check_box label="Estirar ambos lados" name="checkbox uniform"/>
 	<check_box label="Estirar Texturas" name="checkbox stretch textures"/>
 	<check_box label="Limitar dist. Arrastre" name="checkbox limit drag distance"/>
-	<check_box label="Usar Cuadrícula" name="checkbox snap to grid"/>
+	<check_box label="Editar Ejes Raíz" name="checkbox actual root"/>
+	<check_box label="Mostrar Resaltado" name="checkbox show highlight"/>
+	<check_box label="Usar Cuadrícula" name="checkbox snap to grid"/>	
 	<button label="Opciones..." label_selected="Opciones..." name="Options..."/>
 
 <!-- Help text -->
@@ -245,10 +247,10 @@
 				No puedes modificar estos objetos.
 			</string>
 			<string name="text modify info 5">
-				You can't modify this object across a region boundary
+				No puedes modificar este objeto a través de un límite de región
 			</string>
 			<string name="text modify info 6">
-				You can't modify these objects across a region boundary
+				No puedes modificar estos objetos a través de un límite de región
 			</string>			
 			<string name="text modify warning">
 				Debes seleccionar todo el objeto para definir los permisos.
@@ -273,8 +275,8 @@
 <!-- Object sub-tab -->
 
 		<panel label="Objeto" name="Object">
-			<button label="Enlazar" name="link_obj"  tool_tip="Él llega a la ciudad..."/>
-			<button label="Desenlazar" name="unlink_obj" tool_tip="Deselnzar el conjunto enlazado"/>
+			<button label="Enlazar" name="link_obj"  tool_tip="Él llega a la ciudad... (Enlazar seleccionados)"/>
+			<button label="Desenlazar" name="unlink_obj" tool_tip="Desenlazar el conjunto enlazado"/>
 			<check_box label="Bloqueado" name="checkbox locked" tool_tip="Previene que el objeto sea movido o borrado. Suele ser útil mientras se construye, para prevenir que se modifique sin querer."/>
 			<check_box label="Material" name="Physical Checkbox Ctrl" tool_tip="Permite que el objeto pueda ser empujado y le afecte la gravedad."/>
 			<check_box label="Temporal" name="Temporary Checkbox Ctrl" tool_tip="Hace que el objeto se borre 1 minuto después de su creación."/>
@@ -393,7 +395,7 @@
 					Prisma de Prueba
 				</combo_item>
 				<combo_item name="Test Hemicylinder">
-					Hemicilindro de Prueba
+					Semicilindro de Prueba
 				</combo_item>
 			</combo_box>
 			<text name="text cut">
@@ -464,8 +466,8 @@
 			<text name="text revolutions">
 				Giros
 			</text>
-			<texture_picker label="Textura para Sculpt" name="sculpt texture control" tool_tip="Pulsa aquí para elegir una imagenClick to choose a picture"/>
-			<check_box label="Espejo" name="sculpt mirror control" tool_tip="Girar el prim sculpt sobre el eje X."/>
+			<texture_picker label="Textura para Sculpt" name="sculpt texture control" tool_tip="Pulsa aquí para elegir una imagen"/>
+			<check_box label="Espejar" name="sculpt mirror control" tool_tip="Girar el prim sculpt sobre el eje X."/>
 			<check_box label="Dentro-Fuera" name="sculpt invert control" tool_tip="Invertir los valores de los prims sculpted, haciendo aparecer fuera lo de dentro."/>
 			<text name="label sculpt type">
 				Tipo de Unión
@@ -507,15 +509,15 @@
 			<text name="edit_object">
 				Editar Características del Objeto
 			</text>
-			<check_box label="Flexibilidad" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que el objeto sea flexible en el eje Z . (Sólo del lado del Client"/>
+			<check_box label="Flexibilidad" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que el objeto sea flexible en el eje Z . (Sólo del lado del Cliente"/>
 			<spinner label="Blandura" name="FlexNumSections"/>
 			<spinner label="Gravedad" name="FlexGravity"/>
 			<spinner label="Fricción" name="FlexFriction"/>
 			<spinner label="Viento" name="FlexWind"/>
 			<spinner label="Tensión" name="FlexTension"/>
-			<spinner label="Fuerza en X" name="FlexForceX"/>
-			<spinner label="Fuerza en Y" name="FlexForceY"/>
-			<spinner label="Fuerza en Z" name="FlexForceZ"/>
+			<spinner label="Fuerza X" name="FlexForceX"/>
+			<spinner label="Fuerza Y" name="FlexForceY"/>
+			<spinner label="Fuerza Z" name="FlexForceZ"/>
 			<check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Hace que el objeto emita luz"/>
 			<text name="label color">
 				Color
@@ -526,11 +528,11 @@
 			<color_swatch label="" name="colorswatch" tool_tip="Pulsa aqui para abrir el selector de color"/>
 			
 			<texture_picker label="" name="light texture control" tool_tip="Pulsa para escoger una proyección de imagen (sólo tiene efecto con el renderizado diferido activado"/>
-			<spinner label="Intensidad" name="Light Intensity"/>
-			<spinner label="CDV" name="Luz CDV" />
-			<spinner label="Radio" name="Light Radius"/>
+			<spinner label="Intensidad" name="Light Intensity" label_width="55"/>
+			<spinner label="CDV" name="Light FOV"/>
+			<spinner label="Radio" name="Light Radius" label_width="55/>
 			<spinner label="Visión" name="Light Focus"/>
-			<spinner label="Atenuación" name="Light Falloff"/>
+			<spinner label="Atenuación" name="Light Falloff" label_width="55/>
 			<spinner label="Ambiente" name="Light Ambiance"/>
 			<text name="label physicsshapetype">
                 Tipo de Forma Física:
@@ -676,7 +678,7 @@
 				Parámetros 
 de Textura
 			</text>
-			<button label="Copiar" tool_tip="Copiar Parámetros de Textura al Portapapeles"/>
+			<button label="Copiar" name="copytextures" tool_tip="Copiar Parámetros de Textura al Portapapeles"/>
 	  		<button label="Pegar" name="pastetextures" tool_tip="Pegar Parámetros de Textura desde el Portapapeles"/>
     	</panel>
     	<panel label="Contenido" name="Contents">
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index 9ef5e9719..f6d662887 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -49,8 +49,10 @@
 	<menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID"/>
 	<menu_item_call name="Reupload..." label="Resubir..."/>
 	<menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID"/>
+	<menu_item_call name="Cut" label="Cortar"/>
 	<menu_item_call name="Copy" label="Copiar"/>
 	<menu_item_call name="Paste" label="Pegar"/>
+	<menu_item_call name="Paste As Copy" label="Pegar como Copia"/>	
 	<menu_item_call name="Paste As Link" label="Pegar como Link"/>
 	<menu_item_call name="Restore to Last Position" label="Restaurar en el mundo"/>
 	<menu_item_call name="Remove Link" label="Borrar Link"/>
@@ -78,7 +80,7 @@
 	<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 Merchant Outbox"/>
-	<menu_item_call name="Marketplace Send" label="Enviar a Marketplace"/>
+	<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 name="--no options--" label="--sin opciones--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_avatar.xml b/indra/newview/skins/default/xui/es/menu_pie_avatar.xml
index b998bf896..bca1e64b6 100644
--- a/indra/newview/skins/default/xui/es/menu_pie_avatar.xml
+++ b/indra/newview/skins/default/xui/es/menu_pie_avatar.xml
@@ -1,63 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Avatar Pie">
-	<menu_item_call label="Perfil..." name="Profile...">
-		<on_click function="ShowAgentProfile" userdata="hit object" />
-	</menu_item_call>
-	<menu_item_call  label="Silenciar"  name="Avatar Mute">
-		<on_click function="Avatar.Mute" />
-		<on_enable function="Avatar.EnableMute" />
-	</menu_item_call>
-	<menu_item_call label="Ir a"  name="Go To">
-		<on_click function="GoToObject" />
-	</menu_item_call>
-  <menu_item_call label="Denunciar..." name="abuse">
-    <on_click function="Avatar.ReportAbuse" />
-  </menu_item_call>
-	<menu_item_call label="Añadir como Amigo..." name="Add Friend">
-		<on_click function="Avatar.AddFriend" />
-		<on_enable function="Avatar.EnableAddFriend" />
-	</menu_item_call>
-	<menu_item_call label="Pagar..." name="Pay...">
-		<on_click function="PayObject" />
-		<on_enable function="EnablePayObject" />
-	</menu_item_call>
+	<menu_item_call label="Perfil..." name="Profile..."/>
+	<menu_item_call  label="Silenciar" name="Avatar Mute"/>
+	<menu_item_call label="Ir a" name="Go To"/>
+	<menu_item_call label="Denunciar..." name="abuse"/>
+	<menu_item_call label="Añadir como Amigo..." name="Add Friend"/>
+	<menu_item_call label="Pagar..." name="Pay..."/>
 	<pie_menu label="Más &gt;" name="More &gt;">
-		<menu_item_call label="Congelar..." name="Freeze...">
-			<on_click function="Avatar.Freeze" />
-			<on_enable function="Avatar.EnableFreezeEject" />
-		</menu_item_call>
-		<menu_item_call label="Dar Tarjeta" name="Give Card">
-			<on_click function="Avatar.GiveCard" />
-		</menu_item_call>
-		<menu_item_call label="Invitar a Grupo..." name="Invite...">
-			<on_click function="Avatar.InviteToGroup" />
-		</menu_item_call>
+		<menu_item_call label="Congelar..." name="Freeze..."/>
+		<menu_item_call label="Dar Tarjeta" name="Give Card"/>
+		<menu_item_call label="Invitar a Grupo..." name="Invite..."/>
 		<pie_menu label="Herramientas &gt;" name="Tools &gt;">
-			<menu_item_call  label="S. Count" name="ScriptCount">
-				<on_click function="Object.ScriptCount" />
-				<on_visible function="Object.VisibleScriptCount" />
-			</menu_item_call>
-			<menu_item_call label="Copiar UUID" name="CopyUUID">
-				<on_click function="Avatar.CopyUUID" />
-			</menu_item_call>
-			<menu_item_call label="ID Cliente" name="ClientID">
-				<on_click function="Avatar.ClientID" />
-			</menu_item_call>
-			<menu_item_call label="Derender" name="Derender">
-				<on_click function="Object.DERENDER" />
-			</menu_item_call>
+			<menu_item_call label="Copiar UUID" name="CopyUUID"/>
+			<menu_item_call label="ID Cliente" name="ClientID"/>
+			<menu_item_call label="Derenderizar" name="Derender"/>
+			<menu_item_call label="Recargar" name="Reload Textures"/>
 		</pie_menu>
-		<menu_item_call label="Expulsar..." name="Eject...">
-			<on_click function="Avatar.Eject" />
-			<on_enable function="Avatar.EnableFreezeEject" />
-		</menu_item_call>
-		<menu_item_separator />
-		<menu_item_call label="Examinar" name="Object Inspect">
-			<on_click function="Object.Inspect" />
-			<on_enable function="Object.EnableInspect" />
-		</menu_item_call>
+		<menu_item_call label="Expulsar..." name="Eject..."/>
+		<menu_item_call label="Examinar" name="Object Inspect"/>
 	</pie_menu>
-	<menu_item_call label="Enviar IM..." name="Send IM...">
-		<on_click function="Avatar.SendIM" />
-	</menu_item_call>
+	<menu_item_call label="Enviar IM..." name="Send IM..."/>
 </pie_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_object.xml b/indra/newview/skins/default/xui/es/menu_pie_object.xml
index c0ed80232..63a60c7d5 100644
--- a/indra/newview/skins/default/xui/es/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_pie_object.xml
@@ -1,101 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Object Pie">
-	<menu_item_call label="Abrir" name="Open">
-		<on_click function="Object.Open" />
-		<on_enable function="Object.EnableOpen" />
-	</menu_item_call>
-	<menu_item_call label="Crear" name="Create">
-		<on_click function="Object.Build" />
-		<on_enable function="EnableEdit" />
-	</menu_item_call>
-	<menu_item_call label="Tocar" name="Object Touch">
-		<on_click function="Object.Touch" />
-		<on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
-	</menu_item_call>
-	<menu_item_call label="Sentarse" name="Object Sit">
-		<on_click function="Object.SitOrStand" />
-		<on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" name="EnableSitOrStand"/>
-	</menu_item_call>
-	<menu_item_call label="Recoger" name="Pie Object Take">
-		<on_click function="Tools.BuyOrTake" />
-		<on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" name="EnableBuyOrTake"/>
-	</menu_item_call>
-	<menu_item_call label="Pagar..." name="Pay...">
-		<on_click function="PayObject" />
-		<on_enable function="EnablePayObject" />
-	</menu_item_call>
+	<menu_item_call label="Abrir" name="Open"/>
+	<menu_item_call label="Crear" name="Create"/>
+	<menu_item_call label="Tocar" name="Object Touch"/>
+	<menu_item_call label="Sentarse" name="Object Sit"/>
+	<menu_item_call label="Recoger" name="Pie Object Take"/>
+	<menu_item_call label="Pagar..." name="Pay..."/>
 	<pie_menu label="Más &gt;" name="More &gt;">
-		<menu_item_call label="Borrar" name="Delete">
-			<on_click function="Object.Delete" />
-			<on_enable function="Object.EnableDelete" />
-		</menu_item_call>
-		<menu_item_call label="Vestirse" name="Wear">
-			<on_click function="Object.AttachToAvatar" />
-			<on_enable function="Object.EnableWear" />
-		</menu_item_call>
-		<menu_item_call label="Recoger una copia" name="Take Copy">
-			<on_click function="Tools.TakeCopy" />
-			<on_enable function="Tools.EnableTakeCopy" />
-		</menu_item_call>
+		<menu_item_call label="Borrar" name="Delete"/>
+		<menu_item_call label="Vestirse" name="Wear"/>
+		<menu_item_call label="Recoger una copia" name="Take Copy"/>
 		<pie_menu label="Anexar HUD &gt;" name="Object Attach HUD" />
 		<pie_menu label="Anexar &gt;" name="Object Attach" />
-		<menu_item_call label="Regresar..." name="Return...">
-			<on_click function="Object.Return" />
-			<on_enable function="Object.EnableReturn" />
-		</menu_item_call>
+		<menu_item_call label="Regresar..." name="Return..."/>
 		<pie_menu label="Más &gt;" name="Rate Menu">
-			<menu_item_separator />
 			<pie_menu label="Herramientas &gt;" name="Rate Menu">
-				<menu_item_call label="Destruir" name="Destroy">
-					<on_click function="Object.Destroy" />
-					<on_enable function="Object.EnableDestroy" />
-				</menu_item_call>
-				<menu_item_call label="Explotar" name="Explode">
-					<on_click function="Object.Explode" />
-					<on_enable function="Object.EnableExplode" />
-				</menu_item_call>
-				<menu_item_call label="Medir" name="Measure">
-					<on_click function="Object.Measure" />
-				</menu_item_call>
-				<menu_item_call label="Información" name="Data">
-					<on_click function="Object.Data" />
-				</menu_item_call>
-				<menu_item_call label="S. Count" name="ScriptCount">
-					<on_click function="Object.ScriptCount" />
-					<on_visible function="Object.VisibleScriptCount" />
-				</menu_item_call>
-				<menu_item_call label="Reiniciar Scripts" name="Reset Scripts" >
-					<on_click function="Tools.SelectedScriptAction" userdata="reset" />
-					<on_enable function="EditableSelected" />
-				</menu_item_call>
-				<menu_item_call label="Exportar" name="Export">
-						<on_click function="Object.Export" />
-						<on_enable function="Object.EnableExport" />
-				</menu_item_call>				
+				<menu_item_call label="Explotar" name="Explode"/>
+				<menu_item_call label="Medir" name="Measure"/>
+				<menu_item_call label="Información" name="Data"/>
+				<menu_item_call label="Contar Scripts" name="ScriptCount"/>
+				<menu_item_call label="Reiniciar Scripts" name="Reset Scripts"/>
+				<menu_item_call label="Exportar" name="Export"/>
 			</pie_menu>
-			<menu_item_call label="Silenciar" name="Object Mute">
-				<on_click function="Object.Mute" />
-				<on_enable function="Object.EnableMute" />
-			</menu_item_call>
-			<menu_item_call label="Examinar" name="Object Inspect">
-				<on_click function="Object.Inspect" />
-				<on_enable function="Object.EnableInspect" />
-			</menu_item_call>
-			<menu_item_call label="Derender" name="Derender">
-				<on_click function="Object.DERENDER" />
-			</menu_item_call>
-			<menu_item_call label="Reportar..." name="Report Abuse...">
-				<on_click function="Object.ReportAbuse" />
-				<on_enable function="Object.EnableReportAbuse" />
-			</menu_item_call>
+			<menu_item_call label="Recargar" name="Reload Textures"/>
+			<menu_item_call label="Silenciar" name="Object Mute"/>
+			<menu_item_call label="Examinar" name="Object Inspect"/>
+			<menu_item_call label="Derenderizar" name="Derender"/>
+			<menu_item_call label="Denunciar..." name="Report Abuse..."/>
 		</pie_menu>
-		<menu_item_call label="Comprar..." name="Buy...">
-			<on_click function="Object.Buy" />
-			<on_enable function="Object.EnableBuy" />
-		</menu_item_call>
+		<menu_item_call label="Comprar..." name="Buy..."/>
 	</pie_menu>
-	<menu_item_call label="Editar..." name="Edit...">
-		<on_click function="Object.Edit" />
-		<on_enable function="EnableEdit" />
-	</menu_item_call>
+	<menu_item_call label="Editar..." name="Edit..."/>
 </pie_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_self.xml b/indra/newview/skins/default/xui/es/menu_pie_self.xml
index 4ef8b18d3..9f452dea3 100644
--- a/indra/newview/skins/default/xui/es/menu_pie_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_pie_self.xml
@@ -1,98 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Self Pie">
-	<menu_item_call label="Perfil..." name="Profile...">
-		<on_click function="ShowAgentProfile" userdata="agent" />
-	</menu_item_call>
-	<menu_item_call label="Grupos..." name="Groups...">
-		<on_click function="ShowAgentGroups" userdata="agent" />
-	</menu_item_call>
+	<menu_item_call label="Perfil..." name="Profile..."/>
+	<menu_item_call label="Grupos..." name="Groups..."/>
 	<pie_menu label="Quitarse &gt;" name="Take Off &gt;">
 		<pie_menu  label="Ropa &gt;" name="Clothes &gt;">
-			<menu_item_call label="Camisa" name="Shirt">
-				<on_click function="Edit.TakeOff" userdata="shirt" />
-				<on_enable function="Edit.EnableTakeOff" userdata="shirt" />
-			</menu_item_call>
-			<menu_item_call label="Pantalones" name="Pants" >
-				<on_click function="Edit.TakeOff" userdata="pants" />
-				<on_enable function="Edit.EnableTakeOff" userdata="pants" />
-			</menu_item_call>
-			<menu_item_call label="Zapatos"  name="Shoes" >
-				<on_click function="Edit.TakeOff" userdata="shoes" />
-				<on_enable function="Edit.EnableTakeOff" userdata="shoes" />
-			</menu_item_call>
-			<menu_item_call blabel="Calcetines" name="Socks" >
-				<on_click function="Edit.TakeOff" userdata="socks" />
-				<on_enable function="Edit.EnableTakeOff" userdata="socks" />
-			</menu_item_call>
-			<menu_item_call label="Chaqueta" name="Jacket" >
-				<on_click function="Edit.TakeOff" userdata="jacket" />
-				<on_enable function="Edit.EnableTakeOff" userdata="jacket" />
-			</menu_item_call>
-			<menu_item_call label="Guantes" name="Gloves" >
-				<on_click function="Edit.TakeOff" userdata="gloves" />
-				<on_enable function="Edit.EnableTakeOff" userdata="gloves" />
-			</menu_item_call>
+			<menu_item_call label="Camisa" name="Shirt"/>
+			<menu_item_call label="Pantalones" name="Pants"/>
+			<menu_item_call label="Zapatos"  name="Shoes"/>
+			<menu_item_call label="Calcetines" name="Socks"/>
+			<menu_item_call label="Chaqueta" name="Jacket"/>
+			<menu_item_call label="Guantes" name="Gloves"/>
 			<pie_menu label="Más &gt;" name="More &gt;">
-				<menu_item_call label="Camiseta" name="Self Undershirt" >
-					<on_click function="Edit.TakeOff" userdata="undershirt" />
-					<on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
-				</menu_item_call>
-				<menu_item_separator />
-				<menu_item_call label="Toda la ropa" name="All Clothes" >
-					<on_click function="Edit.TakeOff" userdata="all" />
-				</menu_item_call>
-				<menu_item_call label="Tatuaje" name="Self Tattoo" >
-					<on_click function="Edit.TakeOff" userdata="tattoo" />
-					<on_enable function="Edit.EnableTakeOff" userdata="tattoo" />
-				</menu_item_call>
-				<menu_item_call label="Alfa" name="Self Alpha" >
-					<on_click function="Edit.TakeOff" userdata="alpha" />
-					<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
-				</menu_item_call>
-				<menu_item_call label="Ropa Interior" name="Self Underpants" >
-					<on_click function="Edit.TakeOff" userdata="underpants" />
-					<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
-				</menu_item_call>
-        <menu_item_call label="Física" name="Self Physics" >
-          <on_click function="Edit.TakeOff" userdata="physics" />
-          <on_enable function="Edit.EnableTakeOff" userdata="physics" />
-        </menu_item_call>
+				<menu_item_call label="Camiseta" name="Self Undershirt"/>
+				<menu_item_call label="Toda la ropa" name="All Clothes"/>
+				<menu_item_call label="Tatuaje" name="Self Tattoo"/>
+				<menu_item_call label="Alfa" name="Self Alpha"/>
+				<menu_item_call label="Ropa Interior" name="Self Underpants"/>
+				<menu_item_call label="Física" name="Self Physics"/>
 			</pie_menu>
-			<menu_item_call label="Falda" name="Skirt" >
-				<on_click function="Edit.TakeOff" userdata="skirt" />
-				<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
-			</menu_item_call>
+			<menu_item_call label="Falda" name="Skirt"/>
 		</pie_menu>
-		<pie_menu label="HUD &gt;" name="Object Detach HUD" />
-		<menu_item_separator />
+		<pie_menu label="HUD &gt;" name="Object Detach HUD"/>
 		<pie_menu enabled="true" label="Quitar &gt;" name="Object Detach" />
-		<menu_item_separator />
-		<menu_item_call label="Quitar todo" name="Detach All">
-			<on_click function="Self.RemoveAllAttachments" userdata="" />
-			<on_enable function="Self.EnableRemoveAllAttachments" />
-		</menu_item_call>
+		<menu_item_call label="Quitar todo" name="Detach All"/>
 	</pie_menu>
-  <pie_menu label="Herramientas &gt;" name="Tools &gt;">
-	  <menu_item_call label="Animaciones..." name="Anims..." >
-		  <on_click function="Avatar.Anims" />
-	  </menu_item_call>
-	  <menu_item_call label="S. Count" name="ScriptCount">
-		  <on_click function="Object.ScriptCount" />
-		  <on_visible function="Object.VisibleScriptCount" />
-	  </menu_item_call>
-    <menu_item_call label="Depurar..." name="Debug Layers">
-      <on_click function="Avatar.Debug" />
-    </menu_item_call>
-    <menu_item_call label="Copiar UUID" name="CopyUUID">
-      <on_click function="Avatar.CopyUUID" />
-    </menu_item_call>
-  </pie_menu>
-  <menu_item_separator />
-	<menu_item_call label="Gestos..." name="Gestures...">
-		<on_click function="ShowFloater" userdata="gestures" />
-	</menu_item_call>
-	<menu_item_call label="Apariencia..." name="Appearance...">
-		<on_click function="ShowFloater" userdata="appearance" />
-		<on_enable function="Edit.EnableCustomizeAvatar" />
-	</menu_item_call>
+	<pie_menu label="Herramientas &gt;" name="Tools &gt;">
+		<menu_item_call label="Animaciones..." name="Anims..."/>
+		<menu_item_call label="Contar Scripts" name="ScriptCount"/>
+		<menu_item_call label="Depurar..." name="Debug Layers"/>
+		<menu_item_call label="Copiar UUID" name="CopyUUID"/>
+	</pie_menu>
+	<menu_item_call label="Gestos..." name="Gestures..."/>
+	<menu_item_call label="Apariencia..." name="Appearance..."/>
 </pie_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index af96c05b7..7d24bc22a 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -1,229 +1,200 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu_bar name="Main Menu">
-	  <menu label="Archivo" name="File">
-			 <menu_item_call label="Imagen ([UPLOADFEE])..." name="Upload Image" ></menu_item_call>
-			 <menu_item_call label="Sonido ([UPLOADFEE])..." name="Upload Sound" ></menu_item_call>
-			 <menu_item_call label="Animación ([UPLOADFEE])..." name="Upload Animation" ></menu_item_call>
-			 <menu_item_call label="Masiva ([UPLOADFEE] por archivo)..." name="Bulk Upload" ></menu_item_call>
-			 <menu_item_call label="Importar XML" name="Import"></menu_item_call>
-			 <menu_item_call label="Importar con Texturas" name="Import2"></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator" />
-			 <menu_item_call label="Definir Permisos por Defecto..." name="perm prefs" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator" />
-			 <menu_item_call label="Cerrar Ventana" name="Close Window" ></menu_item_call>
-			 <menu_item_call label="Cerrar todas las Ventanas" name="Close All Windows" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator2" />
-			 <menu_item_call label="Guardar Vista Previa Como..." name="Save Preview As..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator3" />
-			 <menu_item_call label="Hacer una Foto" name="Take Snapshot" ></menu_item_call>
-			 <menu_item_call label="Guardar Foto" name="Snapshot to Disk" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator4"/>
-			 <menu_item_call label="Salir" name="Quit" ></menu_item_call>
-	  </menu>
-	  <menu label="Editar" name="Edit" >
-			 <menu_item_call label="Deshacer" name="Undo" ></menu_item_call>
-			 <menu_item_call label="Rehacer" name="Redo" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator" />
-			 <menu_item_call label="Cortar" name="Cut" ></menu_item_call>
-			 <menu_item_call label="Copiar" name="Copy" ></menu_item_call>
-			 <menu_item_call label="Pegar" name="Paste" ></menu_item_call>
-			 <menu_item_call label="Borrar" name="Delete" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator2" />
-			 <menu_item_call label="Buscar..." name="Search..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator3" />
-			 <menu_item_call label="Seleccionar Todo" name="Select All" ></menu_item_call>
-			 <menu_item_call label="Deseleccionar" name="Deselect" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator4" />
-			 <menu_item_call label="Duplicar" name="Duplicate" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator5" />
-			 <menu label="Anexar Objeto" name="Attach Object" />
-			 <menu label="Quitarse Objeto" name="Detach Object" />
-			 <menu label="Quitarse Ropas" name="Take Off Clothing" >
-					<menu_item_call label="Camisa" name="Shirt" ></menu_item_call>
-					<menu_item_call label="Pantalones" name="Pants" ></menu_item_call>
-					<menu_item_call label="Zapatos" name="Shoes" ></menu_item_call>
-					<menu_item_call label="Calcetines" name="Socks" ></menu_item_call>
-					<menu_item_call label="Chaqueta" name="Jacket" ></menu_item_call>
-					<menu_item_call label="Guantes" name="Gloves"></menu_item_call>
-					<menu_item_call label="Camiseta" name="Menu Undershirt" ></menu_item_call>
-					<menu_item_call label="Ropa Interior" name="Menu Underpants" ></menu_item_call>
-					<menu_item_call label="Falda" name="Skirt" ></menu_item_call>
-					<menu_item_call label="Tatuaje" name="Tattoo" ></menu_item_call>
-					<menu_item_separator label="-----------" name="separator51" />
-					<menu_item_call label="Alfa" name="Alpha" ></menu_item_call>
-					<menu_item_call label="Física" name="Physics" ></menu_item_call>
-					<menu_item_separator label="-----------" name="separator51" />
-					<menu_item_call label="Toda la Ropa" name="All Clothes" ></menu_item_call>
-			 </menu>
-			 <menu_item_separator label="-----------" name="separator6" />
-			 <menu_item_call label="Gestos..." name="Gestures..." ></menu_item_call>
-			 <menu_item_call label="Perfil..." name="Profile..." ></menu_item_call>
-			 <menu_item_call label="Apariencia..." name="Appearance..." ></menu_item_call>
-			 <menu_item_call label="Nombre a Mostrar..." name="Display Name..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator7" />
-			 <menu_item_check label="Amigos..." name="Friends..." ></menu_item_check>
-			 <menu_item_call label="Grupos..." name="Groups..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator8" />
-			 <menu_item_call label="Preferencias..." name="Preferences..." ></menu_item_call>
-	  </menu>
-	  <menu label="Ver"  name="View" >
-			 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			 <menu_item_call label="Vista Subjetiva" name="Mouselook" ></menu_item_call>
-			 <menu_item_check label="Construir" name="Build" ></menu_item_check>
-			 <menu_item_check label="Flycam del Joystick" name="Joystick Flycam" ></menu_item_check>
-			 <menu_item_call label="Volver a Vista por Defecto" name="Reset View" ></menu_item_call>
-			 <menu_item_call label="Mirar al último que habló" name="Look at Last Chatter" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator" />
-			 <menu_item_check label="Barra de Herramientas" name="Toolbar" ></menu_item_check>
-			 <menu_item_check label="Chat local" name="Chat History" ></menu_item_check>
-			 <menu_item_check label="Comunicarse" name="Instant Message" ></menu_item_check>
-			 <menu_item_check label="Inventario" name="Inventory" ></menu_item_check>
-			 <menu_item_check label="Participantes Activos" name="Active Speakers" ></menu_item_check>
-			 <menu_item_check label="Lista de Ignorados" name="Mute List" ></menu_item_check>
-			 <menu_item_check label="Historial de Teleport" name="Teleport History" ></menu_item_check>
-			 <menu_item_check label="Filtro de Media" name="Media Filter" ></menu_item_check>
-			 <menu_item_separator label="-----------" name="separator2" />
-			 <menu_item_check label="Controles de Cámara" name="Camera Controls" ></menu_item_check>
-			 <menu_item_check label="Controles de Movimiento" name="Movement Controls"></menu_item_check>
-			 <menu_item_check label="Mapa del Mundo" name="World Map" ></menu_item_check>
-			 <menu_item_check label="MiniMapa" name="Mini-Map" ></menu_item_check>
-			 <menu_item_check label="Radar" name="Radar" ></menu_item_check>
-			 <menu_item_separator label="-----------" name="separator3" />
-			 <menu_item_check label="Estadísticas" name="Statistics Bar" ></menu_item_check>
-			 <menu_item_separator label="-----------" name="separator100" />
-			 <menu_item_check label="Búsqueda en Área" name="Area Search" ></menu_item_check>
-			 <menu_item_check label="Límites de Parcelas" name="Property Lines" ></menu_item_check>
-			 <menu_item_check label="Líneas de Prohibición" name="Banlines" ></menu_item_check>
-			 <menu_item_check label="Propietarios del Terreno" name="Land Owners" ></menu_item_check>
-			 <menu_item_separator label="-----------" name="separator4" />
-			 <menu label="Información Adicional" name="Hover Tips" >
-					<menu_item_check label="Mostrar Información Adicional" name="Show Tips" ></menu_item_check>
-					<menu_item_separator label="-----------" name="separator" />
-					<menu_item_check label="Información Adicional del Terreno" name="Land Tips" ></menu_item_check>
-					<menu_item_check label="Información Adicional en Todos los Objetos" name="Tips On All Objects" ></menu_item_check>
-			 </menu>
-			 <menu_item_check label="Realzar Transparencias" name="Highlight Transparent" ></menu_item_check>
-			 <menu_item_check name="beacons" label="Balizas" ></menu_item_check>
-			 <menu_item_check label="Ocultar Partículas" name="Hide Particles" ></menu_item_check>
-			 <menu_item_check label="Mostrar los HUD en uso" name="Show HUD Attachments" ></menu_item_check>
-			 <menu_item_separator label="-----------" name="separator5" />
-			 <menu_item_call label="Acercar Zoom" name="Zoom In" ></menu_item_call>
-			 <menu_item_call label="Zoom Predeterminado" name="Zoom Default" ></menu_item_call>
-			 <menu_item_call label="Alejar Zoom" name="Zoom Out" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator6" />
-			 <menu_item_call label="Pantalla Completa" name="Toggle Fullscreen" ></menu_item_call>
-			 <menu_item_call label="Interfaz en tamaño Predeterminado" name="Set UI Size to Default" ></menu_item_call>
-	  </menu>
-	  <menu label="Mundo" name="World" >
-			 <menu_item_call label="Chat" name="Chat" ></menu_item_call>
-			 <menu_item_check label="Correr Siempre" name="Always Run" ></menu_item_check>
-			 <menu_item_call label="Sentarse en el piso" name="Sit on Ground" ></menu_item_call>
-			 <menu_item_check label="Volar" name="Fly" ></menu_item_check>
-			 <menu_item_separator label="-----------" name="separator" />
-			 <menu_item_call label="Crear un Hito Aquí" name="Create Landmark Here" ></menu_item_call>
-			 <menu_item_call label="Fijar Base Aquí" name="Set Home to Here" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator2" />
-			 <menu_item_call label="Teleport a Base" name="Teleport Home" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator3" />
-			 <menu_item_call label="Falso Estado Ausente" name="Fake Away Status" ></menu_item_call>
-			 <menu_item_call label="Pasar a Estado Ausente" name="Set Away" ></menu_item_call>
-			 <menu_item_call label="Pasar a Estado Ocupado" name="Set Busy" ></menu_item_call>
-			 <menu_item_call label="Detener las animaciones del Avatar" name="Stop Animating My Avatar" ></menu_item_call>
-			 <menu_item_call label="Liberar Teclas" name="Release Keys" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator4" />
-			 <menu_item_call label="Historial de la Cuenta..." name="Account History..." ></menu_item_call>
-			 <menu_item_call label="Administrar mi Cuenta..." name="Manage My Account..." ></menu_item_call>
-			 <menu_item_call label="Comprar [CURRENCY]..." name="Buy and Sell L$..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator5" />
-			 <menu_item_call label="Mi Terreno..." name="My Land..." ></menu_item_call>
-			 <menu_item_call label="Acerca del Terreno..." name="About Land..." ></menu_item_call>
-			 <menu_item_call label="Comprar Terreno..." name="Buy Land..." ></menu_item_call>
-			 <menu_item_call label="Región/Estado..." name="Region/Estate..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator6" />
-			 <menu label="Configuración del Entorno" name="Environment Settings" >
-					<menu_item_call label="Amanecer" name="Sunrise" ></menu_item_call>
-					<menu_item_call label="Mediodía" name="Noon" ></menu_item_call>
-					<menu_item_call label="Atardecer" name="Sunset" ></menu_item_call>
-					<menu_item_call label="Medianoche" name="Midnight" ></menu_item_call>
-					<menu_item_call label="Volver a los valores de la Región" name="Revert to Region Default" ></menu_item_call>
-					<menu_item_separator label="-----------" name="separator" />
-					<menu_item_call label="Editor del Entorno" name="Environment Editor" ></menu_item_call>
-					<menu_item_call label="Editor del Ciclo Diario" name="Day Cycle Editor" ></menu_item_call>
-					<menu_item_call label="Efectos de Post-Procesado" name="Post-Processing Effects" ></menu_item_call>
-			 </menu>
-	  </menu>
-	  <menu label="Herramientas" left="0" name="Tools" >
-			 <menu label="Seleccionar Herramienta" name="Select Tool" >
-					<menu_item_call label="Foco" name="Focus" ></menu_item_call>
-					<menu_item_call label="Mover" name="Move" ></menu_item_call>
-					<menu_item_call label="Editar" name="Edit" ></menu_item_call>
-					<menu_item_call label="Crear" name="Create" ></menu_item_call>
-					<menu_item_call label="Terreno" name="Land" ></menu_item_call>
-			 </menu>
-			 <menu_item_separator label="-----------" name="separator" />
-			 <menu_item_check label="Seleccionar sólo mis Objetos" name="Select Only My Objects" ></menu_item_check>
-			 <menu_item_check label="Seleccionar sólo Objetos movibles" name="Select Only Movable Objects" ></menu_item_check>
-			 <menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding" ></menu_item_check>
-			 <menu_item_check label="Mostrar Esquema de Selección" name="Show Selection Outlines" ></menu_item_check>
-			 <menu_item_check label="Mostrar objetos seleccionados ocultos" name="Show Hidden Selection" ></menu_item_check>
-			 <menu_item_check label="Mostrar radio de luz de la selección" name="Show Light Radius for Selection" ></menu_item_check>
-			 <menu_item_check label="Mostrar rayo indicador" name="Show Selection Beam" ></menu_item_check>
-			 <menu_item_separator label="-----------" name="separator2" />
-			 <menu_item_check label="Ajustar a la cuadrícula" name="Snap to Grid" ></menu_item_check>
-			 <menu_item_call label="Ajustar Objetos a los Ejes XY de la cuadrícula" name="Snap Object XY to Grid" ></menu_item_call>
-			 <menu_item_call label="Usar Seleccionado como cuadrícula" name="Use Selection for Grid" ></menu_item_call>
-			 <menu_item_call label="Opciones de la Cuadrícula..." name="Grid Options..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator3" />
-			 <menu_item_check label="Editar partes enlazadas" name="Edit Linked Parts" ></menu_item_check>
-			 <menu label="Seleccionar partes enlazadas" name="Select Linked Parts" >
-					<menu_item_call label="Seleccionar parte siguiente" name="Select Next Part" ></menu_item_call>
-					<menu_item_call label="Seleccionar Parte  Anterior" name="Select Previous Part" ></menu_item_call>
-					<menu_item_call label="Incluir Parte Siguiente" name="Include Next Part" ></menu_item_call>
-					<menu_item_call label="Incluir Parte Anterior" name="Include Previous Part" ></menu_item_call>
-			 </menu>
-			 <menu_item_call label="Enlazar" name="Link" ></menu_item_call>
-			 <menu_item_call label="Desenlazar" name="Unlink" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator4" />
-			 <menu_item_call label="Foco en la Selección" name="Focus on Selection" ></menu_item_call>
-			 <menu_item_call label="Zoom en lo Seleccionado" name="Zoom to Selection" ></menu_item_call>
-			 <menu_item_call label="Comprar Objeto" name="Menu Object Take" ></menu_item_call>
-			 <menu_item_call label="Agarrar una Copia" name="Take Copy" ></menu_item_call>
-			 <menu_item_call label="Devolver Objeto" name="Return..." ></menu_item_call>
-			 <menu_item_call label="Devolver el Objeto al Contenido de Objetos" name="Save Object Back to Object Contents" ></menu_item_call>
-			 <menu_item_call label="Administrador - Borrar" name="Admin Delete" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator6" />
-			 <menu_item_call label="Mostrar ventana de avisos/errores de Script " name="Show Script Warning/Error Window" ></menu_item_call>
-			 <menu label="Recompilar Scripts de la Selección" name="Recompile Scripts in Selection" >
-					<menu_item_call label="Mono" name="Mono" ></menu_item_call>
-					<menu_item_call label="LSL" name="LSL" ></menu_item_call>
-			 </menu>
-			 <menu_item_call label="Reiniciar Scripts en la Selección" name="Reset Scripts in Selection" ></menu_item_call>
-			 <menu_item_call label="Definir Ejecución de Scripts en la Selección" name="Set Scripts to Running in Selection" ></menu_item_call>
-			 <menu_item_call label="Definir la no ejecución de Scripts en la Selección" name="Set Scripts to Not Running in Selection" ></menu_item_call>
-			 <menu_item_call label="Borrar Scripts en la Selección" name="Remove Scripts in Selection" ></menu_item_call>
-	  </menu>
-	  <menu label="Ayuda" left="227" name="Help" >
-			 <menu_item_call label="Ayuda de Second Life" name="Second Life Help" ></menu_item_call>
-			 <menu_item_call label="Tutorial" name="Tutorial" ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator" />
-			 <menu_item_call label="Blog Oficial de Linden Lab..." name="Official Linden Blog..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator2" />
-			 <menu_item_call label="Portal de Scripting..." name="Scripting Portal..." ></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator3" />
-			 <menu_item_call label="Denunciar Abuso..." name="Report Abuse..." ></menu_item_call>
-			 <menu_item_call label="Choques, Empujones y Golpes..." name="Bumps, Pushes &amp;amp; Hits..." ></menu_item_call>
-			 <menu_item_call label="Medidor de Lag" name="Lag Meter"></menu_item_call>
-			 <menu_item_separator label="-----------" name="separator7" />
-			 <menu label="Informe de Fallos" name="Bug Reporting" >
-					<menu_item_call label="Seguimiento de Problemas Público..." name="Public Issue Tracker..." ></menu_item_call>
-					<menu_item_call label="Ayuda del Seguimiento de Problemas Público..." name="Publc Issue Tracker Help..." ></menu_item_call>
-					<menu_item_separator label="-----------" name="separator7" />
-					<menu_item_call label="Informe de Fallos 101..." name="Bug Reporing 101..." ></menu_item_call>
-					<menu_item_call label="Problemas de Seguridad..." name="Security Issues..." ></menu_item_call>
-					<menu_item_call label="Wiki de QA..." name="QA Wiki..." ></menu_item_call>
-					<menu_item_separator label="-----------" name="separator9" />
-					<menu_item_call label="Informar un Fallo..." name="Report Bug..." ></menu_item_call>
-			 </menu>
-			 <menu_item_call label="Acerca de Singularity..." name="About Second Life..." ></menu_item_call>
-	  </menu>
+	<menu label="Archivo" name="File">
+		<menu_item_call label="Imagen ([UPLOADFEE])..." name="Upload Image"/>
+		<menu_item_call label="Sonido ([UPLOADFEE])..." name="Upload Sound"/>
+		<menu_item_call label="Animación ([UPLOADFEE])..." name="Upload Animation"/>
+		<menu_item_call label="Masiva ([UPLOADFEE] por archivo)..." name="Bulk Upload"/>
+		<menu_item_call label="Importar XML" name="Import"/>
+		<menu_item_call label="Importar con Texturas" name="Import2"/>
+		<menu_item_call label="Definir Permisos por Defecto..." name="perm prefs"/>
+		<menu_item_call label="Cerrar Ventana" name="Close Window"/>
+		<menu_item_call label="Cerrar todas las Ventanas" name="Close All Windows"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Guardar Vista Previa Como..." name="Save Preview As..."/>
+		<menu_item_call label="Guardar Vista Previa Como (PNG)..." name="Save Preview AsPNG..."/>
+		<menu_item_call label="Hacer una Foto" name="Take Snapshot"/>
+		<menu_item_call label="Guardar Foto en Disco" name="Snapshot to Disk"/>
+		<menu_item_call label="Salir" name="Quit"/>
+	</menu>
+	<!-- ======================================== -->
+	<menu label="Editar" name="Edit" >
+		<menu_item_call label="Deshacer" name="Undo"/>
+		<menu_item_call label="Rehacer" name="Redo" />
+		<menu_item_call label="Cortar" name="Cut" />
+		<menu_item_call label="Copiar" name="Copy"/>
+		<menu_item_call label="Pegar" name="Paste"/>
+		<menu_item_call label="Borrar" name="Delete"/>
+		<menu_item_call label="Buscar..." name="Search..."/>
+		<menu_item_call label="Seleccionar Todo" name="Select All"/>
+		<menu_item_call label="Deseleccionar" name="Deselect"/>
+		<menu_item_call label="Duplicar" name="Duplicate"/>
+		<menu label="Anexar Objeto" name="Attach Object"/>
+		<menu label="Quitarse Objeto" name="Detach Object"/>
+		<menu label="Quitarse Ropas" name="Take Off Clothing">
+			<menu_item_call label="Camisa" name="Shirt"/>
+			<menu_item_call label="Pantalones" name="Pants"/>
+			<menu_item_call label="Zapatos" name="Shoes"/>
+			<menu_item_call label="Calcetines" name="Socks"/>
+			<menu_item_call label="Chaqueta" name="Jacket"/>
+			<menu_item_call label="Guantes" name="Gloves"/>
+			<menu_item_call label="Camiseta" name="Menu Undershirt"/>
+			<menu_item_call label="Ropa Interior" name="Menu Underpants"/>
+			<menu_item_call label="Falda" name="Skirt"/>
+			<menu_item_call label="Tatuaje" name="Tattoo"/>
+			<menu_item_call label="Alfa" name="Alpha"/>
+			<menu_item_call label="Física" name="Physics"/>
+			<menu_item_call label="Toda la Ropa" name="All Clothes"/>
+		</menu>
+		<menu_item_call label="Gestos..." name="Gestures..."/>
+		<menu_item_call label="Perfil..." name="Profile..."/>
+		<menu_item_call label="Apariencia..." name="Appearance..."/>
+		<menu_item_call label="Nombre a Mostrar..." name="Display Name..."/>
+		<menu_item_check label="Amigos..." name="Friends..."/>
+		<menu_item_call label="Grupos..." name="Groups..."/>
+		<menu_item_separator label="-----------" name="separator8"/>
+		<menu_item_call label="Preferencias..." name="Preferences..."/>
+	</menu>
+	<!-- ================================= -->
+	<menu label="Ver"  name="View" >
+		<menu_item_call label="Vista Subjetiva" name="Mouselook"/>
+		<menu_item_check label="Construir" name="Build"/>
+		<menu_item_check label="Flycam del Joystick" name="Joystick Flycam"/>
+		<menu_item_call label="Volver a Vista por Defecto" name="Reset View"/>
+		<menu_item_call label="Mirar al último que habló" name="Look at Last Chatter"/>
+		<menu_item_check label="Barra de Herramientas" name="Toolbar"/>
+		<menu_item_check label="Chat Local" name="Chat History"/>
+		<menu_item_check label="Comunicarse" name="Instant Message"/>
+		<menu_item_check label="Inventario" name="Inventory"/>
+		<menu_item_check label="Participantes Activos" name="Active Speakers"/>
+		<menu_item_check label="Lista de Ignorados" name="Mute List"/>
+		<menu_item_check label="Historial de Teleport" name="Teleport History"/>
+		<menu_item_check label="Filtro de Media" name="Media Filter"/>
+		<menu_item_check label="Controles de Cámara" name="Camera Controls"/>
+		<menu_item_check label="Controles de Movimiento" name="Movement Controls"/>
+		<menu_item_check label="Mapa del Mundo" name="World Map"/>
+		<menu_item_check label="MiniMapa" name="Mini-Map"/>
+		<menu_item_check label="Radar" name="Radar"/>
+		<menu_item_check label="Estadísticas" name="Statistics Bar"/>
+		<menu_item_check label="Búsqueda en Área" name="Area Search"/>
+		<menu_item_check label="Límites de Parcelas" name="Property Lines"/>
+		<menu_item_check label="Líneas de Prohibición" name="Banlines"/>
+		<menu_item_check label="Propietarios del Terreno" name="Land Owners"/>
+		<menu label="Información Adicional" name="Hover Tips">
+			<menu_item_check label="Mostrar Información Adicional" name="Show Tips"/>
+			<menu_item_check label="Información Adicional del Terreno" name="Land Tips"/>
+			<menu_item_check label="Información Adicional en Todos los Objetos" name="Tips On All Objects"/>
+		</menu>
+		<menu_item_check label="Realzar Transparencias" name="Highlight Transparent"/>
+		<menu_item_check name="beacons" label="Balizas"/>
+		<menu_item_check label="Ocultar Partículas" name="Hide Particles"/>
+		<menu_item_check label="Mostrar los HUD en uso" name="Show HUD Attachments"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Acercar Zoom" name="Zoom In"/>
+		<menu_item_call label="Zoom Predeterminado" name="Zoom Default"/>
+		<menu_item_call label="Alejar Zoom" name="Zoom Out"/>
+		<menu_item_separator label="-----------" name="separator6" />
+		<menu_item_call label="Pantalla Completa" name="Toggle Fullscreen"/>
+		<menu_item_call label="Interfaz en tamaño Predeterminado" name="Set UI Size to Default"/>
+	</menu>
+	<!-- ========================================== -->
+	<menu label="Mundo" name="World" >
+		<menu_item_call label="Chat" name="Chat"/>
+		<menu_item_check label="Correr Siempre" name="Always Run"/>
+		<menu_item_call label="Sentarse en el piso" name="Sit on Ground"/>
+		<menu_item_check label="Volar" name="Fly"/>
+		<menu_item_call label="Crear un Hito Aquí" name="Create Landmark Here"/>
+		<menu_item_call label="Fijar Base Aquí" name="Set Home to Here"/>
+		<menu_item_call label="Teleport a Base" name="Teleport Home"/>
+		<menu_item_call label="Falso Estado Ausente" name="Fake Away Status"/>
+		<menu_item_call label="Pasar a Estado Ausente" name="Set Away"/>
+		<menu_item_call label="Pasar a Estado Ocupado" name="Set Busy"/>
+		<menu_item_call label="Detener las animaciones del Avatar" name="Stop Animating My Avatar"/>
+		<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_call label="Comprar [CURRENCY]..." name="Buy and Sell L$..."/>
+		<menu_item_call label="Mi Terreno..." name="My Land..."/>
+		<menu_item_call label="Acerca del Terreno..." name="About Land..."/>
+		<menu_item_call label="Comprar Terreno..." name="Buy Land..."/>
+		<menu_item_call label="Región/Estado..." name="Region/Estate..."/>
+		<menu label="Configuración del Entorno" name="Environment Settings">
+			<menu_item_call label="Amanecer" name="Sunrise"/>
+			<menu_item_call label="Mediodía" name="Noon"/>
+			<menu_item_call label="Atardecer" name="Sunset"/>
+			<menu_item_call label="Medianoche" name="Midnight"/>
+			<menu_item_call label="Volver a los valores de la Región" name="Revert to Region Default"/>
+			<menu_item_call label="Editor del Entorno" name="Environment Editor"/>
+			<menu_item_call label="Editor del Ciclo Diario" name="Day Cycle Editor"/>
+			<menu_item_call label="Efectos de Post-Procesado" name="Post-Processing Effects"/>
+		</menu>
+	</menu>
+	<!-- ========================================== -->
+	<menu label="Herramientas" left="0" name="Tools" >
+		<menu label="Seleccionar Herramienta" name="Select Tool">
+			<menu_item_call label="Foco" name="Focus"/>
+			<menu_item_call label="Mover" name="Move"/>
+			<menu_item_call label="Editar" name="Edit"/>
+			<menu_item_call label="Crear" name="Create"/>
+			<menu_item_call label="Terreno" name="Land"/>
+		</menu>
+		<menu_item_check label="Seleccionar sólo mis Objetos" name="Select Only My Objects"/>
+		<menu_item_check label="Seleccionar sólo Objetos movibles" name="Select Only Movable Objects"/>
+		<menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding"/>
+		<menu_item_check label="Mostrar Esquema de Selección" name="Show Selection Outlines"/>
+		<menu_item_check label="Mostrar objetos seleccionados ocultos" name="Show Hidden Selection"/>
+		<menu_item_check label="Mostrar radio de luz de la selección" name="Show Light Radius for Selection"/>
+		<menu_item_check label="Mostrar rayo indicador" name="Show Selection Beam"/>
+		<menu_item_check label="Ajustar a la cuadrícula" name="Snap to Grid"/>
+		<menu_item_call label="Ajustar Objetos a los Ejes XY de la cuadrícula" name="Snap Object XY to Grid"/>
+		<menu_item_call label="Usar Seleccionado como cuadrícula" name="Use Selection for Grid"/>
+		<menu_item_call label="Opciones de la Cuadrícula..." name="Grid Options..."/>
+		<menu_item_check label="Editar partes enlazadas" name="Edit Linked Parts"/>
+		<menu label="Seleccionar partes enlazadas" name="Select Linked Parts" >
+			<menu_item_call label="Seleccionar parte siguiente" name="Select Next Part"/>
+			<menu_item_call label="Seleccionar Parte  Anterior" name="Select Previous Part"/>
+			<menu_item_call label="Incluir Parte Siguiente" name="Include Next Part"/>
+			<menu_item_call label="Incluir Parte Anterior" name="Include Previous Part"/>
+		</menu>
+		<menu_item_call label="Enlazar" name="Link"/>
+		<menu_item_call label="Desenlazar" name="Unlink"/>
+		<menu_item_call label="Foco en la Selección" name="Focus on Selection"/>
+		<menu_item_call label="Zoom en lo Seleccionado" name="Zoom to Selection"/>
+		<menu_item_call label="Comprar Objeto" name="Menu Object Take"/>
+		<menu_item_call label="Agarrar una Copia" name="Take Copy"/>
+		<menu_item_call label="Devolver Objeto" name="Return..."/>
+		<menu_item_call label="Devolver el Objeto al Contenido de Objetos" name="Save Object Back to Object Contents"/>
+		<menu_item_call label="Administrador - Borrar" name="Admin Delete"/>
+		<menu_item_call label="Mostrar ventana de avisos/errores de Script " name="Show Script Warning/Error Window"/>
+		<menu label="Recompilar Scripts de la Selección" name="Recompile Scripts in Selection">
+			<menu_item_call label="Mono" name="Mono"/>
+			<menu_item_call label="LSL" name="LSL"/>
+		</menu>
+		<menu_item_call label="Reiniciar Scripts en la Selección" name="Reset Scripts in Selection"/>
+		<menu_item_call label="Definir Ejecución de Scripts en la Selección" name="Set Scripts to Running in Selection"/>
+		<menu_item_call label="Definir la no ejecución de Scripts en la Selección" name="Set Scripts to Not Running in Selection"/>
+		<menu_item_call label="Borrar Scripts en la Selección" name="Remove Scripts in Selection"/>
+	</menu>
+	<!-- =========================================== -->  
+	<menu label="Ayuda" left="227" name="Help" >
+		<menu_item_call label="Ayuda de Second Life" name="Second Life Help"/>
+		<menu_item_call label="Tutorial" name="Tutorial"/>
+		<menu_item_call label="Blog Oficial de Linden Lab..." name="Official Linden Blog..."/>
+		<menu_item_call label="Portal de Scripting..." name="Scripting Portal..."/>
+		<menu_item_call label="Denunciar Abuso..." name="Report Abuse..."/>
+		<menu_item_call label="Choques, Empujones y Golpes..." name="Bumps, Pushes &amp;amp; Hits..."/>
+		<menu_item_call label="Medidor de Lag" name="Lag Meter"/>
+		<menu label="Informe de Fallos" name="Bug Reporting" >
+			<menu_item_call label="Seguimiento de Problemas Público..." name="Public Issue Tracker..."/>
+			<menu_item_call label="Ayuda del Seguimiento de Problemas Público..." name="Publc Issue Tracker Help..."/>
+			<menu_item_call label="Seguimiento de Problemas de Singularity..." name="Singularity Issue Tracker..."/>
+			<menu_item_call label="Informe de Fallos 101..." name="Bug Reporting 101..."/>
+			<menu_item_call label="Problemas de Seguridad..." name="Security Issues..."/>
+			<menu_item_call label="Wiki de QA..." name="QA Wiki..."/>
+			<menu_item_call label="Informar Fallos..." name="Report Bug..."/>
+			<menu_item_call label="Informar Fallos de Singularity..." name="Report Singularity Bug..."/>
+		</menu>
+		<menu_item_call label="Acerca de Singularity..." name="About Second Life..."/>
+	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index ef0ae35cb..ca278e01d 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -104,9 +104,9 @@ Puedes escoger aceptar o denegar el dominio correspondiente o el script en el mu
 	</notification>  
 	
 	<notification functor="GenericAcknowledge" label="Mensaje de alerta desconocida" name="MissingAlert">
-		Esta versión de [APP_NAME] no sabe como mostrar el mensaje de alerta que has recibido. Por favor verifica que tienes instalada la última versión de [APP_NAME].
+		Esta versión de [APP_NAME] no sabe como mostrar el mensaje de alerta que ha recibido. Por favor verifica que tienes instalada la última versión de [APP_NAME].
 
-Detalles de error: El alerta llamado &apos;[_NAME]&apos; no ha sido encontado en notifications.xml.
+Detalles del error: El alerta llamado &apos;[_NAME]&apos; no ha sido encontado en notifications.xml.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	
@@ -159,7 +159,7 @@ Asegurate que tu conexión a internet funciona correctamente.
 	</notification>
 	
 	<notification name="ConfirmNoCopyToOutbox" type="alertmodal">
-		No tienes permisos para copiar uno o más ítems al Merchant Outbox. Puedes moverlos o dejarlos fuera.
+		No tienes permisos para copiar uno o más ítems al Buzón de Salida de Comerciante. Puedes moverlos o dejarlos fuera.
 		<usetemplate name="okcancelbuttons" notext="No mover ítem(s)" yestext="Mover ítem(s)"/>
 	</notification>
 	
@@ -183,7 +183,7 @@ Todas las carpetas ha sido enviadas satisfactoriamente al Marketplace.
 
 Ha habido errores al enviar algunas carpetas al Markeplace. Estas carpetas aún están en tu Merchant Outbox.
 
-Mira en el  [log de errores [[MARKETPLACE_IMPORTS_URL]] para mayor información.
+Mira en el [log de errores [[MARKETPLACE_IMPORTS_URL]] para mayor información.
 
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -554,7 +554,7 @@ La carpeta del vestuario contiene ítems que no son partes del cuerpo, u objetos
 		No puedes vestirse ropas o partes del cuerpo que están en la Papelera
 	</notification>
 	
-	<notification name="MaxAttachmentsOnOutfit" type="alertmodal">
+	<notification name="MaxAttachmentsOnOutfit">
 		No se pudo adjuntar el objeto.
 Se ha excedido el límite de [MAX_ATTACHMENTS] objetos adjuntos. Por favor quitate un objeto primero.		
 	</notification>	
@@ -870,7 +870,11 @@ todos los objetos.
 
 Por favor, asegúrate de que no hay ninguno bloqueado, y de que eres el propietario de todos.
 	</notification>
-	
+
+	<notification name="CannotLinkPermanent">
+		Los objetos no pueden ser enlazados cuando cruzan los límites entre regiones.
+	</notification>
+  
 	<notification name="CannotLinkDifferentOwners">
 		Imposible enlazarlos, porque hay objetos de distintos propietarios.
 
@@ -1897,7 +1901,58 @@ Se ocultará el chat y los mensajes instantáneos. Los mensajes instantáneos re
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+
+	<notification name="SetDisplayNameSuccess">
+		¡Hola [DISPLAY_NAME]!
+
+		Tal como en la vida real, le toma a todos un tiempo aprender un nuevo nombre. Por favor, espera varios días para que se refleje [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] en objetos, scripts, búsqueda, etc.
+	</notification>
 	
+	<notification name="SetDisplayNameBlocked">
+		Lo sentimos, pero no puedes cambiar tu Nombre a Mostrar. Si crees que esto es un error, por favor, contacta con el soporte.
+	</notification>
+	
+	<notification name="SetDisplayNameFailedLength">
+		Lo sentimos, ese nombre es demasiado largo. Los Nombres a Mostrar deben tener un máximo de [LENGTH] caracteres.
+
+		Por favor, intenta con un nombre más corto.
+	</notification>
+	
+	<notification name="SetDisplayNameFailedGeneric">
+		Lo sentimos, no podemos configurar tu Nombre a Mostrar. Por favor, intenta nuevamente más tarde.
+	</notification>
+	
+	<notification name="SetDisplayNameMismatch">
+		Los Nombre a Mostrar que has ingresado no concuerdan. Por favor, ingrésalos de nuevo.
+	</notification>
+	
+	<!-- *NOTE: This should never happen -->
+	<notification name="AgentDisplayNameUpdateThresholdExceeded">
+		Lo sentimos, has esperado demasiado tiempo para cambiar tu Nombre a Mostrar.
+
+Consulta http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+Por favor, inténtalo nuevamente más tarde.
+	</notification>
+	
+	<notification name="AgentDisplayNameSetBlocked">
+		Lo sentimos, no podemos configurar el nombre solicitado debido a que contiene una palabra prohibida.
+
+Por favor, intenta con un nombre diferente.
+	</notification>
+	
+	<notification name="AgentDisplayNameSetInvalidUnicode">
+		El Nombre a Mostrar que deseas definir contiene caracteres inválidos.
+	</notification>
+	
+	<notification name="AgentDisplayNameSetOnlyPunctuation">
+		Tu Nombre a Mostrar debe contener letras y no signos de puntuación.
+	</notification>
+	
+	<notification name="DisplayNameUpdate">
+		[OLD_NAME] ([SLID]) es conocido ahora como [NEW_NAME].
+	</notification>
+
 	<notification name="OfferTeleport">
 		¿Ofrecer teleporte a tu posición con este mensaje?
 		<form name="form">
@@ -1987,17 +2042,22 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se
 	</notification>
 	
 	<notification label="Seleccionar el estado" name="EstateManagerRemove">
-		¿Remover Administrador del Estado sólo para este estado o para [ALL_ESTATES]?
+		¿Remover Administrador del Estado sólo para este Estado o para [ALL_ESTATES]?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
 	</notification>
 	
 	<notification label="Confirmar la expulsión" name="EstateKickUser">
-		¿Expulsar a [EVIL_USER] de este estado?
+		¿Expulsar a [EVIL_USER] de este Estado?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
+
+	<notification label="Confirmar Expulsar y Prohibir" name="EstateBanUser">
+		¿Expulsar y Prohibir a [EVIL_USER] de este Estado?
+		<usetemplate name="okcancelbuttons" notext="Cancel" yestext="OK"/>
+	</notification>
 	
 	<notification name="EstateChangeCovenant">
-		¿Estás seguro de que quieres cambiar el contrato del estado?
+		¿Estás seguro de que quieres cambiar el contrato del Estado?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	
@@ -2055,6 +2115,7 @@ Por favor, comprueba que tienes instalado el último visor, y ve a la Base de Co
 	<notification name="LandClaimAccessBlocked_Notify">
 		Por tu nivel de calificación, No puedes reclamar este terreno.
 	</notification>
+	
 	<notification name="LandClaimAccessBlocked_Change">
 		No puedes reclamar este terreno por tus preferencias de nivel de calificación.
 
@@ -2518,7 +2579,7 @@ Has actualizado la posición de este Destacado, pero los otros detalles permanec
 		Has elegido ítems &apos;no copiables&apos; de tu inventario. Esos ítems se moverán a tu inventario, no se copiarán.
 Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar un mal funcionamiento del script.
 
-¿Mover el/los ítem/s del inventario?
+¿Mover el/los ítem(s) del inventario?
 		<usetemplate ignoretext="Cuando mueva objetos con script &apos;no copiables&apos; del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>
 	
@@ -3071,6 +3132,7 @@ Ya existe un grid con el mismo nombre.
 	<notification name="Cancelled">
 		Cancelado
 	</notification>
+	
 	<notification name="CancelledSit">
 		Cancelado el sentarse
 	</notification>
@@ -3277,7 +3339,12 @@ Inténtalo seleccionando un trozo más pequeño de terreno.
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
-	
+
+	<notification name="Payment">
+		<tag>fondos</tag>
+		[MESSAGE]
+	</notification>
+
 	<notification name="EventNotification">
 		Notificación de un evento:
 
@@ -4002,10 +4069,6 @@ Has subido una textura base (baked) de [RESOLUTION] para '[BODYREGION]' después
 		( [EXISTENCE] segundos vivo )
 Has actualizado en forma local una textura base (baked) [RESOLUTION] para '[BODYREGION]' después de [TIME] segundos.
   </notification>
-  
-	<global name="UnsupportedCPU">
-		- La velocidad de tu CPU no cumple los requerimientos mínimos.
-	</global>
 	
 	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
 		El objeto seleccionado afecta al navmesh. Si lo cambias a una ruta flexible se eliminará del navmesh.	
@@ -4013,123 +4076,10 @@ Has actualizado en forma local una textura base (baked) [RESOLUTION] para '[BODY
 		<usetemplate ignoretext="El objeto seleccionado afecta al navmesh. Cambiándolo a una ruta flexible lo eliminará del navmesh." name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>	
 	
-	<global name="UnsupportedGLRequirements">
-		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere una tarjeta gráfica OpenGL que admita texturas múltiples (&apos;multitexture support&apos;). Si este es el caso, comprueba que tienes los últimos controladores para tu tarjeta gráfica, así como los últimos parches y &apos;service packs&apos; para tu sistema operativo.
-
-Si los problemas persisten, por favor, acude a: http://www.secondlife.com/support
-	</global>
-	
-	<global name="UnsupportedCPUSSE2">
-		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere un CPU que soporte el set de instrucciones SSE2
-	</global>
-	
-	<global name="UnsupportedCPUSSE">
-		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere un CPU que soporte el set de instrucciones SSE
-	</global>	
-	
-	<global name="UnsupportedCPUAmount">
-		796
-	</global>
-	
-	<global name="UnsupportedRAMAmount">
-		510
-	</global>
-	
-	<global name="UnsupportedGPU">
-		- Tu tarjeta gráfica no cumple los requerimientos mínimos.
-	</global>
-	
-	<global name="UnsupportedRAM">
-		- La memoria de tu sistema no cumple los requerimientos mínimos.
-	</global>
-	
-	<global name="PermYes">
-		Sí
-	</global>
-	
-	<global name="PermNo">
-		No
-	</global>
-	
-	<notification name="SetDisplayNameSuccess">
-		¡Hola [DISPLAY_NAME]!
-
-		Tal como en la vida real, le toma a todos un tiempo aprender un nuevo nombre. Por favor, espera varios días para que se refleje [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] en objetos, scripts, búsqueda, etc.
-	</notification>
-	
-	<notification name="SetDisplayNameBlocked">
-		Lo sentimos, pero no puedes cambiar tu Nombre a Mostrar. Si crees que esto es un error, por favor, contacta con el soporte.
-	</notification>
-	
-	<notification name="SetDisplayNameFailedLength">
-		Lo sentimos, ese nombre es demasiado largo. Los Nombres a Mostrar deben tener un máximo de [LENGTH] caracteres.
-
-		Por favor, intenta con un nombre más corto.
-	</notification>
-	
-	<notification name="SetDisplayNameFailedGeneric">
-		Lo sentimos, no podemos configurar tu Nombre a Mostrar. Por favor, intenta nuevamente más tarde.
-	</notification>
-	
-	<notification name="SetDisplayNameMismatch">
-		Los Nombre a Mostrar que has ingresado no concuerdan. Por favor, ingrésalos de nuevo.
-	</notification>
-	
-	<!-- *NOTE: This should never happen -->
-	<notification name="AgentDisplayNameUpdateThresholdExceeded">
-		Lo sentimos, has esperado demasiado tiempo para cambiar tu Nombre a Mostrar.
-
-Consulta http://wiki.secondlife.com/wiki/Setting_your_display_name
-
-Por favor, inténtalo nuevamente más tarde.
-	</notification>
-	
-	<notification name="AgentDisplayNameSetBlocked">
-		Lo sentimos, no podemos configurar el nombre solicitado debido a que contiene una palabra prohibida.
-
-Por favor, intenta con un nombre diferente.
-	</notification>
-	
-	<notification name="AgentDisplayNameSetInvalidUnicode">
-		El Nombre a Mostrar que deseas definir contiene caracteres inválidos.
-	</notification>
-	
-	<notification name="AgentDisplayNameSetOnlyPunctuation">
-		Tu Nombre a Mostrar debe contener letras y no signos de puntuación.
-	</notification>
-	
-	<notification name="DisplayNameUpdate">
-		[OLD_NAME] ([SLID]) es conocido ahora como [NEW_NAME].
-	</notification>
-	
 	<notification name="FirstAO">
 		Para instrucciones, crea una nueva plantilla en el AO. Usa la barra de herramientas para activar/desactivar el AO.
 	</notification>
 	
-	<notification name="BlockedCards">
-		Se ha bloqueado la Tarjeta de Visita de [NAME] ([SOURCE])
-	</notification>
-	
-	<notification name="BlockedDialogs">
-		Se han bloqueado todos los diálogos de los objetos de [NAME]. (Origen: [SOURCE])
-	</notification>
-	
-	<notification name="BlockedGeneralAvatar">
-		Spam bloqueado proveniente del avatar [NAME] ([SOURCE])
-	</notification>
-	
-	<notification name="BlockedGeneralObjects">
-		Spam bloqueado proveniente de objetos propiedad de [OWNER] ([SOURCE])
-	</notification>
-	
-	<notification name="BlockedChatterAvatar">
-	  Se ha bloqueado spam de chat del avatar [NAME] ([SOURCE])
-	</notification>
-	
-	<notification name="BlockedChatterObjects">
-		Se ha bloqueado spam de chat de los objetos propiedad de [OWNER] ([SOURCE])
-	</notification>
-	
 	<notification name="FirstPhysicsWearable">
 		Al vestirse una capa Física se activan ciertos comportamientos en el servidor incompatibles con algunos visores antiguos. En dichos visores te podrán ver incorrectamente (a menudo como 'Ruth').
 
@@ -4188,6 +4138,59 @@ AVISO: Cada subida cuesta [UPLOADCOST] si no es temporal
 		¿Quieres realizar un subida masiva de los archivos como archivos temporales?
 Sólo se cargarán texturas como temporal en Agni y Aditi.		
 		<usetemplate name="yesnocancelbuttons" notext="Permanente" yestext="Temporal" canceltext="Cancelar"/>
-  </notification>	
+  </notification>
+  
+	<global name="UnsupportedGLRequirements">
+		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere una tarjeta gráfica OpenGL que admita texturas múltiples (&apos;multitexture support&apos;). Si este es el caso, comprueba que tienes los últimos controladores para tu tarjeta gráfica, así como los últimos parches y &apos;service packs&apos; para tu sistema operativo.
+
+Si los problemas persisten, por favor, acude a: http://www.secondlife.com/support
+	</global>
+	
+	<global name="UnsupportedCPUAmount">
+		796
+	</global>
+	
+	<global name="UnsupportedRAMAmount">
+		510
+	</global>
+	
+	<global name="UnsupportedCPU">
+		- La velocidad de tu CPU no cumple los requerimientos mínimos.
+	</global>
+
+	<global name="UnsupportedCPUSSE2">
+		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere un CPU que soporte el set de instrucciones SSE2
+	</global>
+	
+	<global name="UnsupportedCPUSSE">
+		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere un CPU que soporte el set de instrucciones SSE
+	</global>	
+	
+	<global name="UnsupportedGPU">
+		- Tu tarjeta gráfica no cumple los requerimientos mínimos.
+	</global>
+	
+	<global name="UnsupportedRAM">
+		- La memoria de tu sistema no cumple los requerimientos mínimos.
+	</global>
+
+<!-- these are alert strings from server. the name needs to match entire the server string, and needs to be changed
+	whenever the server string changes -->
+	<global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">
+		Si eres propietario de terreno, puedes hacer que éste sea tu ubicación base.
+De otra manera, puedes mirar en el mapa ya buscar lugares marcados como &quot;Infohub&quot;.
+	</global>
+	
+	<global name="You died and have been teleported to your home location">
+		Has muerto y has sido teleportado a tu base.
+	</global>
+
+	<notification name="AntiSpamBlock">
+		AntiSpam: [SOURCE] ha sido bloqueado por espamear [TYPE]s [AMOUNT] veces en [TIME] segundos.
+	</notification>
+
+	<notification name="AntiSpamNewlineFlood">
+		AntiSpam: Se ha bloqueado newline flood de [SOURCE] ( [AMOUNT] newlines).
+	</notification>
 	
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index a303ab644..3358cf484 100644
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -18,6 +18,12 @@ residentes'.
 	<string name="confirm_invite_owner_str">
 		¿Estás seguro de que quieres invitar a un nuevo propietario/s? ¡Esta acción es permanente!
 	</string>
+	<string name="already_in_group">
+		Algunos de los residentes que has seleccionado ya están en el grupo y no se les ha enviado la invitación.
+	<string>
+	<string name="invite_selection_too_large">
+		No se han enviado las invitaciones al grupo: Demasiados residentes seleccionados. Las invitaciones al Grupo están limitadas a 100 por envío.
+	<string>	
 	<string name="loading">
 		(cargando...)
 	</string>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
index 3a962c725..fed97bb93 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
@@ -94,10 +94,12 @@
 			<check_box label="Alertas" name="Alerts"/>
 			<check_box label="Ofertas de Amistad" name="Friendship Offers"/>
 			<check_box label="Invitación a Grupos" name="Group Invites"/>
-			<check_box label="Avisos de Grupos" name="Group Notices"/>
+			<check_box control_name="AntiSpamGroupFeeInvites" label="Invit. Grupos c/Pago" name="Group Fee Invites"/>			
 			<check_box label="Oferta de Ítems" name="Item Offers"/>
 			<check_box label="Scripts" name="Scripts"/>
 			<check_box label="Ofertas de Teleporte" name="Teleport Offers"/>
+			<check_box label="Avisos de Grupos" name="Group Notices"/>
+			<check_box control_name="EnableGestureSounds" label="Habilitar Sonidos de Gestos" name="Enable Gesture Sounds"/>
 		</panel>
 		<!-- ============================= -->
 		<panel label="Opciones de Texto" name="TextOptions">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
index b644decf7..453b4231a 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Sistema" name="ascsys">
 	<tab_container label="Sistema Singularity" name="Ascent System">
+		<!-- =================================== -->
 		<panel label="General" name="User Interface">
 			<check_box label="Habilitar Teleport con doble click" tool_tip="Haciendo doble click en un objeto o persona te transportará hacia su ubicación." name="double_click_teleport_check"/>
 			<check_box label="Reiniciar la Cámara luego de Teleportar" tool_tip="Centra la cámara detrás tuyo luego de un teleport." name="center_after_teleport_check"/>
 			<check_box label="Desplazar destino TP a mitad de la altura del agente" tool_tip="Intenta apuntar el TP de modo que tus pies se apoyen en la tierra del punto al que estás apuntando." name="offset_teleport_check"/>
+			<check_box name="fly_after_tp" label="Siempre volar después de un Teleport" tool_tip="Evita la caída desde grandes alturas haciendo que el avatar automáticamente vuele después de un Teleport."/>			
 			<check_box label="Vista Previa de Animaciones en el avatar en vez del maniquí antes de usar" tool_tip="La ventana de subida de Animaciones ejecutará las animaciones en tu avatar cuando ejecutes la vista previa." name="preview_anim_in_world_check"/>
 			<check_box label="Guardar los Scripts en el inventario como Mono en vez de LSL2" tool_tip="Los Scripts serán compilados automáticamente en Mono al guardarlos - Normalmente es sólo posible cuando están dentro de un objeto." name="save_scripts_as_mono_check"/>
 			<check_box label="Siempre rezear objetos con el grupo del terreno, cuando esté disponible" tool_tip="Rezear objetos con el mismo grupo del terreno sin importar tu grupo activo en el momento." name="always_rez_in_group_check"/>
@@ -25,6 +27,7 @@
 				segundos
 			</text>
 		</panel>
+		<!-- ====================================== -->
 		<panel label="Línea de Comandos" name="Command Line">
 			<check_box label="Activar uso de la barra de chat como línea de comandos" name="chat_cmd_toggle"/>
 			<text name="cmd_line_text_2">
@@ -75,17 +78,20 @@
 				Cambiar falso estado Aussente (uso: cmd)
 			</text>
 		</panel>
+		<!-- ===================================== -->
 		<panel label="Seguridad" name="Security">
 			<check_box label="Transmitir efectos del Visor (No incluye rayos)" name="broadcast_viewer_effects"/>
 			<check_box label="Desactivar Apuntar a... y Rayos" tool_tip="No apunta hacia ni muestra tus rayos de edición cuando seleccionas un objeto." name="disable_point_at_and_beams_check"/>
 			<check_box label="No mirar hacia los Objetos (anula ShowLookAt)" tool_tip="Apaga la tansmisión de los giros de cabeza y rayos lookat propios." name="private_look_at_check"/>
 			<check_box label="Mostrar las balizas LookAt de los demás" tool_tip="Te muestra hacia donde miran los demas." name="show_look_at_check"/>
+      <check_box label="Quitarse automáticamente el Bridge LSL" tool_tip="Quitar automáticamente el Bridge LSL de los visores Phoenix o Firestorm." name="detach_bridge"/>			
 			<check_box label="Captura silenciosa a Disco" tool_tip="Anula el sonido de la cámara y el alerta a los demás cuando realizas una captura al disco de tu PC" name="quiet_snapshots_check"/>
 			<check_box label="Al pararse, revoca el permiso de los objetos en los cuales estuvo sentado tu avatar" tool_tip="Los objetos retienen, generalmente, el permiso para tomar control y ejecutar animaciones hasta que se reinician u otro usuario le cede permisos. Activando esta opción te aseguras que los permisos serán revocados inmediatamente." name="revoke_perms_on_stand_up_check"/>
 			<check_box label="Desactivar click del ratón para sentarse en los objetos" tool_tip="Algunas herramientas de griefer se basan en forzarte o engañarte para que hagas click en un objeto el cual te hará sentar, dándole automáticamente al objeto permisos para ejecutar una animación entre de otras cosas. Esta opción desactivará la función llSitTarget - Esto significa que deberás seleccionar la opción 'Sentarse' en las bolas de animación o muebles." name="disable_click_sit_check"/>
 			<check_box label="Mostrar cambios del Total de Scripts en Ejecución:" name="totalscriptjumps" tool_tip="Muestra los cambios en la cuenta total de scritps en tu región, dependiendo del umbral que selecciones a la derecha."/>
 			<spinner left_delta="350" name="ScriptJumpCount" tool_tip="Umbral para el mensaje de salto de scripts [Predeterminado: 100]"/>
 		</panel>
+		<!-- ======================================== -->
 		<panel label="Construcción" name="Building">
 			<text name="text_box6">
 				Punto de Pivote
@@ -94,18 +100,15 @@
 			<spinner label="Pos. Y" name="Y pos"/>
 			<spinner label="Pos. Z" name="Z pos"/>
 			<check_box label="Los valores son en porcentaje" tool_tip="Los ajuste predeterminados se expresan en porcentajes y cada eje se ajusta en 50" name="EmPivotPercToggle"/>
-			<check_box label="Activar resaltado de prims seleccionados" name="EmBuildPrefsRenderHighlight_toggle" />
-			<check_box label="Mostrar Ejes en la posición del Prim Base" tool_tip="El comportamiento por defecto es mostrar el eje en el centro del conjunto de prims. Si está activado, el eje se muestra en la prim raíz del conjunto de enlaces." name="EmBuildPrefsActualRoot_toggle"/>
-			<text name="text_box7">
-				Permitir sig. propietario:
+			<text name="Dimensions">
+				Medidas
+			</text>			
+			<spinner label="Tam.X" name="X size"/>
+			<spinner label="Tam. Y" name="Y size"/>
+			<spinner label="Tam.Z" name="Z size"/>					
+			<text left_delta="46" name="Material">
+				Material:
 			</text>
-			<check_box label="Permiso de Copia" tool_tip="El próximo propietario puede realizar copias de las creaciones" name="next_owner_copy"/>
-			<check_box label="Permiso de Modific." tool_tip="El próximo propietario puede editar y modificar las creaciones" name="next_owner_modify"/>
-			<check_box label="Permiso de Transf." tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
-			<texture_picker label="     Textura" name="texture control" tool_tip="Pulsa para seleccionar una textura"/>
-			<check_box label="Fantasma" name="EmPhantomToggle"/>
-			<check_box label="Físico" name="EmPhysicalToggle"/>
-			<check_box label="Temporal" name="EmTemporaryToggle"/>
 			<combo_box name="material">
 				<combo_item name="Stone">
 					Piedra
@@ -129,6 +132,16 @@
 					Caucho
 				</combo_item>
 			</combo_box>
+			<text name="text_box7">
+				Permitir sig. propietario:
+			</text>
+			<check_box label="Permiso de Copia" tool_tip="El próximo propietario puede realizar copias de las creaciones" name="next_owner_copy"/>
+			<check_box label="Permiso de Modific." tool_tip="El próximo propietario puede editar y modificar las creaciones" name="next_owner_modify"/>
+			<check_box label="Permiso de Transf." tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>			
+			<check_box label="Fantasma" name="EmPhantomToggle"/>
+			<check_box label="Físico" name="EmPhysicalToggle"/>
+			<check_box label="Temporal" name="EmTemporaryToggle"/>	
+			<texture_picker label="     Textura" name="texture control" tool_tip="Pulsa para seleccionar una textura"/>			
 			<color_swatch label="      Color" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
 			<spinner label="Alfa" name="alpha" />
 			<spinner label="Brillo" name="glow"/>
@@ -136,7 +149,7 @@
 			<text name="shine" follows="top">
 				Brillar
 			</text>
-			<combo_box label="Brillo" name="combobox shininess" tool_tip="Fijar la intensidad de brillo para el objeto">
+			<combo_box name="combobox shininess" tool_tip="Fijar la intensidad de brillo para el objeto">
 				<combo_item name="None">
 					Ninguno
 				</combo_item>
@@ -158,9 +171,8 @@
 				Fijado Actualmente:
 ITEM
 			</text>
-			<spinner label="Tam.X" name="X size"/>
-			<spinner label="Tam. Y" name="Y size"/>
-			<spinner label="Tam.Z" name="Z size"/>					
+			<check_box label="Activar resaltado de prims seleccionados" name="EmBuildPrefsRenderHighlight_toggle" />
+			<check_box label="Mostrar Ejes en la posición del Prim Base" tool_tip="El comportamiento por defecto es mostrar el eje en el centro del conjunto de prims. Si está activado, el eje se muestra en la prim raíz del conjunto de enlaces." name="EmBuildPrefsActualRoot_toggle"/>			
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
index f9a32be00..a93543b4f 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
@@ -2,11 +2,12 @@
 <panel label="Vanity" name="ascvan">
 	<tab_container label="Singularity Vanity" name="Ascent Vanity">
 		<panel label="Principal  (General)" name="General">
-			<check_box label="Cuando se aplicable, guardar Ajustes Vaninty por cuenta." tool_tip="Guarda ajustes individuales por cuenta, permitiendo una mas fácil personalización de Alts." name="use_account_settings_check"/>
-			<check_box label="Ocultar pantalla de progreso de Telerport" tool_tip="Activado, el visor ocultará la pantalla de progreso de Teleportación, pemitiendo leer MIs.." name="disable_tp_screen_check"/>
-			<check_box label="Reproducir sonidos de teleport cuando al cambiar de sim" tool_tip="El Visor reproducirá el sonido de trnasportación al hacer un teleport." name="tp_sound_check"/>
-			<check_box label="Ocultar la pantalla de inicio/cierre de sesión" tool_tip="Marcadao, el visor ocultará la pantalla de progreso de inicio/cierre de sesión." name="disable_logout_screen_check"/>
-			<check_box label="Desactivar animaciones de chat, susurro y gritos" tool_tip="Quiar las animaciones de tu avatar. El efecto es visible para todos" name="disable_chat_animation"/>
+			<check_box label="Cuando sea aplicable, guardar Ajustes Vanity por cuenta." tool_tip="Guarda ajustes individuales por cuenta, permitiendo una mas fácil personalización de Alts." name="use_account_settings_check"/>
+			<check_box label="Ocultar pantalla de progreso de Teleport" tool_tip="Activado, el visor ocultará la pantalla de progreso de Teleportación, pemitiendo leer MIs.." name="disable_tp_screen_check"/>
+			<check_box label="Reproducir sonidos de teleport al cambiar de sim" tool_tip="El Visor reproducirá el sonido de trnasportación al hacer un teleport." name="tp_sound_check"/>
+			<check_box label="Ocultar la pantalla de inicio/cierre de sesión" tool_tip="Marcado, el visor ocultará la pantalla de progreso de inicio/cierre de sesión." name="disable_logout_screen_check"/>
+			<check_box label="Desactivar animaciones de chat, susurro y gritos" tool_tip="Quitar las animaciones de tu avatar. El efecto es visible para todos" name="disable_chat_animation"/>
+			<check_box label="Añadir ropa y objetos vestibles en vez de reemplazarlos" tool_tip="Cuando hagas doble click o presiones la tecla Entrar sobre ropas u objetos para vestir en tu inventario, los objetos seleccionados se agregarán a tu vestuario en vez de reemplazar a los que tengas vestidos en la misma ubicación" name="add_not_replace"/>			
 		</panel>
 		<panel label="Tags/Colores" name="TagsColors">
 			<!-- Client tag options -->
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index b6eb958de..d168756c4 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -42,9 +42,11 @@
 		Tamaño Interface:
 	</text>
 	<check_box label="Resolución independiente del tamaño" name="ui_auto_scale"/>
-	<spinner label="Ausente tras:" name="afk_timeout_spinner"/>
+	<check_box label="Estado Ausente al estar inactivo" name="away_when_idle_checkbox"/>	
+	<spinner label="Ausente tras:" name="afk_timeout_spinner"  label_width="71" left="236"/>
 	<check_box label="Avisar cuando gasto o recibo dinero" name="notify_money_change_checkbox"/>
-	<text name="maturity_desired_label">Rating:</text>
+	<check_box bottom="-257" height="16" label="Sin Ventana Emergente" name="no_transaction_clutter_checkbox" tool_tip="Siguen existiendo las notificaciones, pero la ventana emergente en la esquina superior derecha aparecerá momentáneamente y desaparecerá, de esta manera la transacción de dinero llamará la atención pero no exigirá tu atención."/>	
+	<text name="maturity_desired_label">Calificación:</text>
 	<text name="maturity_desired_prompt">
 		Quiero acceder a contenido 
 	</text>
@@ -68,7 +70,7 @@
 	<text name="show_names_textbox">
 		Mostrar Nombres:
 	</text>
-	<text name="seconds_textbox">
+	<text name="seconds_textbox" left="376">
 		segundos
 	</text>
 	<text name="crash_report_textbox">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 8ef548b08..751c0e87a 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -8,7 +8,7 @@
 	<string name="CURRENCY">L$</string>
 	<string name="GRID_OWNER">Linden Lab</string>
 	
-	<string name="hippo_label_free">free</string>
+	<string name="hippo_label_free">libre</string>
 	<string name="hippo_label_week">semana</string>
 	<string name="TeleportOfferMaturity">
 		[NAME] te ofrece un TP a [DESTINATION]
@@ -61,6 +61,7 @@
 	<string name="LoginWaitingForRegionHandshake">Esperando saludo de la Región...</string>
 	<string name="LoginConnectingToRegion">Conectando a la región...</string>
 	<string name="LoginDownloadingClothing">Descargando ropas...</string>
+	
 	<string name="LoginFailed">Inicio de sesión fallido.</string>
 	<string name="Quit">Salir</string>
 	
@@ -98,7 +99,7 @@
 	<string name="TooltipFlagNoScripts">Sin Scripts</string>
 	<string name="TooltipLand">Terreno:</string>
 	<string name="TooltipMustSingleDrop">Sólo un único item puede ser arrastrado aquí</string>
-	<string name="TooltipOutboxDragToWorld">No puedes rezear ítems en tu Merchant Outbox</string>
+	<string name="TooltipOutboxDragToWorld">No puedes soltar ítems en tu Merchant Outbox</string>
 	<string name="TooltipOutboxNoTransfer">Uno o más de estos objetos no pueden ser vendidos o transferidos.</string>
 	<string name="TooltipOutboxNotInInventory">Tu Merchant Outbox solo puede aceptar ítems de tu inventario</string>
 	<string name="TooltipOutboxWorn">No puedes colocar ítems que tienes vestidos en tu Merchant Outbox</string>
@@ -120,6 +121,7 @@
 	
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">Cargando...</string>
+	<string name="InvalidLocation">Ubicación Inválida</string>
 	
 	<!-- namecache -->
 	<!-- Avatar name: text shown for LLUUID::null -->
@@ -146,12 +148,51 @@
 	<string name="AssetErrorCircuitGone">El circuito se ha ido</string>
 	<string name="AssetErrorPriceMismatch">El Visor y el Servidor no coinciden con el precio</string>
 	<string name="AssetErrorUnknownStatus">Estado desconocido</string>
-	
+
+	<!-- Asset Type human readable names:  these will replace variable [TYPE] in notification FailedToFindWearable* -->
+	<!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
+	<!-- Also used by AntiSpamBlock notification for [TYPE], since this looks like a good place. -->
+	<string name="texture">textura</string>
+	<string name="sound">sonido</string>
+	<string name="calling card">Tarjeta de Visita</string>
+	<string name="Inventory">inventario</string>
+	<string name="Instant Message">mensaje instantáneo</string>
+	<string name="Script Dialog">diálogo de script</string>
+	<string name="Sound Preload">sonido precargado</string>
+	<string name="Teleport">teleporte</string>
+	<string name="Unknown">desconocido</string>
+	<string name="landmark">hito</string>
+	<string name="legacy script">script heredado</string>
+	<string name="clothing">ropa</string>
+	<string name="object">objeto</string>
+	<string name="note card">nota</string>
+	<string name="folder">carpeta</string>
+	<string name="root">raíz</string>
+	<string name="lsl2 script">script LSL2</string>
+	<string name="lsl bytecode">bytecode LSL</string>
+	<string name="tga texture">textura tga</string>
+	<string name="body part">parte de cuerpo</string>
+	<string name="snapshot">instantánea</string>
+	<string name="lost and found">Pérdido y Encontrado</string>
+	<string name="targa image">imagen targa</string>
+	<string name="trash">Basurero</string>
+	<string name="jpeg image">imagen jpeg</string>
+	<string name="animation">animación</string>
+	<string name="gesture">gesto</string>
+	<string name="simstate">simstate</string>
+	<string name="favorite">favorito</string>
+	<string name="symbolic link">enlace</string>
+	<string name="symbolic folder link">enlace a carpeta</string>
+	<string name="current outfit">vestuario actual</string>
+	<string name="outfit">vestuario</string>
+	<string name="my outfits">mis vestuarios</string>
+	<string name="mesh">mesh</string>
+
 	<!-- llvoavatar. Displayed in the avatar's chat bubble -->
 	<string name="AvatarEditingAppearance">(Editando Apariencia)</string>
 	<string name="AvatarAway">Ausente</string>
 	<string name="AvatarBusy">Ocupado</string>
-	<string name="AvatarMuted">Bloqueado</string>
+	<string name="AvatarMuted">Ignorado</string>
 	
 	<!-- animations -->
 	<string name="anim_express_afraid">Miedo</string>
@@ -230,6 +271,7 @@
 	<!-- world map -->	
 	<string name="texture_loading">Cargando...</string>
 	<string name="worldmap_offline">Desconectado</string>
+	<string name="worldmap_results_none_found">Nada encontrado.</string>	
 	
 	<!-- animations uploading status codes -->
 	<string name="Ok">OK</string>
@@ -237,6 +279,22 @@
 	<!-- Chat -->
 	<string name="whisper">Susurra:</string>
 	<string name="shout">Grita:</string>
+	<string name="ringing">Conectando al Chat de Voz del Mundo...</string>
+	<string name="connected">Conectado</string>
+	<string name="unavailable">Chat de Voz no disponible en esta ubicación</string>
+	<string name="hang_up">Desconectado del Chat de Voz del Mundo</string>
+	<string name="ScriptTakeMoney">Transferir moneda de tu cuenta</string>
+	<string name="ActOnControlInputs">Actuar en tus controles de entrada</string>
+	<string name="RemapControlInputs">Remapear tus controles de entrada</string>
+	<string name="AnimateYourAvatar">Animar tu avatar</string>
+	<string name="AttachToYourAvatar">Anexar a tu avatar</string>
+	<string name="ReleaseOwnership">Liberar propiedad y hacer público</string>
+	<string name="LinkAndDelink">Enlazar y desenlazar de otros objetos</string>
+	<string name="AddAndRemoveJoints">Agregar o remover uniones con otros objetos</string>
+	<string name="ChangePermissions">Cambiar sus permisos</string>
+	<string name="TrackYourCamera">Seguir tu cámara</string>
+	<string name="ControlYourCamera">Controlar tu cámara</string>
+	<string name="TeleportYourAgent">Teleportarte</string>	
 	
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">PG</string>
@@ -314,67 +372,67 @@ Devuelve un número seudo aleatoreo en el rango [0,mag) o (mag,0]
   </string>
   <string name="LSLTipText_llFloor">
 		integer llFloor(float val)
-Returns largest integer value &lt;= val
+Devuelve el valor entero mas alto &lt;= val
   </string>
   <string name="LSLTipText_llCeil">
 integer llCeil(float val)
-Returns smallest integer value &gt;= val
+Devuelve el valor entero mas bajo &gt;= val
   </string>
   <string name="LSLTipText_llRound">
 integer llRound(float val)
-Returns val rounded to the nearest integer
+Devuelve val redondeada al entero más cercano
   </string>
   <string name="LSLTipText_llVecMag">
 float llVecMag(vector v)
-Returns the magnitude of v
+Devuelve la magnitud de v
   </string>
   <string name="LSLTipText_llVecNorm">
 vector llVecNorm(vector v)
-Returns the v normalized
+Devuelve v normalizado
   </string>
   <string name="LSLTipText_llVecDist">
 float llVecDist(vector v1, vector v2)
-Returns the 3D distance between v1 and v2
+Devuelve la distancia 3D entre v1 y v2
   </string>
   <string name="LSLTipText_llRot2Euler">
 vector llRot2Euler(rotation q)
-Returns the Euler representation (roll, pitch, yaw) of q
+Devuelve la representación de Euler (roll, pitch, yaw) de q
   </string>
   <string name="LSLTipText_llEuler2Rot">
 rotation llEuler2Rot(vector v)
-Returns the rotation representation of Euler Angles v
+Devuelve la representación de la rotación de ángulos de Euler en v
   </string>
   <string name="LSLTipText_llAxes2Rot">
 rotation llAxes2Rot(vector fwd, vector left, vector up)
-Returns the rotation defined by the coordinate axes
+Devuelve la rotación definida por los ejes de coordenadas
   </string>
   <string name="LSLTipText_llRot2Fwd">
 vector llRot2Fwd(rotation q)
-Returns the forward vector defined by q
+Devuelve el vector hacia adelante definido por q
   </string>
   <string name="LSLTipText_llRot2Left">
 vector llRot2Left(rotation q)
-Returns the left vector defined by q
+Devuelve el vector hacia la izquierda definido por q
   </string>
   <string name="LSLTipText_llRot2Up">
 vector llRot2Up(rotation q)
-Returns the up vector defined by q
+Devuelve el vector hacia arriba definido por q
   </string>
   <string name="LSLTipText_llRotBetween">
 rotation llRotBetween(vector v1, vector v2)
-Returns the rotation to rotate v1 to v2
+Devuelve la rotación pra rotar v1 en v2
   </string>
   <string name="LSLTipText_llWhisper">
 llWhisper(integer channel, string msg)
-Whispers the text of msg on channel
+Susurra el texto del mensaje en el canal
   </string>
   <string name="LSLTipText_llSay">
 llSay(integer channel, string msg)
-Says the text of msg on channel
+Dice el texto del mensaje en el canal
   </string>
   <string name="LSLTipText_llShout">
 llShout(integer channel, string msg)
-Shouts the text of msg on channel
+Grita el texto del mensaje en el canal
   </string>
   <string name="LSLTipText_llListen">
 integer llListen(integer channel, string name, key id, string msg)
@@ -1753,20 +1811,18 @@ Returns the name of an avatar, if the avatar is in the current simulator, and th
   <string name="LSLTipText_llRequestDisplayName">
 key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llRegionSayTo">
-llRegionSayTo(key target, integer channel, string msg)
-Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
   </string>
   <string name="LSLTipText_llGetEnv">
 string llGetEnv(string name)
 Returns a string with the requested data about the region
   </string>
-
-
   <string name="LSLTipText_llCastRay">
 list llCastRay( Vector start, Vector end, list options )
 Returns a list consisting of the following three values for each hit: UUID, Link number, Hit position.
+  </string>  
+  <string name="LSLTipText_llRegionSayTo">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
   </string>
   <string name="LSLTipText_llGetSPMaxMemory">
 integer llGetSPMaxMemory( )
@@ -1775,30 +1831,18 @@ Returns the integer of the most bytes used while llScriptProfiler was last activ
   <string name="LSLTipText_llGetUsedMemory">
 integer llGetUsedMemory( )
 Returns the integer of the number of bytes of memory currently in use by the script.
-  </string>
-  <string name="LSLTipText_llGodLikeRezObject">
-llGodLikeRezObject( key inventory, vector pos )
-Rez directly off of UUID if owner has god-bit set.
-(Requires god mode)
   </string>
   <string name="LSLTipText_llScriptProfiler">
 llScriptProfiler( integer flags )
 Enables or disables the scripts profiling state.
-  </string>
-  <string name="LSLTipText_llSetInventoryPermMask">
-llSetInventoryPermMask( string item, integer mask, integer value )
-Sets the given permission mask to the new value on the inventory item.
-(Requires god mode)
-  </string>
-  <string name="LSLTipText_llSetObjectPermMask">
-llSetObjectPermMask( integer mask, integer value )
-Sets the given permission mask to the new value on the root object the task is attached to.
-(Requires god mode)
   </string>
   <string name="LSLTipText_llSetMemoryLimit">
 integer llSetMemoryLimit( integer limit )
 Request ''limit'' bytes to be reserved for this script.
   </string>
+	<string name="LSLTipText_llGetMemoryLimit">
+integer llGetMemoryLimit()
+	</string>  
   <string name="LSLTipText_llSetLinkMedia">
 integer llSetLinkMedia( integer link, integer face, list params )
 Set the media params for a particular face on the linked prim(s) without a delay.
@@ -1810,10 +1854,6 @@ Returns a list with the media params for a particular face on a linked prim, giv
   <string name="LSLTipText_llClearLinkMedia">
 integer llClearLinkMedia( integer link, integer face )
 Clears the media and all params from the given face on the linked prim(s).
-  </string>
-  <string name="LSLTipText_llSetLinkCamera">
-llSetLinkCamera( integer link, vector eye, vector at )
-Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
   </string>
   <string name="LSLTipText_llSetContentType">
 llSetContentType( key request_id, integer content_type )
@@ -1827,18 +1867,954 @@ Set the sit location for the linked prim(s). The sit location is relative to the
 key llAvatarOnLinkSitTarget( integer link )
 Returns a key that is the UUID of the user seated on the prim.
   </string>
+  <string name="LSLTipText_llSetLinkCamera">
+llSetLinkCamera( integer link, vector eye, vector at )
+Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
+  </string>
+	<string name="LSLTipText_llSetVelocity">
+llSetVelocity(vector velocity, integer local)
+Sets an objects velocity, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetAngularVelocity">
+llSetAngularVelocity(vector angular_velocity, integer local)
+Sets an objects angular velocity, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetPhysicsMaterial">
+llSetPhysicsMaterial(integer flags, float gravity_multiplier, float restitution, float friction, float density )
+Sets the requested attributes of the root object&apos;s physics material.
+	</string>
+	<string name="LSLTipText_llGetPhysicsMaterial">
+llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, and density of the linkset as a list in that order.
+	</string>
+	<string name="LSLTipText_llGetMassMKS">
+llGetMassMKS() returns the mass of the linkset in kilograms.
+	</string>
+	<string name="LSLTipText_llGenerateKey">
+llGenerateKey()
+Retun a unique generated key
+	</string>
+	<string name="LSLTipText_llSetKeyframedMotion">
+llSetKeyframedMotion(list keyframes, list options)
+Requests that a nonphysical object be keyframed according to keyframe list.
+	</string>
+	<string name="LSLTipText_llTransferLindenDollars">
+key llTransferLindenDollars(key destination, integer amount)
+Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
+	</string>
+	<string name="LSLTipText_llGetParcelMusicURL">
+string llGetParcelMusicURL()
+Gets the streaming audio URL for the parcel of land on which the object is located.
+	</string>
+	<string name="LSLTipText_llSetRegionPos">
+integer llSetRegionPos(vector pos)
+Sets the position anywhere within the region (if the object isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llNavigateTo">
+llNavigateTo(vector point, list options)
+For AI Character: Navigate to destination.
+	</string>
+	<string name="LSLTipText_llCreateCharacter">
+llCreateCharacter(list options)
+Convert linkset to AI Character which can navigate the world.
+  <!-- Pathfinding -->
+  <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+  <string name="Pathfinding_Object_Attr_None">Ninguno</string>
+  <string name="Pathfinding_Object_Attr_Permanent">Afecta al navmesh</string>
+  <string name="Pathfinding_Object_Attr_Character">Caracter</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">(Múltiple)</string>
 
-<!-- No info on these functions yet....
-  <string name="LSLTipText_llSetVelocity">
-  </string>
-  <string name="LSLTipText_llSetRotationalVelocity">
-  </string>
+	</string>
+	<string name="LSLTipText_llPursue">
+llPursue(key target, list options)
+For AI Character: Chase after a target.
+	</string>
+	<string name="LSLTipText_llWanderWithin">
+llWanderWithin(vector center, vector dist, list options)
+For AI Character: Wander within a specified volume.
+	</string>
+	<string name="LSLTipText_llFleeFrom">
+llFleeFrom(vector source, float radius, list options)
+For AI Character: Flee from a point.
+	</string>
+	<string name="LSLTipText_llPatrolPoints">
+llPatrolPoints(list points, list options)
+For AI Character: Patrol a list of points.
+	</string>
+	<string name="LSLTipText_llExecCharacterCmd">
+llExecCharacterCmd(integer cmd, list options)
+For AI Character: Execute a character command.
+	</string>
+	<string name="LSLTipText_llDeleteCharacter">
+llDeleteCharacter()
+Convert linkset from AI Character to Physics object.
+	</string>
+	<string name="LSLTipText_llUpdateCharacter">
+llUpdateCharacter(list options)
+Change the AI Character&apos;s settings.
+	</string>
+	<string name="LSLTipText_llEvade">
+llEvade(key target, list options)
+For AI Character: Evade a specified target.
+	</string>
+	<string name="LSLTipText_llGetClosestNavPoint">
+list llGetClosestNavPoint(vector point, list options)
+For AI Character: Get the closest navigable point to the point provided.
+	</string>
+	<string name="LSLTipText_llGetStaticPath">
+list llGetStaticPath(vector start, vector end, float radius, list params)
+Returns a list of position vectors indicating pathfinding waypoints between positions at start and end, for a character of a given radius. The waypoints this function returns are for the 'static' nav mesh, meaning that dynamic objects are ignored.
+	</string>
+<!-- Not in LL list yes -->
+<string name="LSLTipText_llManageEstateAccess" translate="false">
+integer llManageEstateAccess(integer action, key id)
+To add or remove agents from the estate's agent access or ban lists or groups from the estate's group access list.
+Only works for objects owned by the Estate Owner or an Estate Manager.
+Returns TRUE if successful and FALSE if throttled, on invalid action, on invalid or null id, or if object owner is not allowed to manage the estate.
+'action' can be any of: ESTATE_ACCESS_ALLOWED_[AGENT/GROUP]_[ADD/REMOVE] or ESTATE_ACCESS_BANNED_AGENT_[ADD/REMOVE]
+</string>
+<string name="LSLTipText_llGetAgentList" translate="false">
+list llGetAgentList(integer scope, list options)
+Requests a list of agents currently in the region, limited by the scope parameter.
+</string>
+<string name="LSLTipText_llAttachToAvatarTemp" translate="false">
+llAttachToAvatarTemp(integer attach_point)
+Attaches the object to the avatar who has granted permission to the script, with the exception that the object will not create new inventory for the user, and will disappear on detach or disconnect.
+</string>
+<string name="LSLTipText_llTeleportAgent" translate="false">
+llTeleportAgent(key avatar, string landmark, vector position, vector look_at)
+Requests a teleport of avatar to a landmark stored in the object's inventory. If no landmark is provided (an empty string), the avatar is teleported to the location position in the current region. In either case, the avatar is turned to face the position given by look_at in local coordinates.
+</string>
+<string name="LSLTipText_llTeleportAgentGlobalCoords" translate="false">
+llTeleportAgentGlobalCoords(key agent, vector global_coordinates, vector region_coordinates, vector look_at)
+Teleports an agent to set of a region_coordinates within a region at the specified global_coordinates. The agent lands facing the position defined by look_at local coordinates.
+A region's global coordinates can be retrieved using llRequestSimulatorData(region_name, DATA_SIM_POS)
+</string>
+<!-- GOD FUNCTIONS -->
+	<string name="LSLTipText_llGodLikeRezObject">
+llGodLikeRezObject( key inventory, vector pos )
+Rez directly off of UUID if owner has god-bit set.
+(Requires god mode)
+	</string>
+	<string name="LSLTipText_llSetInventoryPermMask">
+llSetInventoryPermMask( string item, integer mask, integer value )
+Sets the given permission mask to the new value on the inventory item.
+(Requires god mode)
+	</string>
+	<string name="LSLTipText_llSetObjectPermMask">
+llSetObjectPermMask( integer mask, integer value )
+Sets the given permission mask to the new value on the root object the task is attached to.
+(Requires god mode)
+	</string>
+
+<!-- 
+    Please keep LL-LSL above this section
+    ** DATA SOURCES **
+       OpenSim OS Functions:      \OpenSim\Region\ScriptEngine\Shared\Api\Interface\IOSSL_Api.cs
+       Aurora-Sim AA Functions:   \Aurora\AuroraDotNetEngine\APIs\AA_API.cs
+       Aurora-Sim BOT Functions:  \Aurora\BotManager\Bot_API.cs
+-->  
+  
+	<string name="LSLTipText_osSetDynamicTextureURL">
+osSetDynamicTextureURL(key dynamicID, string contentType, string url, string extraParams, integer timer )
+Renders a web texture on the prim containing the script, and returns the UUID of the newly created texture.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureURLBlend">
+osSetDynamicTextureURLBlend(key dynamicID, string contentType, string url, string extraParams, integer timer, integer alpha)
+Allows for two dynamic textures to blend on the prim containing this script.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureURLBlendFace">
+osSetDynamicTextureURLBlendFace(key dynamicID, string contentType, string url, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
+Loads a web texture on a prim.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureData">
+osSetDynamicTextureData(key dynamicID, string contentType, string data, string extraParams, integer timer)
+Writes text and vector graphics onto a prim face.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureDataBlend">
+osSetDynamicTextureDataBlend(key dynamicID, string contentType, string data, string extraParams, integer timer, integer alpha)
+Allows for two dynamic textures to blend on the prim containing this script.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureDataBlendFace">
+osSetDynamicTextureDataBlendFace(key dynamicID, string contentType, string data, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
+Allows for two dynamic textures to blend on the specified face of the prim containing this script.
+	</string>
+	<string name="LSLTipText_osGetTerrainHeight">
+osGetTerrainHeight(integer x, integer y)
+Returns current terrain height as float at the given coordinates.
+	</string>
+	<string name="LSLTipText_osSetTerrainHeight">
+osSetTerrainHeight(integer x, integer y, float val)
+Sets terrain height at the given coordinates. Use osTerrainFlush() afterwards.
+	</string>
+	<string name="LSLTipText_osTerrainFlush">
+osTerrainFlush()
+Updates terrain data. Call this after you are done using osTerrainSetHeight.
+	</string>
+	<string name="LSLTipText_osRegionRestart">
+osRegionRestart(float seconds)
+Restart the current region in the specified number of seconds from now.
+	</string>
+	<string name="LSLTipText_osRegionNotice">
+osRegionNotice(string msg)
+Broadcasts a notification message to all agents on the current region.
+	</string>
+	<string name="LSLTipText_osConsoleCommand">
+osConsoleCommand(string command)
+Issues commands directly to the OpenSim server console.
+	</string>
+	<string name="LSLTipText_osSetParcelMediaURL">
+osSetParcelMediaURL(string url)
+Sets parcel media URL.
+	</string>
+	<string name="LSLTipText_osSetPrimFloatOnWater">
+osSetPrimFloatOnWater(integer floatYN)
+Make physical prims float at the water level, TRUE or FALSE.
+	</string>
+	<string name="LSLTipText_osSetParcelSIPAddress">
+osSetParcelSIPAddress(string SIPAddress)
+Sets parcel SIP Address for Voice.
+	</string>
+	<string name="LSLTipText_osGetAgentIP">
+osGetAgentIP(key agent)
+Returns the Avatars IP Address as a string.	Allows in-world tools be used to coordinate out of world network services that need access to client IP addresses.
+Should *ONLY* be used by Region Server Owner.
+	</string>
+	<string name="LSLTipText_osGetAgents">
+osGetAgents()
+Returns a list of all avatars in the region in which the script is running.
+	</string>
+	<string name="LSLTipText_osTeleportAgent">
+    POLYMORPHIC COMMAND
+osTeleportAgent(key agent, integer regionX, integer regionY, vector position, vector lookat)
+osTeleportAgent(key agent, string regionName, vector position, vector lookat)
+osTeleportAgent(key agent, vector position, vector lookat)
+
+Teleports the specified agent to a specified location in the region, the grid, or the hypergrid.
+	</string>
+	<string name="LSLTipText_osTeleportOwner">
+    POLYMORPHIC COMMAND
+osTeleportOwner(integer regionX, integer regionY, vector position, vector lookat)
+osTeleportOwner(string regionName, vector position, vector lookat)
+osTeleportOwner(vector position, vector lookat)
+
+Teleports the owner of the object that holds the script to a specified location in the region, the grid, or the hypergrid.
+	</string>
+	<string name="LSLTipText_osAvatarPlayAnimation">
+osAvatarPlayAnimation(key UUID, string animation)
+Triggers animations contained within the same prim as the script. Does not need the target avatar's permission.
+	</string>
+	<string name="LSLTipText_osAvatarStopAnimation">
+osAvatarStopAnimation(key UUID, string animation)
+Stops specified animation on the specified avatar.
+	</string>
+	<string name="LSLTipText_osMovePen">
+osMovePen(string drawList, integer x, integer y)
+Moves the pen's location to the coordinates specified by the x and y parameters, without drawing anything.
+	</string>
+	<string name="LSLTipText_osDrawLine">
+    POLYMORPHIC COMMAND
+osDrawLine(string drawList, integer startX, integer startY, integer endX, integer endY)
+osDrawLine(string drawList, integer endX, integer endY)
+Draws a line on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawText">
+osDrawText(string drawList, string text)
+Renders text on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawEllipse">
+osDrawEllipse(string drawList, integer width, integer height)
+Draws an ellipse on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawRectangle">
+osDrawRectangle(string drawList, integer width, integer height)
+Draws a rectangle on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawFilledRectangle">
+osDrawFilledRectangle(string drawList, integer width, integer height)
+Draws a rectangle on a dynamic texture, and fills it with the current pen color.
+	</string>
+	<string name="LSLTipText_osDrawPolygon">
+osDrawPolygon (string drawList, list x, list y)
+Draws a polygon on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawFilledPolygon">
+osDrawFilledPolygon (string drawList, list x, list y)
+Draws a polygon on a dynamic texture, and fills it with the current pen color.
+	</string>
+	<string name="LSLTipText_osSetFontName">
+osSetFontName(string drawList, string fontName)
+Sets current font to be used by osDrawText. Font must exist on region server to display.
+	</string>
+	<string name="LSLTipText_osSetFontSize">
+osSetFontSize(string drawList, integer fontSize)
+Sets the font size to be used in osDrawText.
+	</string>
+	<string name="LSLTipText_osSetPenSize">
+osSetPenSize(string drawList, integer penSize)
+Sets the pen size (line thickness) that is to be used when drawing dynamic textures.
+	</string>
+	<string name="LSLTipText_osSetPenColor">
+osSetPenColor(string drawList, string color)
+Sets the pen color that is to be used when drawing dynamic textures.
+	</string>
+	<string name="LSLTipText_osSetPenCap">
+osSetPenCap(string drawList, string direction, string type)
+Apply a shape on the end of a line. This allows using arrow, diamond, round and flat caps.
+	</string>
+	<string name="LSLTipText_osDrawImage">
+osDrawImage(string drawList, integer width, integer height, string imageUrl)
+Retrieves an image specified by the imageUrl parameter and draws it at the specified height and width.
+	</string>
+	<string name="LSLTipText_osGetDrawStringSize">
+vector osGetDrawStringSize(string contentType, string text, string fontName, integer fontSize)
+Returns a vector containing the horizontal and vertical dimensions in pixels of the specified text.
+	</string>
+	<string name="LSLTipText_osSetStateEvents">
+osSetStateEvents(integer events)
+Used in the past as a workaround for a bug with Opensim, which has long since been fixed.
+	</string>
+	<string name="LSLTipText_osList2Double">
+double osList2Double(list src, integer index)
+Returns double-precision value from src at index.
+	</string>
+	<string name="LSLTipText_osSetRegionWaterHeight">
+osSetRegionWaterHeight(float height)
+Adjusts water height on region.
+	</string>
+	<string name="LSLTipText_osSetRegionSunSettings">
+osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)
+Changes the estate sun settings, then triggers a sun update
+'sunFixed' TRUE to keep the sun stationary, FALSE to use global time
+'sunHour' The sun hour that is desired, 0...24, 0 is sunrise.
+	</string>
+	<string name="LSLTipText_osSetEstateSunSettings">
+osSetEstateSunSettings(integer sunFixed, float sunHour)
+sunFixed = TRUE or FALSE, sunHour = 00.00 to 24.00.
+	</string>
+	<string name="LSLTipText_osGetCurrentSunHour">
+float osGetCurrentSunHour()
+Returns float value of current sun hour 0...24 0 is sunrise.
+	</string>
+	<string name="LSLTipText_osGetSunParam">
+float osGetSunParam(string param)
+Returns current float values for param, where param = day_length, year_length, day_night_offset, update_interval.
+	</string>
+	<string name="LSLTipText_osSetSunParam">
+osSetSunParam(string param, float value)
+Sets region's sun parameters, where param = day_length, year_length, day_night_offset, update_interval.
+	</string>
+	<string name="LSLTipText_osWindActiveModelPluginName">
+string osWindActiveModelPluginName()
+Returns the current working wind module installed
+These are SimpleRandomWind or ConfigurableWind.
+	</string>
+	<string name="LSLTipText_osSetWindParam">
+osSetWindParam(string plugin, string param, float value)
+Sets value of param for plugin.  SimpleRandomWind plugin param = strength.
+ConfigurableWind plugin params = avgStrength, avgDirection, varStrength, varDirection, rateChange.
+	</string>
+	<string name="LSLTipText_osGetWindParam">
+float osGetWindParam(string plugin, string param)
+Returns float value of param for plugin.  SimpleRandomWind plugin param = strength.
+ConfigurableWind plugin params = avgStrength, avgDirection, varStrength, varDirection, rateChange.
+	</string>
+	<string name="LSLTipText_osParcelJoin">
+osParcelJoin(vector start, vector end)
+Where start = top corner, end = bottom corner.
+Subdivides from start vector to end vector.  Z is ignored but must exist in syntax
+	</string>
+	<string name="LSLTipText_osParcelSubdivide">
+osParcelSubdivide(vector start, vector end)
+Where start = top corner, end = bottom corner.
+Subdivides from start vector to end vector.  Z is ignored but must exist in syntax
+	</string>
+	<string name="LSLTipText_osSetParcelDetails">
+osSetParcelDetails(vector pos, list rules)
+Set parcel details at position x,y,x.
+Rules = PARCEL_DETAILS_NAME, PARCEL_DETAILS_DESC, PARCEL_DETAILS_OWNER, PARCEL_DETAILS_GROUP
+	</string>
+	<string name="LSLTipText_osGetScriptEngineName">
+string osGetScriptEngineName()
+Returns the name of the script engine which is currently enabled on the server.
+	</string>
+	<string name="LSLTipText_osGetSimulatorVersion">
+string osGetSimulatorVersion()
+Returns current server version information as a string.
+	</string>
+	<string name="LSLTipText_osParseJSON">
+string osParseJSON(string JSON)
+Returns a deserialized JSON.
+	</string>
+	<string name="LSLTipText_osParseJSONNew">
+string osParseJSON(string JSON)
+Returns a deserialized JSON object.
+	</string>
+	<string name="LSLTipText_osMessageObject">
+osMessageObject(key UUID, string message)
+Sends string to object identified by UUID.
+Receiving object requires a dataserver(key queryid, string data) in a contained script(s).
+The queryid passed will be the id of the calling object.
+	</string>
+	<string name="LSLTipText_osMakeNotecard">
+osMakeNotecard(string notecardName, list contents)
+Write a Notecard contained in Prim with contents of list.
+	</string>
+	<string name="LSLTipText_osGetNotecardLine">
+string osGetNotecardLine(string name, integer line)
+Reads the requested notecard line and return its data as a string.
+	</string>
+	<string name="LSLTipText_osGetNotecard">
+string osGetNotecard(string name)
+Reads the entire notecard and return its data as a string.
+	</string>
+	<string name="LSLTipText_osGetNumberOfNotecardLines">
+integer osGetNumberOfNotecardLines(string name)
+Returns total number of lines in a notecard.
+	</string>
+	<string name="LSLTipText_osAvatarName2Key">
+key osAvatarName2Key(string firstname, string lastname)
+Returns the avatar's UUID from their firstname, lastname.
+	</string>
+	<string name="LSLTipText_osKey2Name">
+string osKey2Name(key UUID)
+Returns avatar name from their UUID key.
+	</string>
+	<string name="LSLTipText_osGetGridNick">
+string osGetGridNick()
+Returns the grid's nickname.
+	</string>
+	<string name="LSLTipText_osGetGridName">
+string osGetGridName()
+Returns the grid's name.
+	</string>
+	<string name="LSLTipText_osGetGridLoginURI">
+string osGetGridLoginURI()
+Returns the grid's LoginURI.
+	</string>
+	<string name="LSLTipText_osGetGridHomeURI">
+string osGetGridHomeURI()
+Returns the current grid URI.
+	</string>
+	<string name="LSLTipText_osGetGridCustom">
+string osGetGridCustom(string key)
+Returns the grid's Grid Info.
+	</string>
+	<string name="LSLTipText_osFormatString">
+string osFormatString(string to_format, list strings)
+Returns string. OsFormatString("My name is {0}, I'm located in {1}”, [llGetObjectName(), llGetRegionName()])
+Where {num} parameters must be incremented for each list item, starting at zero, surrounded by curly brackets.
+	</string>
+	<string name="LSLTipText_osMatchString">
+list osMatchString(string src, string pattern, integer start)
+Returns list of matches for the pattern and its components inside the source string. The pattern is a regular expression.
+Each match in the result is the string that matched and its position in the source.
+	</string>
+	<string name="LSLTipText_osReplaceString">
+string osReplaceString(string src, string pattern, string replace, integer count, integer start)
+Returns new string with replacements completed.
+	</string>
+	<string name="LSLTipText_osLoadedCreationDate">
+string osLoadedCreationDate()
+Returns Creation Date from meta data of OAR.
+	</string>
+	<string name="LSLTipText_osLoadedCreationTime">
+string osLoadedCreationTime()
+Returns Creation Time from meta data of OAR.
+	</string>
+	<string name="LSLTipText_osLoadedCreationID">
+string osLoadedCreationID()
+Returns creation ID from meta data of OAR. Can not be used to identify a machine.
+	</string>
+	<string name="LSLTipText_osGetLinkPrimitiveParams">
+list osGetLinkPrimitiveParams(integer linknumber, list rules)
+Returns prim params for the linkset prims specified by linknum.
+If using linkset constants (e.g. LINK_SET, LINK_ALL_CHILDREN, etc), the requested params of each relevant prim are concatenated to the end of the list.
+Otherwise, usage is identical to llGetPrimitiveParams().
+	</string>
+	<string name="LSLTipText_osIsNpc">
+key osIsNpc(key NPC)
+Returns TRUE if 'key' is an NPC (non-player-character).
+	</string>
+  <string name="LSLTipText_osNpcCreate">
+    POLYMORPHIC
+osNpcCreate(string firstname, string lastname, vector position, string notecard)
+osNpcCreate(string firstname, string lastname, vector position, string notecard, integer options)
+Creates an NPC (Non Player Character) clone named firstname lastname at position from a notecard containing the specifications.
+	</string>
+	<string name="LSLTipText_osNpcSaveAppearance">
+osNpcSaveAppearance(key npc, string notecard)
+Save NPC's current body part, clothing and attachments data to notecard in prim inventory.
+The avatar must be present in the region when this function is invoked.
+The baked textures for the avatar (necessary to recreate appearance) are saved permanently.)
+	</string>
+	<string name="LSLTipText_osNpcLoadAppearance">
+osNpcLoadAppearance(key npc, string notecard)
+Load NPC appearance from notecard.
+This notecard must contain appearance data created with the save appearance function.
+	</string>
+	<string name="LSLTipText_osNpcGetPos">
+vector osNpcGetPos(key npc)
+Returns current position vector of the NPC.
+	</string>
+	<string name="LSLTipText_osNpcMoveTo">
+osNpcMoveTo(key npc, vector position)
+Moves an NPC to a location within the region.
+	</string>
+	<string name="LSLTipText_osNpcMoveToTarget">
+osNpcMoveToTarget(key npc, vector target, integer options)
+Moves NPC to given target over time.
+Options = OS_NPC_FLY, OS_NPC_NO_FLY, OS_NPC_LAND_AT_TARGET, OS_NPC_RUNNING 
+	</string>
+	<string name="LSLTipText_osNpcGetOwner">
+rotation osNpcGetOwner(key npc)
+Returns the NPC owner UUID.
+	</string>
+	<string name="LSLTipText_osNpcGetRot">
+rotation osNpcGetRot(key npc)
+Gets the rotation of the avatar. Only the rotation around the Z plane in Euler rotation (horizontal rotation) has any meaning.
+	</string>
+	<string name="LSLTipText_osNpcSetRot">
+osNpcSetRot(key npc, rotation rot)
+Set the rotation of the NPC. Only setting the rotation in the Z plane in Euler rotation will have any meaningful effect (turning NPC facing direction).
+Setting X or Y Euler values will result in the avatar rotating in an undefined manner.
+	</string>
+	<string name="LSLTipText_osNpcStopMoveToTarget">
+osNpcStopMoveToTarget(key npc)
+Stop a current move to a target.
+	</string>
+	<string name="LSLTipText_osNpcSay">
+osNpcSay(key npc, string message)
+Makes an NPC say something.
+	</string>
+	<string name="LSLTipText_osNpcSit">
+osNpcSit(key npc, key primkey, integer options)
+Makes NPC sit on prim/item.
+	</string>
+	<string name="LSLTipText_osNpcStand">
+osNpcStand(key npc)
+Makes NPC identified by UUID to stand.
+	</string>
+	<string name="LSLTipText_osNpcRemove">
+osNpcRemove(key npc)
+Removes an NPC.
+	</string>
+	<string name="LSLTipText_osNpcPlayAnimation">
+osNpcPlayAnimation(key npc, string animation)
+Makes NPC identified by key npc to play animation.
+	</string>
+	<string name="LSLTipText_osNpcStopAnimation">
+osNpcStopAnimation(key npc, string animation)
+Makes NPC identified by key npc stop playing animation.
+	</string>
+	<string name="LSLTipText_osOwnerSaveAppearance">
+osOwnerSaveAppearance(string notecard)
+Save Owner's current body part, clothing and attachments data to notecard in prim inventory.
+The avatar must be present in the region when this function is invoked.
+The baked textures for the avatar (necessary to recreate appearance) are saved permanently.)
+	</string>
+	<string name="LSLTipText_osAgentSaveAppearance">
+osAgentSaveAppearance(key agentId, string notecard)
+Save an Avatar's current body part, clothing and attachments data to specified notecard in prim inventory.
+The avatar must be present in the region when this function is invoked.
+The baked textures for the avatar (necessary to recreate appearance) are saved permanently.)
+	</string>
+	<string name="LSLTipText_osGetMapTexture">
+key osGetMapTexture()
+Returns the map texture UUID of current region.
+	</string>
+	<string name="LSLTipText_osGetRegionMapTexture">
+key osGetRegionMapTexture(string regionName)
+Returns the map texture UUID for the regionName requested.
+	</string>
+	<string name="LSLTipText_osGetRegionStats">
+list osGetRegionStats()
+Returns a list of float values representing a number of region statistics (21 of the values shown in the statistics bar of LL-based clients).
+	</string>
+	<string name="LSLTipText_osGetSimulatorMemory">
+integer osGetSimulatorMemory()
+Returns integer of current memory used by simulator instance.
+	</string>
+	<string name="LSLTipText_osKickAvatar">
+osKickAvatar(string FirstName, string LastName, string alert)
+Kicks avatar from region with an alert message.
+	</string>
+	<string name="LSLTipText_osSetSpeed">
+osSetSpeed(key UUID, float SpeedModifier)
+Multiplies the normal running, walking, and flying speed of the specified avatar.
+	</string>
+	<string name="LSLTipText_osCauseHealing">
+osCauseHealing(key UUID, float healing)
+Causes healing to specified avatar.
+	</string>
+	<string name="LSLTipText_osCauseDamage">
+osCauseDamage(key UUID, float damage)
+Causes damage to specified avatar.  Region must be damage enabled.
+	</string>
+	<string name="LSLTipText_osGetPrimitiveParams">
+list osGetPrimitiveParams(key prim, list rules)
+Gets the parameters of the primitive, specified by key.
+	</string>
+	<string name="LSLTipText_osSetPrimitiveParams">
+osSetPrimitiveParams(key prim, list rules)
+Sets primitive Params.
+	</string>
+	<string name="LSLTipText_osSetProjectionParams">
+    POLYMORPHIC COMMAND
+osSetProjectionParams(key prim. integer projection, key texture, float fov, float focus, float ambience)
+osSetProjectionParams(integer projection, key texture, float fov, float focus, float ambience)
+osSetProjectionParams(key prim, integer projection, key texture, float fov, float focus, float ambience)
+	</string>
+	<string name="LSLTipText_osGetAvatarList">
+list osGetAvatarList()
+Returns strided list of the UUID, position, and name of each avatar in the region, except the owner.
+	</string>
+	<string name="LSLTipText_osUnixTimeToTimestamp">
+string osUnixTimeToTimestamp(integer unixtime)
+Converts unixtime to an llGetTimeStamp() formated string.
+	</string>
+	<string name="LSLTipText_osGetGridGatekeeperURI">
+string osGetGridGatekeeperURI()
+returns the value of Gatekeeper in [GridService] section for both standalone and grids.
+	</string>
+	<string name="LSLTipText_osGetInventoryDesc">
+string osGetInventoryDesc(string itemName)
+returns the description of an inventory item contained within a prim.
+	</string>
+	<string name="LSLTipText_osForceAttachToAvatar">
+Attach the object containing this script to the avatar that owns it without checking for PERMISSION_ATTACH
+For example, osForceAttachToAvatar(ATTACH_CHEST)
+	</string>
+	<string name="LSLTipText_osForceDetachFromAvatar">
+Detach the object containing this script from the avatar it is attached to without checking for PERMISSION_ATTACH
+Nothing happens if the object is not attached
+	</string>
+	<string name="LSLTipText_osNpcSay">
+osNpcSay(key npc, integer channel, string message)
+	</string>
+	<string name="LSLTipText_osNpcShout">
+osNpcShout(key npc, integer channel, string message)
+	</string>
+	<string name="LSLTipText_osNpcWhisper">
+osNpcWhisper(key npc, integer channel, string message)
+	</string>
+	<string name="LSLTipText_osSetTerrainTexture">
+osSetTerrainTexture(integer level, key texture)
+sets terrain texture to level specified using the specific UUID of the texture
+	</string>
+	<string name="LSLTipText_osSetTerrainTextureHeight">
+osSetTerrainTextureHeight(int corner, float low, float high)
+sets terrain texture in corner specified between the low and high levels.  Identical to setting textures in Region Manager within the viewer.
+	</string>
+	<string name="LSLTipText_osInviteToGroup">
+integer osInviteToGroup(key agentId)
+Returns True / False if user identified by agentID is successfully added to group. (Object containing script must be attached to a group)
+	</string>
+	<string name="LSLTipText_osEjectFromGroup">
+integer osEjectFromGroup(key agentId)
+Returns True / False if user identified by agentID is successfully removed from group. (Object containing script must be attached to a group)
+	</string>
+	<string name="LSLTipText_cmSetWindlightScene">
+cmSetWindlightScene(list rules)
+Set the current WindLight scene. Estate managers and owners only.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_cmSetWindlightSceneTargeted">
+cmSetWindlightSceneTargeted(list rules, key target)
+Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_cmGetWindlightScene">
+list cmGetWindlightScene(list rules)
+Get the current LightShare settings.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_lsSetWindlightScene">
+lsSetWindlightScene(list rules)
+Set the current WindLight scene. Estate managers and owners only.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_lsSetWindlightSceneTargeted">
+lsSetWindlightSceneTargeted(list rules, key target)
+Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_lsGetWindlightScene">
+list lsGetWindlightScene(list rules)
+Get the current WindLight settings.
+(Reguires LightShare Enabled Viewer)
+	</string>
+<!-- Aurora-Sim OSSL-Functions  (unique to Aurora Only)  'osReturnObject', 'osReturnObjects', 'osShutDown', 'osaddAgentToGroup', 'osRezObject',
+   Aurora-Sim aaFunctions (\Aurora\AuroraDotNetEngine\APIs\IAA_Api.cs)
+   Aurora-Sim botFunctions (\Aurora\BotManager\IBot_Api.cs) 
 -->
+	<string name="LSLTipText_osReturnObject">
+osReturnObject(key userID)
+Returns object to specified avatars UUID.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_osReturnObjects">
+osReturnObjects(float Parameter)
+Returns group of objects. Parameter's are numeric, values are owner objects = 0, everyone except owner objects = 1, group objects = 2.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_osShutDown">
+osShutDown()
+Shut's down current Simulator.  Authorized Admin Only by config.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_osAddAgentToGroup">
+osAddAgentToGroup(key avatarID, string group_name, string role_name)
+Adds an avatar to a group.  Where group_name = name of the target group, role_name = role to assign within the group.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_osRezObject">
+osRezObject(string inventory, vector position, vector velocity, rotation rot, integer param, integer isRezAtRoot, integer doRecoil, integer SetDieAtEdge, integer CheckPos)
+Where inventory = object to rez.  Position = vector to rez object.  Velocity = initial velocity.  Rot = initial rotation.  Param = onrez event.
+IzAtRoot = TRUE/FALSE flag changes llRezAtRoot to llRezObject.  doRecoil =TRUE/FALSE to push avatar.  SetDieAtEdge = TRUE/FALSE for rezzed object to die at edge of region.
+CheckPos = TRUE/FALSE enable/disable 10m rez limit.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetCloudDensity">
+aaSetCloudDensity(float density)
+AaSetCloudDensity(0.5)  Where float density values are 0.0 =  no cloud to 1.0 = 100% cloud.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaUpdateDatabase">
+aUpdateDatabase(string Key, string value, string token)
+Where Key = database field name, xmlDataToPutIntoTheDatabase = serialized XML data,  Token = data-password
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaQueryDatabase">
+aaQueryDatabase(string Key, string Token)
+Returns a list with first value is the token, the second the Key, and the third the value
+Where Key = database field name, Token = data-password
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaDeserializeXMLValues">
+aaDeserializeXMLValues(string xmlData)
+Returns a list of Values from XML data. Where xmlData = xml formatted data Values.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaDeserializeXMLKeys">
+aaDeserializeXMLKeys(string xmlData)
+Returns a list of keys from XML data. Where xmlData = xml formatted data keys.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetConeOfSilence">
+aaSetConeOfSilence(float radius)
+Where radius = metres radius from centre of scripted item.  This creates an area that sounds can only be heard by the people within the area(radius) and not heard outside and visa-versa.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSerializeXML">
+aaSerializeXML(list keys, list values)
+Returns xml formatted string of the keys and values.  Where keys = list of keys in the database, values = fields to retrieve from database.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetTeam">
+aaGetTeam(key uuid)
+Returns a string of avatars team name.  Where uuid = avatar key.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetHealth">
+aaGetHealth(key uuid)
+Returns float value (0.0 to 100.0) of current health.  Where uuid = avatar key.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaJoinCombat">
+aaJoinCombat(key uuid)
+Where uuid = avatar key.  If (PERMISSION_COMBAT == PERMISSION_COMBAT) and permission is granted then join combat.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaLeaveCombat">
+aaLeaveCombat(key uuid)
+Where uuid = avatar key.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaJoinCombatTeam">
+aaJoinCombatTeam(key uuid, string team)
+Where uuid = key of avatar, team = string of the team name.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaRequestCombatPermission">
+aaRequestCombatPermission(key ID)
+Where ID = avatar uuid.  Requests target avatar for Permissions to enter into combat mode.
+Raises a run_time_permissions event. (PERMISSION_COMBAT == PERMISSION_COMBAT).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaThawAvatar">
+aaThawAvatar(key ID)
+Where ID = avatar uuid. If combat permission are granted then avatar can be un-frozen (movement re-enabled).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaFreezeAvatar">
+aaFreezeAvatar(key ID)
+Where ID = avatar uuid. If combat permission are granted then avatar can be frozen (no movement).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetTeamMembers">
+aaGetTeamMembers(string team)
+Return a list of team members.  Where team = string of team name.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetLastOwner">
+    POLYMORPHIC FUNCTION.
+aaGetLastOwner(string PrimID)  returns last owner UUID of PrimID where PrimID = uuid of prim.
+AaGetLastOwner()  returns last owner uuid of prim containg script.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSayDistance">
+aaSayDistance(integer channelID, float Distance, string text)
+Where channelID = channel to say on, Distance = float in meters  for distance to say, text = string to say.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSayTo">
+aaSayTo(key userID, string text)
+Where userID = avatar key, text = string msg.  Similar to llOwnerSay but can be directly targeted to an avatar.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetWalkDisabled ">
+aaGetWalkDisabled(key ID)
+Returns integer of TRUE or FALSE for specifid ID.  Where ID = avatar uuid.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetWalkDisabled">
+aaSetWalkDisabled(key ID, integer Value)
+Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables walk, forcing avatar to fly.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetFlyDisabled ">
+aaGetFlyDisabled(key ID)
+Returns integer of TRUE or FALSE for specifid ID. Where ID = avatar uuid.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetFlyDisabled">
+aaSetFlyDisabled(key ID, integer Value)
+Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables flying, forcing avatar to walk.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaAvatarFullName2Key ">
+aaAvatarFullName2Key(string FullName)
+Returns the avatar uuid from their fullname.  Where FullName = "Firstname Lastname”.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaRaiseError">
+aaRaiseError(string message)
+Allows you to have errors that end the execution of the event and fire another event in the script.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetText ">
+aaGetText()
+Returns a string of the hover text of an object.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetTextColor ">
+aaGetTextColor()
+Returns the hovertext color in rotation. Use Ex: rotation color = aaGetTextColor() to separate color.x, color.y, color.z, color.s  Where s = value of alpha in llSetText.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetEnv ">
+aaSetEnv(string EnvName, list Value)
+Sets environment values.  Where EnvName = ENABLE_GRAVITY, GRAVITY_FORCE_X, GRAVITY_FORCE_Y, GRAVITY_FORCE_Z, ADD_GRAVITY_POINT, ADD_GRAVITY_FORCE, START_TIME_REVERSAL_SAVING,
+STOP_TIME_REVERSAL_SAVING, START_TIME_REVERSAL, STOP_TIME_REVERSAL.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetIsInfiniteRegion">
+aaGetIsInfiniteRegion()
+Returns TRUE or FALSE if region is an infinite region.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botGetWaitingTime">
+botGetWaitingTime(integer waitTime)
+Returns waitTime as vector.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSetMap">
+botSetMap(key keyOfBot, list positions, list movementType, integer flags)
+keyOfBot = bot uuid, positions = list of position vectors, movementType = corresponding list of move modes:  0 – walk, 1 – fly,
+flags = BOT_FOLLOW_FLAG_NONE and BOT_FOLLOW_FLAG_INDEFINITELY.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botCreateBot">
+botCreateBot(string FirstName, string LastName, key idToClone, vector startPos)
+Where FirstName and LastName = strings for new bot name.  idToClone = uuid of prebuild avatar to clone OR another existing avatar.  startPos = vector of starting position on region.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botRemoveBot">
+botRemoveBot(key botID)
+Where botID = uuid of bot.  Removes bot identified by botID.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botPauseMovement">
+botPauseMovement(key botID)
+Where botID = bot uuid.  Pauses bot at current position.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botResumeMovement">
+botResumeMovement(key botID)
+Where botID = bot uuid.  Resumes bot movement.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botFollowAvatar">
+botFollowAvatar(key botID, string avName, float startFollowDistance, float endFollowDistance)
+Where botID = bot uuid.  AvName = sting of avatar name OR avatar uuid.  StartFollowDistance = distance to start following from.  EndFollowDistance = distance to stop following avatar.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botStopFollowAvatar">
+botStopFollowAvatar(key botID)
+Where botID = bot uuid.  Stops bot from following an avatar.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSendChatMessage">
+botSendChatMessage(key botID, string message, integer channel, integer sayType)
+Where  botID = bot uuid.  Message = string msg.  Channel = channel to speak on.  SayType = (0=whisper, 1=say, 2=shout).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSendIM">
+botSendIM(string bot, string user, string message)
+Send IM to bot.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSetShouldFly">
+botSetShouldFly(key botID, integer ShouldFly)
+Where botID = bot uuid.  ShouldFly = TRUE/FALSE.  Enables or disables flight mode.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSitObject">
+botSitObject(key botID, key objectID, vector offset)
+Where botID = bot uuid,  objectID = uuid of object to sit on,  offset = Vector for sit position (note that VECTOR_ZERO = default sit pos).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botStandUp">
+botStandUp(key botID)
+Where botID = bot uuid.  Command bot to stand up.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botTouchObject">
+botTouchObject(key botID, key objectID)
+Where botID = bot uuid,  objectID = object uuid.  Causes bot to touch object identified.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botAddTag">
+botAddTag(key botID, string tag)
+Where botID = bot uuid,  tag = string tag over bot.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botGetBotsWithTag">
+botGetBotsWithTag(string tag)
+Where tag = tag string to match.  Return a list of bot UUID's in region with the matching tag.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botRemoveBotsWithTag">
+botRemoveBotsWithTag(string tag)
+Where tag = tag string to match.  Removes bot's matching the tag.
+(Aurora-Sim only)
+	</string>
+<!-- *** END OF OpenSimulator & Aurora-Sim syntax section *** -->
 
 	<!-- Strings needed by drop targets -->
 	<string name="CurrentlyNotSet">No definido actualmente </string>
-	<string name="CurrentlySetTo">Actualmente definido a: [ITEM]</string>
-	<string name="CurrentlySetToAnItemNotOnThisAccount">Actualmente definido a un artículo no está en esta cuenta</string>
+	<string name="CurrentlySetTo">Actualmente definido a</string>
+	<string name="CurrentlySetToAnItemNotOnThisAccount">Un artículo no está en esta cuenta</string>
 	<string name="NotLoggedIn">Desconectado</string>
 
 	<!-- Avatar busy/away mode -->
@@ -1846,7 +2822,6 @@ Returns a key that is the UUID of the user seated on the prim.
 	<string name="AvatarSetAway">Ausente</string>
 	<string name="AvatarSetNotBusy">No Ocupado</string>
 	<string name="AvatarSetBusy">Ocupado</string>
-	<string name="ok">OK</string>
 
 	<!-- LLGroupNotify -->
 	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
@@ -1873,7 +2848,24 @@ Returns a key that is the UUID of the user seated on the prim.
 
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">Elementos no hallados en el inventario.</string>
-
+	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
+	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
+	<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
+	<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
+	<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
+	<string name="InventoryOutboxNotMerchantTitle">Cualquiera puede vender ítems en el Mercado.</string>
+	<string name="InventoryOutboxNotMerchantTooltip"></string>
+	<string name="InventoryOutboxNotMerchant">
+Si quieres convertirte en un comerciante, tendrás que
+	</string>
+    <string name="InventoryOutboxNotMerchantSubs">crear una tienda en el Mercado.</string>
+	<string name="InventoryOutboxNoItemsTitle">Tu Buzón de Salida está vacío.</string>
+	<string name="InventoryOutboxNoItemsTooltip"></string>
+	<string name="InventoryOutboxNoItems">
+Arrastra carpetas a esta zona y pulsa "Enviar al Mercado" para listarlos y ponerlos en venta
+	</string>
+    <string name="InventoryOutboxNoItemsSubs">Mercado.</string>
+	 
 	<!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transferible)" />
 	<string name="no_modify"   value=" (no modificable)" />
@@ -1888,6 +2880,10 @@ Returns a key that is the UUID of the user seated on the prim.
 	<string name="WornOnAttachmentPoint" value=" (vestido en [ATTACHMENT_POINT])" />
 	<string name="LockedOnAttachmentPoint" value=" (bloqueado en[ATTACHMENT_POINT])" />
 	<string name="ActiveGesture" value="[GESLABEL] (activo)"/>
+
+	<!-- Inventory permissions -->
+	<string name="PermYes">Si</string>
+	<string name="PermNo">No</string>
 	
 	<!-- Gestures labels -->
     <!-- use value="" because they have preceding spaces -->
@@ -1922,6 +2918,7 @@ Returns a key that is the UUID of the user seated on the prim.
 	<!-- inventory FVBridge -->
 	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
 	<string name="Buy">Comprar</string>
+	<string name="Buyfor" value="Comprar para "/><!-- Grid currency is appended automatically -->	
 	
 	<string name="Stone">Piedra</string>
 	<string name="Metal">Metal</string>
@@ -1931,12 +2928,58 @@ Returns a key that is the UUID of the user seated on the prim.
 	<string name="Plastic">Plástico</string>
 	<string name="Rubber">Goma</string>
 	<string name="Light">Luz</string>
-	<string name="Unknown">(Desconocido)</string>
-	
+
+<!-- Avatar Skeleton -->
+	<string name="Chest">Pecho</string>
+	<string name="Skull">Cráneo</string>
+	<string name="Left Shoulder">Hombro Izquierdo</string>
+	<string name="Right Shoulder">Hombro Derecho</string>
+	<string name="Left Hand">Mano Izquierda</string>
+	<string name="Right Hand">Mano Derecha</string>
+	<string name="Left Foot">Pié Izquierdo</string>
+	<string name="Right Foot">Pié Derecho</string>
+	<string name="Spine">Columna</string>
+	<string name="Pelvis">Pelvis</string>
+	<string name="Mouth">Boca</string>
+	<string name="Chin">Mentón</string>
+	<string name="Left Ear">Oreja Izquierda</string>
+	<string name="Right Ear">Oreja DerechaEar</string>
+	<string name="Left Eyeball">Globo Ocular Izquierdo</string>
+	<string name="Right Eyeball">Globo Ocular Derecho</string>
+	<string name="Nose">Nariz</string>
+	<string name="R Upper Arm">Brazo Derecho</string>
+	<string name="R Forearm">Antebrazo Derecho</string>
+	<string name="L Upper Arm">Brazo Izquierdo</string>
+	<string name="L Forearm">Antebrazo Izquierdo</string>
+	<string name="Right Hip">Cadera Derecha</string>
+	<string name="R Upper Leg">Muslo Derecho</string>
+	<string name="R Lower Leg">Pierna Derecha</string>
+	<string name="Left Hip">Cadera Izquierda</string>
+	<string name="L Upper Leg">Muslo Izquierdo</string>
+	<string name="L Lower Leg">Pierna Izquierda</string>
+	<string name="Stomach">Estómago</string>
+	<string name="Left Pec">Pectoral Izquierdo</string>
+	<string name="Right Pec">Pectoral Derecho</string>
+    <string name="Neck">Cuello</string>
+    <string name="Root">Base</string>
+	<string name="unsupported point">Punto no soportado</string>
+	<string name="Invalid Attachment">Punto de anexión inválido</string>
+
+  <!-- HUD Position -->
+	<string name="Center 2">Centro 2</string>
+	<string name="Top Right">Superior Derecho</string>
+	<string name="Top">Superior</string>
+	<string name="Top Left">Superior Izquierdo</string>
+	<string name="Center">Centro</string>
+	<string name="Bottom Left">Inferior Izquierdo</string>
+	<string name="Bottom">Inferior</string>
+	<string name="Bottom Right">Inferior Derecha</string>
+
 	<!-- compile queue-->
-	<string name="CompileQueueDownloadedCompiling">Descardado, compilando</string>
+	<string name="CompileQueueDownloadedCompiling">Descargado, compilando</string>
 	<string name="CompileQueueScriptNotFound">El Script no ha sido hallado en el servidor.</string>
 	<string name="CompileQueueProblemDownloading">Problema al descargar</string>
+  <string name="CompileQueueProblemUploading">El Sim carece de capacidades UpdateScriptTask. No se puede pedir la recompilación</string>	
 	<string name="CompileQueueInsufficientPermDownload">Permisos insuficientes para descargar un script.</string>
 	<string name="CompileQueueInsufficientPermFor">Permisos insuficientes para</string>
 	<string name="CompileQueueUnknownFailure">Fallo desconocido en la descarga</string>
@@ -1955,8 +2998,47 @@ Returns a key that is the UUID of the user seated on the prim.
 	<string name="SaveComplete">Guardado completado.</string>
 	<string name="ObjectOutOfRange">Script (objeto fuera de rango)</string>
 
-	<string name="Unknown">(Desconocido)</string>	
-	
+	<!-- god tools -->
+	<string name="GodToolsObjectOwnedBy">Objeto [OBJECT] propiedad de [OWNER]</string>
+
+	<!-- groups -->
+	<string name="Group" value=" (grupo)" />
+	<string name="Unknown">(Desconocido)</string>
+	<string name="SummaryForTheWeek"    value="Sumario para esta semana, comenzada el " />
+	<string name="NextStipendDay"       value="Si siguiente día de estipendio es " />
+	<string name="GroupIndividualShare" value="                      Grupo       Participación Individual" />
+	<string name="GroupColumn"          value="                      Grupo" />
+
+	<!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar.
+		This is to help Lindens when answering questions. -->
+	<string name="IMParentEstate">estado padre</string>
+	<string name="IMMainland">mainland</string>
+	<string name="IMTeen">teen</string>
+
+    <!-- floater about land -->
+    <string name="Anyone">Cualquiera</string>
+	 
+	<!-- floater region info -->
+	<!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
+	<string name="RegionInfoError">error</string>
+	<string name="RegionInfoAllEstatesOwnedBy">
+		todos los Estados propiedad de [OWNER]
+	</string>
+	<string name="RegionInfoAllEstatesYouOwn">todos los Estados de tu propiedad</string>
+	<string name="RegionInfoAllEstatesYouManage">
+		todos los estados que administras para [OWNER]
+	</string>
+	<string name="RegionInfoAllowedResidents">Residentes Permitidos: ([ALLOWEDAGENTS], máx [MAXACCESS])</string>
+	<string name="RegionInfoAllowedGroups">Grupos Permitidos: ([ALLOWEDGROUPS], máx [MAXACCESS])</string>
+
+	<!-- panel contents -->
+	<string name="PanelContentsNewScript">Nuevo Script</string>
+
+	<!-- Region/Estate Covenant -->
+	<string name="RegionNoCovenant">No hay un Convenio provisto para este Estado.</string>
+	<string name="RegionNoCovenantOtherOwner">No hay un Convenio provisto para este Estado. El terreno de este Estado está siendo vendido por el propietario del Estado, no por Linden Lab. Por favor, contacta al propietario del Estado para más detalles.</string>
+	<string name="none_text"  value=" (ninguno) " />
+
 	<!-- Environment settings -->
 	<string name="Local">Local</string>
 	<string name="LocalSettings">Configuración Local</string>
@@ -1972,6 +3054,18 @@ Returns a key that is the UUID of the user seated on the prim.
 	<string name="InvOfferGaveYou">te ha dado</string>
 	<string name="InvOfferDecline">Has rechazado [DESC] de [NAME].</string>
 
+	<!-- group money -->
+	<string name="GroupMoneyTotal">Total</string>
+	<string name="GroupMoneyBought">comprado</string>
+	<string name="GroupMoneyPaidYou">te ha pagado</string>
+	<string name="GroupMoneyPaidInto">pagado en</string>
+	<string name="GroupMoneyBoughtPassTo">pase comprado para</string>
+	<string name="GroupMoneyPaidFeeForEvent">tasa del evento pagada</string>
+	<string name="GroupMoneyPaidPrizeForEvent">precio del evento pagado</string>
+	<string name="GroupMoneyBalance">Balance</string>
+	<string name="GroupMoneyCredits">Créditos</string>
+	<string name="GroupMoneyDebits">Débitos</string>
+
 	<!-- Viewer menu -->
 	<string name="AcquiredItems">Ítems adquiridos</string>
 	<string name="Cancel">Cancelar</string>
@@ -2141,7 +3235,7 @@ Si continuas recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Beady Eyes">Ojos Pequeños y Brillantes</string>
 	<string name="Belly Size">Tamaño del Vientre</string>
 	<string name="Big">Grande</string>
-	<string name="Big Butt">Cola Grande</string>
+	<string name="Big Butt">Glúteos Grandes</string>
 
 	<string name="Big Hair Back">Pelo grande: Atrás</string>
 	<string name="Big Hair Front">Pelo Grande: Frente</string>
@@ -2155,94 +3249,89 @@ Si continuas recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Blush">Rubor</string>
 	<string name="Blush Color">Color del Rubor</string>
 	<string name="Blush Opacity">Opacidad del Rubor</string>
-	<string name="Body Definition">Body Definition</string>
+	<string name="Body Definition">Definición del Cuerpo</string>
 	<string name="Body Fat">Gordura</string>
 	<string name="Body Freckles">Pecas del Cuerpo</string>
 	<string name="Body Thick">Grosor del Cuerpo</string>
-	<string name="Body Thickness">Body Thickness</string>
-	<string name="Body Thin">Body Thin</string>
+	<string name="Body Thickness">Delgadez corporal</string>
+	<string name="Body Thin">Finura corporal</string>
 
-<string name="Bow Legged">Bow Legged</string>
-<string name="Breast Buoyancy">Breast Buoyancy</string>
-<string name="Breast Cleavage">Breast Cleavage</string>
-<string name="Breast Size">Breast Size</string>
-<string name="Bridge Width">Bridge Width</string>
-<string name="Broad">Broad</string>
-<string name="Brow Size">Brow Size</string>
-<string name="Bug Eyes">Bug Eyes</string>
-<string name="Bugged Eyes">Bugged Eyes</string>
-<string name="Bulbous">Bulbous</string>
-<string name="Bulbous Nose">Bulbous Nose</string>
+<string name="Bow Legged">Arqueado de Piernas</string>
+<string name="Breast Buoyancy">Firmeza de Senos</string>
+<string name="Breast Cleavage">Escote</string>
+<string name="Breast Size">Tamaño de Senos</string>
+<string name="Bridge Width">Ancho de Puente</string>
+<string name="Broad">Extensión</string>
+<string name="Brow Size">Arco Frontal</string>
+<string name="Bug Eyes">Ojos Saltones</string>
+<string name="Bugged Eyes">Ojos Saltones</string>
+<string name="Bulbous">Bulbosa</string>
+<string name="Bulbous Nose">Nariz Bulbosa</string>
 
-<string name="Breast Physics Mass">Breast Mass</string>
-<string name="Breast Physics Smoothing">Breast Smoothing</string>
-<string name="Breast Physics Gravity">Breast Gravity</string>
-<string name="Breast Physics Drag">Breast Drag</string>
+<string name="Breast Physics Mass">Senos: Masa</string>
+<string name="Breast Physics Smoothing">Senos. Alisado</string>
+<string name="Breast Physics Gravity">Senos: Gravedad</string>
+<string name="Breast Physics Drag">Senos: Arrastre</string>
 
-<string name="Breast Physics InOut Max Effect">Max Effect</string>
-<string name="Breast Physics InOut Spring">Spring</string>
-<string name="Breast Physics InOut Gain">Gain</string>
-<string name="Breast Physics InOut Damping">Damping</string>
+<string name="Breast Physics InOut Max Effect">Efecto Máximo</string>
+<string name="Breast Physics InOut Spring">Elasticidad</string>
+<string name="Breast Physics InOut Gain">Ganancia</string>
+<string name="Breast Physics InOut Damping">Amortiguación</string>
 
-<string name="Breast Physics UpDown Max Effect">Max Effect</string>
-<string name="Breast Physics UpDown Spring">Spring</string>
-<string name="Breast Physics UpDown Gain">Gain</string>
-<string name="Breast Physics UpDown Damping">Damping</string>
+<string name="Breast Physics UpDown Max Effect">Efecto Máximo</string>
+<string name="Breast Physics UpDown Spring">Elasticidad</string>
+<string name="Breast Physics UpDown Gain">Ganancia</string>
+<string name="Breast Physics UpDown Damping">Amortiguación</string>
 
-<string name="Breast Physics LeftRight Max Effect">Max Effect</string>
-<string name="Breast Physics LeftRight Spring">Spring</string>
-<string name="Breast Physics LeftRight Gain">Gain</string>
-<string name="Breast Physics LeftRight Damping">Damping</string>
+<string name="Breast Physics LeftRight Max Effect">Efecto Máximo</string>
+<string name="Breast Physics LeftRight Spring">Elasticidad</string>
+<string name="Breast Physics LeftRight Gain">Ganancia</string>
+<string name="Breast Physics LeftRight Damping">Amortiguación</string>
 
-<string name="Belly Physics Mass">Belly Mass</string>
-<string name="Belly Physics Smoothing">Belly Smoothing</string>
-<string name="Belly Physics Gravity">Belly Gravity</string>
-<string name="Belly Physics Drag">Belly Drag</string>
+<string name="Belly Physics Mass">Vientre: Masa</string>
+<string name="Belly Physics Smoothing">Vientre: Alisado</string>
+<string name="Belly Physics Gravity">Vientre: Gravedad</string>
+<string name="Belly Physics Drag">Vientre: Arrastre</string>
 
-<string name="Belly Physics UpDown Max Effect">Max Effect</string>
-<string name="Belly Physics UpDown Spring">Spring</string>
-<string name="Belly Physics UpDown Gain">Gain</string>
-<string name="Belly Physics UpDown Damping">Damping</string>
+<string name="Belly Physics UpDown Max Effect">Efecto Máximo</string>
+<string name="Belly Physics UpDown Spring">Elasticidad</string>
+<string name="Belly Physics UpDown Gain">Ganancia</string>
+<string name="Belly Physics UpDown Damping">Amortiguación</string>
 
-<string name="Butt Physics Mass">Butt Mass</string>
-<string name="Butt Physics Smoothing">Butt Smoothing</string>
-<string name="Butt Physics Gravity">Butt Gravity</string>
-<string name="Butt Physics Drag">Butt Drag</string>
+<string name="Butt Physics Mass">Nalgas: Masa</string>
+<string name="Butt Physics Smoothing">Nalgas: Alisado</string>
+<string name="Butt Physics Gravity">Nalgas: Gravedad</string>
+<string name="Butt Physics Drag">Nalgas: Arrastre</string>
 
-<string name="Butt Physics UpDown Max Effect">Max Effect</string>
-<string name="Butt Physics UpDown Spring">Spring</string>
-<string name="Butt Physics UpDown Gain">Gain</string>
-<string name="Butt Physics UpDown Damping">Damping</string>
+<string name="Butt Physics UpDown Max Effect">Efecto Máximo</string>
+<string name="Butt Physics UpDown Spring">Elasticidad</string>
+<string name="Butt Physics UpDown Gain">Ganancia</string>
+<string name="Butt Physics UpDown Damping">Amortiguación</string>
 
-<string name="Butt Physics LeftRight Max Effect">Max Effect</string>
-<string name="Butt Physics LeftRight Spring">Spring</string>
-<string name="Butt Physics LeftRight Gain">Gain</string>
-<string name="Butt Physics LeftRight Damping">Damping</string>
-
-<string name="Bushy Eyebrows">Bushy Eyebrows</string>
-<string name="Bushy Hair">Bushy Hair</string>
-<string name="Butt Size">Butt Size</string>
-<string name="Butt Gravity">Butt Gravity</string>
-<string name="bustle skirt">Bustle Skirt</string>
-<string name="no bustle">No Bustle</string>
-<string name="more bustle">More Bustle</string>
+<string name="Bushy Eyebrows">Cejas Tupidas</string>
+<string name="Bushy Hair">Cabello Espeso</string>
+<string name="Butt Size">Tamaño de las Nalgas</string>
+<string name="Butt Gravity">Gravedad de Nalgas</string>
+<string name="bustle skirt">Movimiento de Falda</string>
+<string name="no bustle">Sin Movimiento</string>
+<string name="more bustle">Más MovimientoMore Bustlestring>
 
 <string name="Chaplin">Chaplin</string>
-<string name="Cheek Bones">Cheek Bones</string>
-<string name="Chest Size">Chest Size</string>
-<string name="Chin Angle">Chin Angle</string>
-<string name="Chin Cleft">Chin Cleft</string>
+<string name="Cheek Bones">Huesos de la Mejilla</string>
+<string name="Chest Size">Tamaño del Pecho</string>
+<string name="Chin Angle">Ángulo del Mentón</string>
+<string name="Chin Cleft">Mentón Hendido</string>
 <string name="Chin Curtains">Chin Curtains</string>
 
-<string name="Chin Depth">Chin Depth</string>
-<string name="Chin Heavy">Chin Heavy</string>
+<string name="Chin Depth">Profundidad Mentón</string>
+<string name="Chin Heavy">Dureza del Mentón</string>
 <string name="Chin In">Chin In</string>
 <string name="Chin Out">Chin Out</string>
 <string name="Chin-Neck">Chin-Neck</string>
-<string name="Clear">Clear</string>
-<string name="Cleft">Cleft</string>
+<string name="Clear">Limpia</string>
+<string name="Cleft">Hendidura</string>
 <string name="Close Set Eyes">Close Set Eyes</string>
-<string name="Closed">Closed</string>
+<string name="Closed">Cerrado</string>
 <string name="Closed Back">Closed Back</string>
 <string name="Closed Front">Closed Front</string>
 <string name="Closed Left">Closed Left</string>
@@ -2250,12 +3339,8 @@ Si continuas recibiendo este mensaje, contacta con [SUPPORT_SITE].
 <string name="Coin Purse">Coin Purse</string>
 <string name="Collar Back">Collar Back</string>
 
-
-
 <string name="Collar Front">Collar Front</string>
 
-
-
 <string name="Corner Down">Corner Down</string>
 
 <string name="Corner Up">Corner Up</string>
@@ -2300,13 +3385,6 @@ Si continuas recibiendo este mensaje, contacta con [SUPPORT_SITE].
 
 <string name="Eyes Bugged">Eyes Bugged</string>
 
-
-
-
-
-
-
-
 <string name="Face Shear">Face Shear</string>
 <string name="Facial Definition">Facial Definition</string>
 <string name="Far Set Eyes">Far Set Eyes</string>
@@ -2338,60 +3416,59 @@ Si continuas recibiendo este mensaje, contacta con [SUPPORT_SITE].
 
 <string name="Glove Length">Glove Length</string>
 
-
-<string name="Hair">Hair</string>
-<string name="Hair Back">Hair: Back</string>
-<string name="Hair Front">Hair: Front</string>
-<string name="Hair Sides">Hair: Sides</string>
-<string name="Hair Sweep">Hair Sweep</string>
-<string name="Hair Thickess">Hair Thickness</string>
-<string name="Hair Thickness">Hair Thickness</string>
-<string name="Hair Tilt">Hair Tilt</string>
-<string name="Hair Tilted Left">Hair Tilted Left</string>
-<string name="Hair Tilted Right">Hair Tilted Right</string>
-<string name="Hair Volume">Hair: Volume</string>
-<string name="Hand Size">Hand Size</string>
-<string name="Handlebars">Handlebars</string>
-<string name="Head Length">Head Length</string>
-<string name="Head Shape">Head Shape</string>
-<string name="Head Size">Head Size</string>
-<string name="Head Stretch">Head Stretch</string>
-<string name="Heel Height">Heel Height</string>
-<string name="Heel Shape">Heel Shape</string>
-<string name="Height">Height</string>
-<string name="High">High</string>
-<string name="High Heels">High Heels</string>
-<string name="High Jaw">High Jaw</string>
-<string name="High Platforms">High Platforms</string>
-<string name="High and Tight">High and Tight</string>
-<string name="Higher">Higher</string>
-<string name="Hip Length">Hip Length</string>
-<string name="Hip Width">Hip Width</string>
+<string name="Hair">Pelo</string>
+<string name="Hair Back">Pelo: Atrás</string>
+<string name="Hair Front">Pelo: Adelante</string>
+<string name="Hair Sides">Pelo: Costados</string>
+<string name="Hair Sweep">Peinado</string>
+<string name="Hair Thickess">Pelo Grueso</string>
+<string name="Hair Thickness">Pelo Grueso</string>
+<string name="Hair Tilt">Pelo inclinado</string>
+<string name="Hair Tilted Left">Pelo inclinado a Izquierda</string>
+<string name="Hair Tilted Right">Pelo inclinado a Derecha</string>
+<string name="Hair Volume">Pelo: Volumen</string>
+<string name="Hand Size">Tamaño de la Mano</string>
+<string name="Handlebars">Manillar</string>
+<string name="Head Length">Cabeza: Longitud</string>
+<string name="Head Shape">Cabeza: Forma</string>
+<string name="Head Size">Cabeza: Tamaño</string>
+<string name="Head Stretch">Cabeza Estirada</string>
+<string name="Heel Height">Altura del Tacón</string>
+<string name="Heel Shape">Forma del Tacón</string>
+<string name="Height">Altura</string>
+<string name="High">Alto</string>
+<string name="High Heels">Tacones Altos</string>
+<string name="High Jaw">Altura Mandíbula</string>
+<string name="High Platforms">Plataformas Altas</string>
+<string name="High and Tight">Alto y Estrecho</string>
+<string name="Higher">Más Grande</string>
+<string name="Hip Length">Largo de Cadera</string>
+<string name="Hip Width">Ancho de Cadera</string>
 <string name="In">In</string>
-<string name="In Shdw Color">Inner Shadow Color</string>
-<string name="In Shdw Opacity">Inner Shadow Opacity</string>
-<string name="Inner Eye Corner">Inner Eye Corner</string>
-<string name="Inner Eye Shadow">Inner Eye Shadow</string>
-<string name="Inner Shadow">Inner Shadow</string>
+<string name="In Shdw Color">Color Sombra Interior</string>
+<string name="In Shdw Opacity">Opacidad Sombra Interior</string>
+<string name="Inner Eye Corner">Ángulo Interior del Ojo</string>
+<string name="Inner Eye Shadow">Sombra Interior del Ojo</string>
+<string name="Inner Shadow">Sombra Interior</string>
 
 
-<string name="Jacket Length">Jacket Length</string>
+<string name="Jacket Length">Largo de Chaqueta</string>
 
-<string name="Jacket Wrinkles">Jacket Wrinkles</string>
-<string name="Jaw Angle">Jaw Angle</string>
-<string name="Jaw Jut">Jaw Jut</string>
-<string name="Jaw Shape">Jaw Shape</string>
-<string name="Join">Join</string>
-<string name="Jowls">Jowls</string>
-<string name="Knee Angle">Knee Angle</string>
-<string name="Knock Kneed">Knock Kneed</string>
+<string name="Jacket Wrinkles">Arrugas de Chaqueta</string>
+<string name="Jaw Angle">Ángulo de la Mandíbula</string>
+<string name="Jaw Jut">Protuberancia Mandíbula</string>
+<string name="Jaw Shape">Forma Mandíbula</string>
+<string name="Join">Unión</string>
+<string name="Jowls">Papada</string>
+<string name="Knee Angle">Ángulo Rodilla</string>
+<string name="Knock Kneed">Rodillazo</string>
 
-<string name="Large">Large</string>
-<string name="Large Hands">Large Hands</string>
-<string name="Left Part">Left Part</string>
-<string name="Leg Length">Leg Length</string>
-<string name="Leg Muscles">Leg Muscles</string>
-<string name="Less">Less</string>
+<string name="Large">Largo</string>
+<string name="Large Hands">Largo de Manos</string>
+<string name="Left Part">Parte Izquierda</string>
+<string name="Leg Length">Largo de Pierna</string>
+<string name="Leg Muscles">Musculos de las Piernas</string>
+<string name="Less">Menos</string>
 <string name="Less Body Fat">Less Body Fat</string>
 <string name="Less Curtains">Less Curtains</string>
 <string name="Less Freckles">Less Freckles</string>
@@ -2681,757 +3758,206 @@ Si continuas recibiendo este mensaje, contacta con [SUPPORT_SITE].
 <string name="Waist Height">Waist Height</string>
 
 
-<string name="Well-Fed">Well-Fed</string>
-<string name="White Hair">White Hair</string>
-<string name="Wide">Wide</string>
+<string name="Well-Fed">Bien Alimentado</string>
+<string name="White Hair">Pelo Blanco</string>
+<string name="Wide">Ancho</string>
 <string name="Wide Back">Wide Back</string>
 <string name="Wide Front">Wide Front</string>
-<string name="Wide Lips">Wide Lips</string>
-<string name="Wild">Wild</string>
-<string name="Wrinkles">Wrinkles</string>
+<string name="Wide Lips">Labios Anchos</string>
+<string name="Wild">Salvaje</string>
+<string name="Wrinkles">Arrugas</string>
 
+	<!-- System Messages -->
+	<string name="ItemsComingInTooFastFrom">[APP_NAME]: Ítems llegando muy rápido desde [FROM_NAME], la vista previa automática ha sido deshabilitada por [TIME] segundos.</string>
+	<string name="ItemsComingInTooFast">[APP_NAME]: Ítems llegando muy rápido, la vista previa automática ha sido deshabilitada por [TIME] segundos.</string>
+	
 	<!-- IM system messages -->
-	<string name="IM_announce_incoming">has begun an IM session with you.</string>
-	<string name="IM_autoresponded_to">Autoresponse sent to</string>
-	<string name="IM_autoresponse_sent_item">was sent auto-response item</string>
-	<string name="Unnamed">(Unnamed)</string>
-	<string name="Saved_message">(Saved [LONG_TIMESTAMP]) </string>
-	<string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string>
-	<string name="PowerUser2">Use your newfound abilities wisely.</string>
-	<string name="Unlocked:">Unlocked:</string>
-	<string name="PowerUser3">- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.</string>
+	<string name="IM_announce_incoming">ha iniciado una sesión de IM contigo.</string>
+	<string name="IM_autoresponded_to">Respuesta Automática enviada a</string>
+	<string name="IM_autoresponse_sent_item">se ha enviado un ítem con la respuesta automática</string>
+	<string name="Unnamed">(Sin nombre)</string>
+	<string name="Saved_message">(Guardado [LONG_TIMESTAMP]) </string>
+	<string name="PowerUser1">Te han sido otorgados poderes más allá de la comprensión mortal.</string>
+	<string name="PowerUser2">Utiliza tus nuevas habilidades con sabiduría.</string>
+	<string name="Unlocked:">Desbloqueado:</string>
+	<string name="PowerUser3">- Prioridad de Animacíon hasta 7 - Destinado para animaciones que deben prevalecer sobre cualesquiera otras y en todo momento. NO UTILIZAR PARA ANIMACIONES EN GENERAL.</string>
 	<string name="RightClick">Right click</string>
-	<string name="PowerUser4">Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.</string>
-	<string name="PowerUser5">Explode objects - Turns an object physical, temporary, and delinks it.</string>
+	<string name="PowerUser4">Destruir Objetos - Borra en forma inmediata y permanente un objeto, cuando no tienes paciencia para esperar la respuesta del servidor.</string>
+	<string name="PowerUser5">Explotar Objetos - Convierte un objeto Físico en temporal y desenlaza sus partes.</string>
 
-  <string name="group_role_everyone">Everyone</string>
-  <string name="group_role_officers">Officers</string>
-  <string name="group_role_owners">Owners</string>
-  <string name="group_member_status_online">Online</string>
+	<!-- voice calls -->
 
+	<string name="ringing-im">
+		Uniéndose a llamada de voz...
+	</string>
+	<string name="connected-im">
+		Conectado, Pulsa Terminar Llamada para cortar
+	</string>
+	<string name="hang_up-im">
+		Abandonar la conversación de voz
+	</string>
+	<string name="answering-im">
+		Conectando...
+	</string>
+	<string name="inventory_item_offered-im">
+		Ofrecido un Ítem de Inventario
+	</string>
 
-  <string name="DefaultMimeType">none/none</string>
-  <string name="Chat">Chat</string>
+	<string name="only_user_message">
+		eres el único usuario en esta sesión.
+	</string>
+	<string name="offline_message">
+		[NAME] está desconectado.
+	</string>
+	<string name="invite_message">
+		Pulsa el Botón [BUTTON NAME] para aceptar/conectar a este chat de voz.
+	</string>
+	<string name="muted_message">
+		Tiene Ignorado a este residente. Enviándole un mensaje hará que dejes de ignorarlo automáticamente.
+	</string>
+  <!--Sometimes string name is gotten from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name.
+  Also there are some other places where "generic" is used.
+  So, let's add string with name="generic" with the same value as "generic_request_error" -->
+	<string name="generic">
+		Error al hacer la solicitud, por favor, inténtalo de nuevo más tarde.
+	</string>
+	<string name="generic_request_error">
+		Error al hacer la solicitud, por favor, inténtalo de nuevo más tarde.
+	</string>
+	<string name="insufficient_perms_error">
+		No tienes suficientes permisos.
+	</string>
+	<string name="session_does_not_exist_error">
+		Esta sesión ya no existe
+	</string>
+	<string name="no_ability_error">
+		No tienes esta capacidad.
+	</string>
+	<string name="no_ability">
+		No tienes esta capacidad.
+	</string>
+	<string name="not_a_mod_error">
+		No eres moderador en la sesión.
+	</string>
+  <!--Sometimes string name is gotten from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3562 issue 'muted' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let's add string with name="muted" with the same value as "muted_error" -->
+	<string name="muted">
+		Un moderador del grupo ha bloqueado tu chat de texto.
+	</string>
+	<string name="muted_error">
+		Un moderador del grupo ha bloqueado tu chat de texto.
+	</string>
+	<string name="add_session_event">
+		No se pueden agregar usuarios a la sesión de chat con [RECIPIENT].
+	</string>
+  <!--Sometimes string name is gotten from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3562 issue 'message' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let's add string with name="message" with the same value as "message_session_event" -->
+	<string name="message">
+		No se puede enviar tu mensaje a la sesión de chat con [RECIPIENT].
+	</string>
+	<string name="message_session_event">
+		No se puede enviar tu mensaje a la sesión de chat con [RECIPIENT].
+	</string>
+	<string name="mute">
+		Error al moderar.
+	</string>
+  <!--Sometimes string name is gotten from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+  In case of the EXT-3459 issue 'removed' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let's add string with name="removed" with the same value as "removed_from_group" -->
+	<string name="removed">
+		Has sido expulsado del grupo.
+	</string>
+	<string name="removed_from_group">
+		Has sido expulsado del grupo.
+	</string>
+	<string name="close_on_no_ability">
+		Ya no tienes la capacidad para estar en esta sesión de chat.
+	</string>
 
+	<string name="Home position set.">Posición de la Base definida.</string>
 
-  <string name="group_role_everyone">Cualquiera</string>
-  <string name="group_role_officers">Oficiales</string>
-  <string name="group_role_owners">Propietarios</string>	
-  <string name="group_member_status_online">Conectado</string>
-  
-  <string name="Chat">Chat</string>
+<!-- Financial operations strings -->
+	<string name="paid_you_ldollars">[NAME] te ha pagado L$[AMOUNT] [REASON].</string>
+	<string name="paid_you_ldollars_no_reason">[NAME] te ha pagado L$[AMOUNT].</string>
+	<string name="you_paid_ldollars">Has pagado a [NAME] L$[AMOUNT] [REASON].</string>
+	<string name="you_paid_ldollars_no_info">Has pagado L$[AMOUNT].</string>
+	<string name="you_paid_ldollars_no_reason">Has pagado a [NAME] L$[AMOUNT].</string>
+	<string name="you_paid_ldollars_no_name">Has pagado L$[AMOUNT] [REASON].</string>
+	<string name="you_paid_failure_ldollars">Ha fallado tu pago [NAME] L$[AMOUNT] [REASON].</string>
+	<string name="you_paid_failure_ldollars_no_info">Ha fallado tu pago de L$[AMOUNT].</string>
+	<string name="you_paid_failure_ldollars_no_reason">Ha fallado tu pago a [NAME] L$[AMOUNT].</string>
+	<string name="you_paid_failure_ldollars_no_name">Ha fallado tu pago de L$[AMOUNT] [REASON].</string>
+	<string name="for item">para[ITEM]</string>
+	<string name="for a parcel of land">por una parcela de terreno</string>
+	<string name="for a land access pass">por acceso a una parcela</string>
+  <string name="for deeding land">por trasferir terreno</string>
+	<string name="to create a group">por crear un grupo</string>
+	<string name="to join a group">por unirte a un grupo</string>
+	<string name="to upload">to upload</string>
+	<string name="to publish a classified ad">por publicar un aviso clasificado</string>
 
-  <string name="DefaultMimeType">ninguno/ninguno</string>
+	<string name="giving">dando [CURRENCY]</string>
+	<string name="this_costs">Esto cuesta [CURRENCY]</string>
+
+	<string name="group_role_everyone">Cualquiera</string>
+	<string name="group_role_officers">Oficiales</string>
+	<string name="group_role_owners">Propietarios</string>
+	<string name="group_member_status_online">En Línea</string>
+
+	<string name="uploading_abuse_report">>Enviando...
+
+Denuncia</string>
+
+	<!-- names for new inventory items-->
+	<string name="New Shape">Nuevo Cuerpo</string>
+	<string name="New Skin">Nueva Piel</string>
+	<string name="New Hair">Nuevo Pelo</string>
+	<string name="New Eyes">Nuevos OjosNew Eyesstring>
+	<string name="New Shirt">Nueva Camisa</string>
+	<string name="New Pants">Nuevos Pantalones</string>
+	<string name="New Shoes">Nuevos Zapatos</string>
+	<string name="New Socks">Nuevos calcetines</string>
+	<string name="New Jacket">Nueva Chaqueta</string>
+	<string name="New Gloves">Nuevos Guantes</string>
+	<string name="New Undershirt">Nueva Camiseta</string>
+	<string name="New Underpants">Nueva Ropa Interior</string>
+	<string name="New Skirt">Nueva Falda</string>
+	<string name="New Alpha">Nueva Capa Alfa</string>
+	<string name="New Tattoo">Nuevo Tatuaje</string>
+	<string name="New Physics">Nueva Capa Física</string>
+	<string name="Invalid Wearable">Vestimenta Inválida</string>
+	<string name="New Gesture">Nuevo Gesto</string>
+	<string name="New Script">Nuevo Script</string>
+	<string name="New Note">Nueva Nota</string>
+	<string name="New Folder">Nueva Carpeta</string>
+	<string name="DefaultMimeType">ninguno/ninguno</string>
+	<string name="Chat">Chat</string>
 
  <!-- External editor status codes -->
- <string name="ExternalEditorNotSet">Escoge un editor usando las configuraciones de Editor Externo.</string>
+ <string name="ExternalEditorNotSet">Selecciona un editor usando las configuraciones de Editor Externo.</string>
  <string name="ExternalEditorNotFound">No se puede hallar el editor externo que has especificado.
 Intenta entrecomillando el camino al editor.
 (P.ej. "/Camino al/editor" "%s")</string>
  <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
  <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
 
-<!-- Addition of OSSL commands for use in OpenSimulator based regions, including Aurora -->
-  <string name="LSLTipText_osSetRegionWaterHeight">
-osSetRegionWaterHeight(float height)
-Adjusts water height on region.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetRegionSunSettings">
-osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)
-Changes the estate sun settings, then triggers a sun update
-'sunFixed' TRUE to keep the sun stationary, FALSE to use global time
-'sunHour' The sun hour that is desired, 0...24, 0 is sunrise.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetEstateSunSettings">
-osSetEstateSunSettings(integer sunFixed, float sunHour)
-sunFixed = TRUE or FALSE, sunHour = 00.00 to 24.00.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetCurrentSunHour">
-float osGetCurrentSunHour()
-Returns float value of current sun hour 0...24 0 is sunrise.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSunGetParam">
-*DEPRECATED* Use osGetSunParam instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSunSetParam">
-*DEPRECATED* Use osSetSunParam instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osWindActiveModelPluginName">
-string osWindActiveModelPluginName()
-Returns the current working wind module installed
-These are SimpleRandomWind or ConfigurableWind.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osParcelJoin">
-osParcelJoin(vector pos1, vector pos2))
-Joins parcels @ X,Y coordinates.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osParcelSubdivide">
-osParcelSubdivide(vector pos1, vector pos2))
-Subdivides parcels @ X,Y coordinates.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osParcelSetDetails">
-*DEPRECATED* Use osSetParcelDetails instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osWindParamSet">
-*DEPRECATED* Use osSetWindParam instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osWindParamGet">
-*DEPRECATED* Use osGetWindParam instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osList2Double">
-double osList2Double(list src, integer index)
-Returns double-precision value from src at index.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureURL">
-osSetDynamicTextureURL(key dynamicID, string contentType, string url, string extraParams, integer timer )
-Renders a web texture on the prim containing the script, and returns the UUID of the newly created texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureData">
-osSetDynamicTextureData(key dynamicID, string contentType, string data, string extraParams, integer timer)
-Writes text and vector graphics onto a prim face.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureURLBlend">
-osSetDynamicTextureURLBlend(key dynamicID, string contentType, string url, string extraParams, integer timer, integer alpha)
-Allows for two dynamic textures to blend on the prim containing this script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureDataBlend">
-osSetDynamicTextureDataBlend(key dynamicID, string contentType, string data, string extraParams, integer timer, integer alpha)
-Allows for two dynamic textures to blend on the prim containing this script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureURLBlendFace">
-osSetDynamicTextureURLBlendFace(key dynamicID, string contentType, string url, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
-Loads a web texture on a prim.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureDataBlendFace">
-osSetDynamicTextureDataBlendFace(key dynamicID, string contentType, string data, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTerrainGetHeight">
-*DEPRECATED* Use osGetTerrainHeight instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTerrainSetHeight">
-*DEPRECATED* Use osSetTerrainHeight instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTerrainFlush">
-osTerrainFlush()
-Updates terrain data. Call this after you are done using osTerrainSetHeight.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osRegionRestart">
-integer osRegionRestart(float seconds)
-Restart the current region in the specified number of seconds from now.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osRegionNotice">
-osRegionNotice(string msg)
-Broadcasts a notification message to all agents on the current region.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osConsoleCommand">
-osConsoleCommand(string command)
-Issues commands directly to the OpenSim server console.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetParcelMediaURL">
-osSetParcelMediaURL(string url)
-Sets parcel media URL.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetParcelSIPAddress">
-osSetParcelSIPAddress(string SIPAddress)
-Sets parcel SIP Address for Voice.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPrimFloatOnWater">
-osSetPrimFloatOnWater(integer floatYN)
-Make physical prims float at the water level, TRUE or FALSE.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTeleportAgent">
-osTeleportAgent(key agent, integer regionX, integer regionY, vector position, vector lookat)
-  or
-osTeleportAgent(key agent, string regionName, vector position, vector lookat)
-  or
-osTeleportAgent(key agent, vector position, vector lookat)
-Teleports the specified agent to a specified location in the region, the grid, or the hypergrid. See documentation for details.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetAgentIP">
-string osGetAgentIP(key agent)
-Returns the Avatars IP Address
-Allows in-world tools be used to coordinate out of world network services that need access to client IP addresses.
-Should *ONLY* be used by Region Server Owner.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetAgents">
-list osGetAgents()
-Returns a list of all avatars in the region in which the script is running.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osAvatarPlayAnimation">
-osAvatarPlayAnimation(key UUID, string animation)
-Triggers animations contained within the same prim as the script. Does not need the target avatar's permission.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osAvatarStopAnimation">
-osAvatarStopAnimation(key UUID, string animation)
-Stops specified animation on the specified avatar.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osMovePen">
-osMovePen(string drawList, integer x, integer y)
-Moves the pen's location to the coordinates specified by the x and y parameters, without drawing anything.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawLine">
-osDrawLine(string drawList, integer startX, integer startY, integer endX, integer endY)
-osDrawLine(string drawList, integer endX, integer endY)
-Draws a line on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawText">
-osDrawText(string drawList, string text)
-Renders text on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawEllipse">
-osDrawEllipse(string drawList, integer width, integer height)
-Draws an ellipse on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawRectangle">
-osDrawRectangle(string drawList, integer width, integer height)
-Draws a rectangle on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawFilledRectangle">
-osDrawFilledRectangle(string drawList, integer width, integer height)
-Draws a rectangle on a dynamic texture, and fills it with the current pen color.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawPolygon">
-string osDrawPolygon (string drawList, list x, list y)
-Draws a polygon on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawFilledPolygon">
-string osDrawFilledPolygon (string drawList, list x, list y)
-Draws a polygon on a dynamic texture, and fills it with the current pen color.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetFontSize">
-osSetFontSize(string drawList, integer fontSize)
-Sets the font size to be used in osDrawText.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetFontName">
-osSetFontName(string drawList, string fontName)
-Sets current font to be used by osDrawText.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPenSize">
-osSetPenSize(string drawList, integer penSize)
-Sets the pen size (line thickness) that is to be used when drawing dynamic textures.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPenCap">
-osSetPenCap(string drawList, string direction, string type)
-Apply a shape on the end of a line. This allows using arrow, diamond, round and flat caps.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPenColour">
-*DEPRECATED* Use osSetPenColor instead
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawImage">
-osDrawImage(string drawList, integer width, integer height, string imageUrl)
-Retrieves an image specified by the imageUrl parameter and draws it at the specified height and width.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetDrawStringSize">
-vector osGetDrawStringSize(string contentType, string text, string fontName, integer fontSize)
-Returns a vector containing the horizontal and vertical dimensions in pixels of the specified text
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetStateEvents">
-osSetStateEvents(integer events)
-Used in the past as a workaround for a bug with Opensim, which has long since been fixed.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetScriptEngineName">
-string osGetScriptEngineName()
-Returns the name of the script engine which is currently enabled on the server.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetSimulatorVersion">
-string osGetSimulatorVersion()
-Returns OpenSim server version information as a string.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osParseJSON">
-string osParseJSON(string JSON)
-Returns a hashtable containing the structured JSON contents.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osMessageObject">
-osMessageObject(key UUID, string message)
-Sends a string to the object identified by UUID.
-The receiving object requires a dataserver(key queryid, string data) in a contained script(s).
-The queryid passed will be the id of the calling object.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osMakeNotecard">
-osMakeNotecard(string notecardName, list contents)
-Write a Notecard contained in Prim with contents of list.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetNotecardLine">
-string osGetNotecardLine(string name, integer line)
-Reads the requested notecard line and return its data as a string.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetNotecard">
-string osGetNotecard(string name)
-Reads the entire notecard and return its data as a string.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetNumberOfNotecardLines">
-integer osGetNumberOfNotecardLines(string name)
-Returns total number of lines in a notecard.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osAvatarName2Key">
-key osAvatarName2Key(string firstname, string lastname)
-Returns the avatar's UUID from their firstname, lastname.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osKey2Name">
-string osKey2Name(key UUID)
-Returns avatar name from their UUID key.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridNick">
-string osGetGridNick()
-Returns the grid's nickname.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridName">
-string osGetGridName()
-Returns the grid's name.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridLoginURI">
-string osGetGridLoginURI()
-Returns the grid's LoginURI.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osFormatString">
-string osFormatString(string str, list strings)
-Return the string with parameters substituted into it (format comes from .NET String.Format class)
-Parameters are specified positionally.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osMatchString">
-list osMatchString(string src, string pattern, integer start)
-Return a list of matches for the pattern and its components inside the source string.
-The pattern is a regular expression. Each match in the result is the string that matched and its position in the source.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osLoadedCreationDate">
-string osLoadedCreationDate()
-Returns Creation Date from meta data of OAR.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osLoadedCreationTime">
-string osLoadedCreationTime()
-Returns Creation Time from meta data of OAR.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osLoadedCreationID">
-string osLoadedCreationID()
-Returns creation ID from meta data of OAR. Can not be used to identify a machine.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetLinkPrimitiveParams">
-list osGetLinkPrimitiveParams(integer linknumber, list rules)
-Returns the primitive parameters for the linkset prims specified by linknumber. If using linkset constants (e.g. LINK_SET, LINK_ALL_CHILDREN, etc), the requested parameters of each relevant prim are concatenated to the end of the list. Otherwise, usage is identical to llGetPrimitiveParams().
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcCreate">
-key osNpcCreate(string firstname, string lastname, vector position, key UUID)
-Creates an NPC (Non Player Character) clone named firstname lastname at position from an already existing avatar specified by UUID.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcMoveTo">
-osNpcMoveTo(key npc, vector position)
-Moves an NPC to a location within the region.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcSay">
-osNpcSay(key npc, string message)
-Makes an NPC say something.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcRemove">
-osNpcRemove(key npc)
-Removes an NPC.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetMapTexture">
-key osGetMapTexture()
-Returns the map texture UUID.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetRegionMapTexture">
-key osGetRegionMapTexture(string regionName)
-Returns the map texture UUID for the regionName requested.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetRegionStats">
-list osGetRegionStats()
-Returns a list of float values representing a number of region statistics (21 of the values shown in the statistics bar of LL-based clients).
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetSimulatorMemory">
-integer osGetSimulatorMemory()
-Returns the current amount of RAM used by the current OpenSim instance.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osKickAvatar">
-osKickAvatar(string FirstName, string LastName, string alert)
-Kicks avatar from region with an alert message.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetSpeed">
-osSetSpeed(key UUID, float SpeedModifier)
-Multiplies the normal running, walking, and flying speed of the specified avatar.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osCauseDamage">
-osCauseDamage(key UUID, float damage)
-Causes damage to specified avatar.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osCauseHealing">
-osCauseHealing(key UUID, float healing)
-Causes healing to specified avatar.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetPrimitiveParams">
-list osGetPrimitiveParams(key prim, list rules)
-Gets the parameters of the primitive, specified by key.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPrimitiveParams">
-osSetPrimitiveParams(key prim, list rules)
-Sets primitive Params.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetProjectionParams">
-osSetProjectionParams(key prim. integer projection, key texture, float fov, float focus, float amb)
-Set projection paramaters for light sources.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osUnixTimeToTimestamp">
-string osUnixTimeToTimestamp(integer unixtime)
-Converts unixtime to an llGetTimeStamp() formated string.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPenColor">
-osSetPenColor(string drawList, string color)
-Sets the pen color that is to be used when drawing dynamic textures.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetSunParam">
-float osGetSunParam(string param)
-Returns current float values for param, where param = day_length, year_length, day_night_offset, update_interval.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetSunParam">
-osSetSunParam(string param, float value)
-Sets region's sun parameters, where param = day_length, year_length, day_night_offset, update_interval.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetParcelDetails">
-osSetParcelDetails(vector pos, list rules)
-Set parcel details.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetTerrainHeight">
-float osGetTerrainHeight(integer x, integer y)
-Returns current terrain height at the given coordinates.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetTerrainHeight">
-osSetTerrainHeight(integer x, integer y, float val)
-Sets terrain height at the given coordinates. Use osTerrainFlush() afterwards.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetAvatarList">
-list osGetAvatarList()
-Returns a strided list of the UUID, position, and name of each avatar in the region, except the owner.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTeleportOwner">
-osTeleportOwner(integer regionX, integer regionY, vector position, vector lookat)
-  or
-osTeleportOwner(string regionName, vector position, vector lookat)
-  or
-osTeleportOwner(vector position, vector lookat)
-Teleports the owner of the object that holds the script to a specified location in the region, the grid, or the hypergrid. See documentation for details.
-(OpenSim only.)
-  </string>
+	<!-- Pathfinding -->
+	<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+	<string name="Pathfinding_Object_Attr_None">Ninguno</string>
+	<string name="Pathfinding_Object_Attr_Permanent">Afecta al navmesh</string>
+	<string name="Pathfinding_Object_Attr_Character">Caracter</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
 
-  <!-- LightShare functions -->
-  <string name="LSLTipText_cmSetWindlightScene">
-integer cmSetWindlightScene(list rules)
-Set the current WindLight scene. Estate managers and owners only.
-(Reguires LightShare)
-  </string>
-  <string name="LSLTipText_cmSetWindlightSceneTargeted">
-integer cmSetWindlightSceneTargeted(list rules, key target)
-Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
-(Reguires LightShare)
-  </string>
-  <string name="LSLTipText_cmGetWindlightScene">
-list cmGetWindlightScene(list rules)
-Get the current WindLight settings.
-(Reguires LightShare)
-  </string>
-  <!-- LightShare functions - alternate versions -->
-  <!-- don't ask me why they renamed 'em, but we need to include both versions - -  MC -->
-  <string name="LSLTipText_lsSetWindlightScene">
-integer lsSetWindlightScene(list rules)
-Set the current WindLight scene. Estate managers and owners only.
-(Reguires LightShare)
-  </string>
-  <string name="LSLTipText_lsSetWindlightSceneTargeted">
-integer lsSetWindlightSceneTargeted(list rules, key target)
-Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
-(Reguires LightShare)
-  </string>
-  <string name="LSLTipText_lsGetWindlightScene">
-list lsGetWindlightScene(list rules)
-Get the current WindLight settings.
-(Reguires LightShare)
-  </string>
+	<string name="Left">Izquierda</string>
+	<string name="Right">Derecha</string>
 
-  <!-- New OSSL Functions as of 8-10-2011 -->
-  <string name="LSLTipText_osNpcSaveAppearance">
-key osNpcSaveAppearance(key npc, string notecardName)
-Saves the NPC's appearance to a notecard.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcLoadAppearance">
-osNpcLoadAppearance(key npc, string notecardName)
-Loads the NPC's appearance from a notecard with appearance data.
-Notecards can also be loaded by UUID.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcMoveToTarget">
-osNpcMoveToTarget(key npc, vector position, integer options)
-Moves the NPC to a target at a given vector, using options to walk or to fly there.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osOwnerSaveAppearance">
-key osOwnerSaveAppearance(string notecardName)
-Saves the owner's appearance to a notecard inside the prim that holds the script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcGetRot">
-rotation osNpcGetRot(key npc)
-Retrieves the rotation of an NPC
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcSetRot">
-osNpcSetRot(key npc, rotation rot)
-Sets an NPC's rotation.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osAgentSaveAppearance">
-key osOwnerSaveAppearance(key avatarId, string notecardName)
-Saves an avatar's appearance to a notecard inside the prim that holds the script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcGetPos">
-vector osNpcGetPos(key npc)
-Retrieves the vector of an NPC's position within a region.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcStopMoveToTarget">
-osNpcStopMoveToTarget(key npc)
-Makes an NPC stop moving to a target.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetWindParam">
-float osGetWindParam(string plugin, string param)
-Gets the value of param property for plugin module.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetWindParam">
-osSetWindParam(string plugin, string param, float value)
-Sets value of param property for plugin module.
-(OpenSim only.)
-  </string>
-  <string name="Unnamed">(Unnamed)</string>
-  <string name="LSLTipText_llGetMassMKS">
-float llGetMassMKS()
-Returns a float that is the mass (in
-Kilograms) of the object that the
-script is attached to.
-  </string>
-  <string name="LSLTipText_llGetMemoryLimit">
-integer llGetMemoryLimit()
-Get the maximum memory a script can use.
-  </string>
-  <string name="LSLTipText_llGetParcelMusicURL">
-string llGetParcelMusicURL()
-Returns a string containing the parcel streaming audio URL.
-The object owner must also be the land owner.
-  </string>
-  <string name="LSLTipText_llGetPhysicsMaterial">
-list llGetPhysicsMaterial()
-Used to get the physical characteristics of an object.
-Returns a list in the form [ float gravity_multiplier, float restitution, float friction, float density ]
-  </string>
-  <string name="LSLTipText_llManageEstateAccess">
-integer llManageEstateAccess(integer action, key avatar)
-Used to add or remove agents from the estate's agent access or ban lists or groups from the estate's group access list.
-  </string>
-  <string name="LSLTipText_llSetAngularVelocity">
-llSetAngularVelocity(vector force, integer local)
-Applies rotational velocity to object.
-  </string>
-  <string name="LSLTipText_llSetKeyframedMotion">
-llSetKeyframedMotion(list keyframes, list options)
-Specify a list of times, positions, and orientations to be followed by an object. The object will be  smoothly moved between keyframes by the simulator.
-  </string>
-  <string name="LSLTipText_llSetPhysicsMaterial">
-llSetPhysicsMaterial(integer material, float gravity,
-float restitution, float friction, float density)
-Used for setting the physical characteristics of an object.
-  </string>
-  <string name="LSLTipText_llSetRegionPos">
-integer llSetRegionPos(vector position)
-Tries to move the entire object so that the root prim is within 0.1m of position
-  </string>
-  <string name="LSLTipText_llSetVelocity">
-llSetVelocity(vector force, integer local)
-Applies velocity to an object
-  </string>
-  <string name="LSLTipText_llTransferLindenDollars">
-key llTransferLindenDollars(key destination, integer amount)
-Transfer amount of L$ money from script owner to destination avatar.
-  </string>
-
-<!-- Pathfinder functions. Current state: alpha -->
-  <string name="LSLTipText_llCreateCharacter">
-llCreateCharacter(list options)
-Creates a pathfinding entity, known as a "character" from the object containing the script.
-  </string>
-  <string name="LSLTipText_llDeleteCharacter">
-llDeleteCharacter()
-Convert the current linkset back to a standard object, removing all pathfinding properties.
-  </string>
-  <string name="LSLTipText_llEvade">
-llEvade(key target, list options)
-Characters will try to hide from their pursuers if there is a good hiding spot along their fleeing path.
-  </string>
-  <string name="LSLTipText_llExecCharacterCmd">
-llExecCharacterCmd(integer command, list options)
-Send a command to the pathing system.
-  </string>
-  <string name="LSLTipText_llGetClosestNavPoint">
-list llGetClosestNavPoint(vector point, list options)
-Finds the closest navpoint and returns a list with a single vector if succesful. Returns empty list when no navpoints found.
-  </string>
-  <string name="LSLTipText_llFleeFrom">
-llFleeFrom(vector source, float distance, list options)
-Tells an object to keep away from a defined position in the region or adjacent regions.
-  </string>
-  <string name="LSLTipText_llNavigateTo">
-llNavigateTo(vector pos, list options)
-Tells an object to travel to a defined position in the region or adjacent regions.
-  </string>
-  <string name="LSLTipText_llPatrolPoints">
-llPatrolPoints(list patrolPoints, list options)
-Sets the object patrolling between the points specified in patrolPoints.
-  </string>
-  <string name="LSLTipText_llPursue">
-llPursue(key target, list options)
-Causes the object to pursue a target.
-  </string>
-  <string name="LSLTipText_llUpdateCharacter">
-llUpdateCharacter(list options)
-Updates settings for a character.
-  </string>
-  <string name="LSLTipText_llWanderWithin">
-llWanderWithin(vector origin, float dist, list options)
-Sets a character to wander about a central spot within a specified radius.
-  </string>
-  <string name="LSLTipText_osIsNpc">
-integer osIsNpc(key npc)
-Returns TRUE if the given key is an NPC, false otherwise.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcGetOwner">
-key osNpcGetOwner(key npc)
-Return the owner key of the given NPC. If the NPC is unowned or the input key does not belong to an NPC then it returns NULL_KEY.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridCustom">
-string osGetGridCustom(string key)
-Reads configuration strings from the [GridInfo] setion in OpenSim.ini.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridHomeURI">
-string osGetGridHomeURI()
-Returns the hypergrid URI of the grid where the user logged in.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcPlayAnimation">
-osNpcPlayAnimation(key npc, string animation)
-Get an NPC to play an animation. The animation can either be a key or the name of an animation in the same object as the script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcSit">
-osNpcSit(key npc, key target, integer options)
-Sit an NPC on a prim target. No options have been implemented yet, so always input 0.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcStand">
-osNpcStand(key npc)
-Make an NPC stand up.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcStopAnimation">
-osNpcStopAnimation(key npc, string animation)
-Get an NPC to stop playing an animation. The animation can either be a key or the name of an animation in the same inventory as the script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetRot">
-osSetRot(key target, quaternion rotation)
-Rotates an object or avatar.
-(OpenSim only.)
-  </string>
+	<!-- teleport_strings.xml's strings we need -->
+	<string name="completed_from">Teleport completado desde</string>
 </strings>