summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/es/floater_bumps.xml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-11-04 14:28:30 -0400
committerLoren Shih <seraph@lindenlab.com>2010-11-04 14:28:30 -0400
commit3bbaac0b9d246939a2255ca8b06abf9568694370 (patch)
treee794efa9041bb4ba0a626c0401ccb88d212919a2 /indra/newview/skins/default/xui/es/floater_bumps.xml
parentc24586756954107218b6a85b480732c46444a02a (diff)
parenta788b0a88ce6980efeab731c7ad5d837aec1155f (diff)
automated merge up from viewer-beta
Diffstat (limited to 'indra/newview/skins/default/xui/es/floater_bumps.xml')
-rw-r--r--indra/newview/skins/default/xui/es/floater_bumps.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml
index 6a9c6b1f22..6d4196ca7c 100644
--- a/indra/newview/skins/default/xui/es/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/es/floater_bumps.xml
@@ -4,19 +4,19 @@
No se han detectado
</floater.string>
<floater.string name="bump">
- [TIME] [FIRST] [LAST] ha chocado con usted
+ [TIME] [NAME] ha chocado contigo
</floater.string>
<floater.string name="llpushobject">
- [TIME] [FIRST] [LAST] le ha empujado con un script
+ [TIME] [NAME] te ha empujado con un script
</floater.string>
<floater.string name="selected_object_collide">
- [TIME] [FIRST] [LAST] ha hecho que un objeto impacte con usted
+ [TIME] [NAME] te ha golpeado con un script
</floater.string>
<floater.string name="scripted_object_collide">
- [TIME] [FIRST] [LAST] ha hecho que un objeto con script impacte con usted
+ [TIME] [NAME] te ha golpeado con un objeto con script
</floater.string>
<floater.string name="physical_object_collide">
- [TIME] [FIRST] [LAST] ha hecho que un objeto material impacte con usted
+ [TIME] [NAME] te ha golpeado con un objeto fĂ­sico
</floater.string>
<floater.string name="timeStr">
[[hour,datetime,slt]:[min,datetime,slt]]