summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-03-09 12:56:48 -0500
committerOz Linden <oz@lindenlab.com>2012-03-09 12:56:48 -0500
commit0a873715677ef3fb28e8dab161acbe05ed8bd537 (patch)
tree1f2e2c804bb7764bddbcb428c71edbcdeeb3da6f /indra/newview/skins/default/xui/en/strings.xml
parent11c6654479a299549dc0035faa894678a60e157e (diff)
parenteb7e48fc9015266fd2945873f12d925ffc6262ed (diff)
merge changes for vmrg-230
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4bc72be49b..208f4c2d32 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -369,6 +369,9 @@ Please try logging in again in a minute.</string>
<string name="anim_yes_happy">Yes (Happy)</string>
<string name="anim_yes_head">Yes</string>
+ <!-- build floater -->
+ <string name="multiple_textures">Multiple</string>
+
<!-- world map -->
<string name="texture_loading">Loading...</string>
<string name="worldmap_offline">Offline</string>