diff options
Diffstat (limited to 'indra/newview/skins/default')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_marketplace_listings.xml (renamed from indra/newview/skins/default/xui/en/floater_merchant_items.xml) | 14 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_viewer.xml | 6 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml (renamed from indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml) | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_merchant_items.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 2e54ed2ce3..94a9466c16 100755 --- a/indra/newview/skins/default/xui/en/floater_merchant_items.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -4,14 +4,14 @@ can_close="true" can_resize="true" height="440" - help_topic="floater_merchant_items" + help_topic="floater_marketplace_listings" min_width="300" min_height="200" - name="floater_merchant_items" + name="floater_marketplace_listings" save_rect="true" save_visibility="false" reuse_instance="true" - title="MERCHANT ITEMS" + title="MARKETPLACE LISTINGS" width="333"> <panel follows="all" @@ -29,7 +29,7 @@ top="0" bg_opaque_color="InventoryBackgroundColor"> <panel - name="merchant_items_inventory_placeholder_panel" + name="marketplace_listings_inventory_placeholder_panel" follows="all" layout="topleft" top="0" @@ -38,7 +38,7 @@ height="370" bg_opaque_color="InventoryBackgroundColor"> <text - name="merchant_items_inventory_placeholder_title" + name="marketplace_listings_inventory_placeholder_title" type="string" follows="top|left|right" layout="topleft" @@ -52,7 +52,7 @@ Loading... </text> <text - name="merchant_items_inventory_placeholder_text" + name="marketplace_listings_inventory_placeholder_text" type="string" follows="top|left|right" layout="topleft" @@ -71,7 +71,7 @@ width="313" top="370"> <panel - name="merchant_items_generic_drag_target" + name="marketplace_listings_generic_drag_target" mouse_opaque="false" follows="all" top="5" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 2dc974eff1..a8e02a9d02 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -182,11 +182,11 @@ parameter="outbox" /> </menu_item_call> <menu_item_call - label="Merchant Items..." - name="MerchantItems"> + label="Marketplace listings..." + name="MarketplaceListings"> <menu_item_call.on_click function="Floater.ToggleOrBringToFront" - parameter="merchant_items" /> + parameter="marketplace_listings" /> </menu_item_call> <menu_item_call label="Account dashboard..." diff --git a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index a013516267..dcb634fe59 100755 --- a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <inventory_panel - name="inventory_merchant_items" - start_folder.name="Merchant items" + name="inventory_marketplace_listings" + start_folder.name="Marketplace listings" show_empty_message="false" show_load_status="false" start_folder.type="merchant" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 515e912ee5..387ad138d9 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2219,9 +2219,9 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace <string name="InventoryOutboxError"> The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. </string> - <string name="InventoryMerchantItemsNoItemsTitle">Your Merchant Items folder is empty.</string> - <string name="InventoryMerchantItemsNoItemsTooltip"></string> - <string name="InventoryMerchantItemsNoItems"> + <string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string> + <string name="InventoryMarketplaceListingsNoItemsTooltip"></string> + <string name="InventoryMarketplaceListingsNoItems"> Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. </string> |