summaryrefslogtreecommitdiff
path: root/indra/newview/skins/minimal/xui/es/menu_nearby_chat.xml
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-03-19 16:29:32 -0400
committerJonathan Yap <none@none>2011-03-19 16:29:32 -0400
commitfbd241da54ad6017825b59c5b0c71086d8b8957a (patch)
tree34051dba97afece2416f25954080011d922d910e /indra/newview/skins/minimal/xui/es/menu_nearby_chat.xml
parent834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff)
parent1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff)
STORM-1019 Resolve merge conflicts
Diffstat (limited to 'indra/newview/skins/minimal/xui/es/menu_nearby_chat.xml')
-rw-r--r--indra/newview/skins/minimal/xui/es/menu_nearby_chat.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/skins/minimal/xui/es/menu_nearby_chat.xml b/indra/newview/skins/minimal/xui/es/menu_nearby_chat.xml
new file mode 100644
index 0000000000..94b281b6c7
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/es/menu_nearby_chat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="NearBy Chat Menu">
+ <menu_item_call label="Mostrar la gente que está cerca..." name="nearby_people"/>
+ <menu_item_check label="Ver el texto ignorado" name="muted_text"/>
+ <menu_item_check label="Mostrar los iconos del amigo" name="show_buddy_icons"/>
+ <menu_item_check label="Mostrar los nombres" name="show_names"/>
+ <menu_item_check label="Mostrar los iconos y los nombres" name="show_icons_and_names"/>
+ <menu_item_call label="Tamaño de la fuente" name="font_size"/>
+</menu>