diff options
author | dolphin <dolphin@lindenlab.com> | 2014-04-22 16:34:30 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-04-22 16:34:30 -0700 |
commit | f515e2b1ee601958ba642d638e929daf7ff6e92a (patch) | |
tree | 2622bea403aad589701d7a176d1de59d32af6d77 /indra/newview/skins/default/xui/en/strings.xml | |
parent | 90a42d43b255eca082c283e5a0dfabd4ebfce508 (diff) | |
parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) |
Merge with 3.7.6-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 10 |
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 a17a895b42..7985997524 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2243,6 +2243,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> |