diff --git a/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
index 373d6fc1b..86ba23de2 100644
--- a/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -30,7 +30,7 @@
       <on_check control="ShowMiniMapObjects" />
     </menu_item_check>
 	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
-	     mouse_opaque="false" name="Chat Distance Rings" opaque="true" tear_off="false" width="125">
+	     mouse_opaque="false" name="Chat Distance Rings" label="Chat Distance Rings" opaque="true" tear_off="false" width="125">
 		<menu_item_check label="Show All" name="Show All">
 			<on_check function="MiniMap.CheckChatRings" />
 			<on_click function="MiniMap.ChatRings" />
@@ -66,7 +66,7 @@
 		<on_enable function="MiniMap.EnableProfile" />
 	</menu_item_call>
 	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
-	     mouse_opaque="false" name="Mark" opaque="true" tear_off="false" width="125">
+	     mouse_opaque="false" name="Mark" label="Mark" opaque="true" tear_off="false" width="125">
 		<menu_item_call bottom_delta="-18" enabled = "true" height="18" label="Red"
 			 left="0" mouse_opaque="true" name="Red" width="128">
 			<on_click function="MiniMap.setred" />
diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml
index b06364201..6af3ec686 100644
--- a/indra/newview/skins/default/xui/es/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml
@@ -1,56 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="popup">
-	<menu_item_call name="Zoom Close" label="Acercar" >
-		<on_click function="MiniMap.ZoomLevel" userdata="2" />
-	</menu_item_call>
-	<menu_item_call name="Zoom Medium" label="Normal" >
-		<on_click function="MiniMap.ZoomLevel" userdata="1" />
-	</menu_item_call>
-	<menu_item_call  name="Zoom Far" label="Alejar" >
-		<on_click function="MiniMap.ZoomLevel" userdata="0" />
-	</menu_item_call>
+	<menu_item_call name="Zoom Close" label="Acercar"/>
+	<menu_item_call name="Zoom Medium" label="Normal"/>
+	<menu_item_call  name="Zoom Far" label="Alejar"/>
 	<menu_item_separator />
-	<menu_item_check name="Center on Camera" label="Centrar en Cámara">
-		<on_click function="MiniMap.Center" userdata="1" />
-		<on_check function="MiniMap.CheckCenter" userdata="1" />
-	</menu_item_check>
-	<menu_item_check name="Rotate Mini-Map" label="Rotar Mini-Mapa">
-	  <on_click function="MiniMap.Rotate" userdata="" />
-	  <on_check function="MiniMap.CheckRotate" userdata="" />
-	</menu_item_check>
+	<menu_item_check name="Center on Camera" label="Centrar en Cámara"/>
+	<menu_item_check name="Rotate Mini-Map" label="Rotar Mini-Mapa"/>
+	<menu_item_check label="Mostrar Objetos" name="Show Objects"/>
+	<menu name="Chat Distance Rings" label="Anillos de Rangos de Chat">
+		<menu_item_check label="Mostrar Todos" name="Show All"/>
+		<menu_item_separator />
+		<menu_item_check label="Mostrar rango Sururros" name="Show Whisper Ring"/>
+		<menu_item_check label="Mostrar rango Chat" name="Show Chat Ring"/>
+		<menu_item_check label="Mostrar rango Gritos" name="Show Shout Ring"/>
+    </menu>
 	<menu_item_separator />
-	<menu_item_call name="Stop Tracking" label="Detener Seguimiento" >
-		<on_click function="MiniMap.StopTracking" />
-		<on_enable function="MiniMap.EnableTracking" />
-	</menu_item_call>
-	<menu_item_call name="Profile" label="Perfil..." >
-		<on_click function="MiniMap.ShowProfile" />
-		<on_enable function="MiniMap.EnableProfile" />
-	</menu_item_call>
-	<menu_item_call name="Camfollow" label="Cámara..." >
-		<on_click function="MiniMap.CamFollow" />
-		<on_enable function="MiniMap.EnableProfile" />
-	</menu_item_call>
-	<menu name="Mark">
-		<on_enable function="MiniMap.EnableProfile" />
-		<menu_item_call name="Red" label="Rojo" >
-			<on_click function="MiniMap.setred" />
-		</menu_item_call>
-		<menu_item_call name="Green" label="Verde" >
-			<on_click function="MiniMap.setgreen" />
-		</menu_item_call>
-		<menu_item_call name="Blue" label="Azul" >
-			<on_click function="MiniMap.setblue" />
-		</menu_item_call>
-		<menu_item_call name="Yellow" label="Amarillo">
-			<on_click function="MiniMap.setyellow" />
-		</menu_item_call>
-		<menu_item_call name="Custom" label="Personalizar...">
-			<on_click function="MiniMap.setcustom" />
-		</menu_item_call>
+	<menu_item_call name="Stop Tracking" label="Detener Seguimiento"/>
+	<menu_item_call name="Profile" label="Perfil..."/>
+	<menu_item_call name="Camfollow" label="Cámara..."/>
+	<menu name="Mark" label="Marcar">
+		<menu_item_call name="Red" label="Rojo"/>
+		<menu_item_call name="Green" label="Verde"/>
+		<menu_item_call name="Blue" label="Azul"/>
+		<menu_item_call name="Yellow" label="Amarillo"/>
+		<menu_item_call name="Custom" label="Personalizado..."/>
   </menu>
-  <menu_item_call name="Unmark" label="Desmarcar" >
-    <on_click function="MiniMap.setunmark" />
-    <on_enable function="MiniMap.enableunmark" />
-  </menu_item_call>
+  <menu_item_call name="Unmark" label="Desmarcar"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index f81bab2b6..e461f6e57 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -26,7 +26,7 @@
 			<text name="grids_combo_text">
 				Grid:
 			</text>
-			<combo_box name="grids_combo"/>
+			<combo_box name="grids_combo" tool_tip="Ingresa el nombre/nick de un grid conocido o el uri de inicio de seión del mismo, o selecciona uno de la lista"/>
 			<button name="grids_btn" label="Administrar Grid"/>
 		</layout_panel>
 		<layout_panel name="location_panel">