diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-14 15:57:17 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-14 15:57:17 -0700 |
| commit | 10591cce8e36e4c27c4a68c68c0502eaa24d8964 (patch) | |
| tree | 9786ef50e4138e809d6c2e16a7cd3f7dff9f5568 /indra/newview/skins/default | |
| parent | 95a9c12564242fc05ac96711dc7b4d46f6ba38b9 (diff) | |
DD-76, DD-77, DD-90 : recycled can_move_to_outbox() into can_move_to_marketplace() so we have now the same logic for both marketplace and merchant outbox
Diffstat (limited to 'indra/newview/skins/default')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ab7df75216..ad1af2faa3 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -211,10 +211,10 @@ Please try logging in again in a minute.</string> <string name="TooltipPrice" value="L$[AMOUNT]: "/> <string name="TooltipOutboxDragToWorld">You can not rez items in your merchant outbox</string> - <string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred.</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="TooltipOutboxWorn">You can not put items you are wearing into your merchant outbox</string> - <string name="TooltipOutboxCallingCard">You can not put calling cards into your merchant outbox</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> <string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds 20</string> <string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds 200</string> |