summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-05-20 21:40:48 -0700
committerMerov Linden <merov@lindenlab.com>2014-05-20 21:40:48 -0700
commit8193caa7939643d1080ceb9463b3e3978b0f516a (patch)
treee22b332b5a0227b93d35c02d491a168faea0b48b /indra/newview/skins
parent23acc30e2709dac1aa54eecda5c1bc6b2b226b5b (diff)
DD-88 : Make Drag and Drop tooltips for Merchant Outbox and Marketplace restrictions identical
Diffstat (limited to 'indra/newview/skins')
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ad1af2faa3..18552c3153 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -210,9 +210,9 @@ Please try logging in again in a minute.</string>
<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>
<string name="TooltipPrice" value="L$[AMOUNT]: "/>
- <string name="TooltipOutboxDragToWorld">You can not rez items in your merchant outbox</string>
+ <string name="TooltipOutboxDragToWorld">You can not rez items on the marketplace</string>
<string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred</string>
- <string name="TooltipOutboxNotInInventory">Your merchant outbox can only accept items directly from your inventory</string>
+ <string name="TooltipOutboxNotInInventory">You can only put items from your inventory on the marketplace</string>
<string name="TooltipOutboxWorn">You can not put items you are wearing on the marketplace</string>
<string name="TooltipOutboxCallingCard">You can not put calling cards on the marketplace</string>
<string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds 3</string>