summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-04-22 11:50:19 -0500
committerDave Parks <davep@lindenlab.com>2011-04-22 11:50:19 -0500
commit764412f9b5e8d69950f9866a60299b1b458339c6 (patch)
tree7e9d634faddd40edf8ed715e7b479d1336ed7697 /indra/newview/skins/default/xui/en/strings.xml
parentb15dca22637b0b2c1947b758a93f51163fb48cf1 (diff)
parent0349d1f29197ca00c9eb7278d97bd56ea4d2050a (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 27295150c5..2175db649c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -198,6 +198,7 @@
<string name="favorite">favorite</string>
<string name="symbolic link">link</string>
<string name="symbolic folder link">folder link</string>
+ <string name="mesh">mesh</string>
<!-- llvoavatar. Displayed in the avatar chat bubble -->
<string name="AvatarEditingAppearance">(Editing Appearance)</string>
@@ -2008,6 +2009,7 @@ Requests name of an avatar. When data is available the dataserver event will be
<string name="InvFolder Initial Outfits">Initial Outfits</string>
<string name="InvFolder My Outfits">My Outfits</string>
<string name="InvFolder Accessories">Accessories</string>
+ <string name="InvFolder Meshes">Meshes</string>
<!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
<string name="InvFolder Friends">Friends</string>