summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-22 13:32:15 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-22 13:32:15 -0700
commitf6bb6a0f935323434a3f3d0d94e94c8d8238effe (patch)
tree81945284f515f25ce23284077b1e07f500ad64ff /indra/newview/skins/default/xui/en/strings.xml
parentc79abac5ad5d41f86655883fd9f3ec6a108967a7 (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rwxr-xr-xindra/newview/skins/default/xui/en/strings.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c2e1b9478e..35d06e0480 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2270,6 +2270,16 @@ If you'd like to become a merchant, you'll need to [[MARKETPLACE_CREATE_STORE_UR
<string name="InventoryOutboxNoItems">
Drag folders to this area and click "Send to Marketplace" to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
</string>
+ <string name="InventoryOutboxInitializingTitle">Initializing Marketplace.</string>
+ <string name="InventoryOutboxInitializingTooltip"></string>
+ <string name="InventoryOutboxInitializing">
+We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace store].
+ </string>
+ <string name="InventoryOutboxErrorTitle">Marketplace Errors.</string>
+ <string name="InventoryOutboxErrorTooltip"></string>
+ <string name="InventoryOutboxError">
+The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
+ </string>
<string name="Marketplace Error None">No errors</string>
<string name="Marketplace Error Not Merchant">Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string>