summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 14:56:01 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 14:56:01 -0400
commitf64a20ddcff91677b02b7688e08819cffb0989c9 (patch)
tree707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/skins/default/xui/en/strings.xml
parentc077250ff16aeaf0ec4c036154a427c677e85eb3 (diff)
parent17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff)
merge changes for storm-1016
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c0d5f93f83..d0625d9755 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3426,4 +3426,13 @@ Abuse Report</string>
<string name="Z">Z</string>
<!-- Key names end -->
+ <!-- llviewerwindow -->
+ <string name="BeaconParticle">Viewing particle beacons (blue)</string>
+ <string name="BeaconPhysical">Viewing physical object beacons (green)</string>
+ <string name="BeaconScripted">Viewing scripted object beacons (red)</string>
+ <string name="BeaconScriptedTouch">Viewing scripted object with touch function beacons (red)</string>
+ <string name="BeaconSound">Viewing sound beacons (yellow)</string>
+ <string name="BeaconMedia">Viewing media beacons (white)</string>
+ <string name="ParticleHiding">Hiding Particles</string>
+
</strings>