summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-01-28 17:26:45 -0700
committerDave Houlton <euclid@lindenlab.com>2020-01-28 17:26:45 -0700
commit2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (patch)
tree7f608467b3608127049ddc78d5045da032777cb4 /indra/newview/skins/default/xui/en/strings.xml
parent3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff)
parent2998552f3d7447da316afdd1713595528596a0c5 (diff)
DRTVWR-440, merge in latest from 6.3.7 release
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d89705fd00..463147d80d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2833,7 +2833,7 @@ If you continue to receive this message, please contact Second Life support for
<string name="BuyingCosts">Buying this costs L$ [AMOUNT]</string>
<string name="UnknownFileExtension">
Unknown file extension .%s
-Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
+Expected .wav, .tga, .bmp, .jpg, .jpeg, or .anim
</string>
<string name="MuteObject2">Block</string>
<string name="MuteAvatar">Block</string>
@@ -4111,7 +4111,6 @@ Try enclosing path to the editor with double quotes.
<string name="Command_MarketplaceListings_Label">Marketplace</string>
<string name="Command_MiniMap_Label">Mini-map</string>
<string name="Command_Move_Label">Walk / run / fly</string>
- <string name="Command_Outbox_Label">Merchant outbox</string>
<string name="Command_People_Label">People</string>
<string name="Command_Picks_Label">Picks</string>
<string name="Command_Places_Label">Places</string>
@@ -4142,7 +4141,6 @@ Try enclosing path to the editor with double quotes.
<string name="Command_MarketplaceListings_Tooltip">Sell your creation</string>
<string name="Command_MiniMap_Tooltip">Show nearby people</string>
<string name="Command_Move_Tooltip">Moving your avatar</string>
- <string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string>
<string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
<string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string>
<string name="Command_Places_Tooltip">Places you've saved</string>