From 10591cce8e36e4c27c4a68c68c0502eaa24d8964 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 14 May 2014 15:57:17 -0700 Subject: 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 --- indra/newview/skins/default/xui/en/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en') 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. You can not rez items in your merchant outbox - One or more of these objects cannot be sold or transferred. + One or more of these objects cannot be sold or transferred Your merchant outbox can only accept items directly from your inventory - You can not put items you are wearing into your merchant outbox - You can not put calling cards into your merchant outbox + You can not put items you are wearing on the marketplace + You can not put calling cards on the marketplace Depth of nested folders exceeds 3 Subfolder count in top-level folder exceeds 20 Item count in top-level folder exceeds 200 -- cgit v1.2.3