From a030b30d34ef3152791b123c4f52d4086f3eb549 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 6 Mar 2014 18:15:51 -0800 Subject: DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make it somewhat work, in a clunky sort of way --- .../default/xui/en/floater_merchant_items.xml | 121 +++++++++++++++++++++ indra/newview/skins/default/xui/en/menu_viewer.xml | 7 ++ .../xui/en/panel_merchant_items_inventory.xml | 32 ++++++ indra/newview/skins/default/xui/en/strings.xml | 5 + 4 files changed, 165 insertions(+) create mode 100755 indra/newview/skins/default/xui/en/floater_merchant_items.xml create mode 100755 indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_merchant_items.xml b/indra/newview/skins/default/xui/en/floater_merchant_items.xml new file mode 100755 index 0000000000..2e54ed2ce3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_merchant_items.xml @@ -0,0 +1,121 @@ + + + + + + + Loading... + + + + + + + + Drag items you want to sell + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 64de010eb5..2dc974eff1 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -181,6 +181,13 @@ function="Floater.ToggleOrBringToFront" parameter="outbox" /> + + + diff --git a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml b/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml new file mode 100755 index 0000000000..a013516267 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml @@ -0,0 +1,32 @@ + + + + + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9300652eaa..515e912ee5 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2219,6 +2219,11 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. + Your Merchant Items folder is empty. + + + Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. + No errors Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge). -- cgit v1.2.3 From 705d4182c8a84728e7f00cf48110c8f9720e4c29 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 13 Mar 2014 16:45:52 -0700 Subject: DD-42 : Rename merchant items to marketplace listings to be consistent with spec --- .../xui/en/floater_marketplace_listings.xml | 121 +++++++++++++++++++++ .../default/xui/en/floater_merchant_items.xml | 121 --------------------- indra/newview/skins/default/xui/en/menu_viewer.xml | 6 +- .../en/panel_marketplace_listings_inventory.xml | 32 ++++++ .../xui/en/panel_merchant_items_inventory.xml | 32 ------ indra/newview/skins/default/xui/en/strings.xml | 6 +- 6 files changed, 159 insertions(+), 159 deletions(-) create mode 100755 indra/newview/skins/default/xui/en/floater_marketplace_listings.xml delete mode 100755 indra/newview/skins/default/xui/en/floater_merchant_items.xml create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml delete mode 100755 indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml new file mode 100755 index 0000000000..94a9466c16 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -0,0 +1,121 @@ + + + + + + + Loading... + + + + + + + + Drag items you want to sell + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/floater_merchant_items.xml b/indra/newview/skins/default/xui/en/floater_merchant_items.xml deleted file mode 100755 index 2e54ed2ce3..0000000000 --- a/indra/newview/skins/default/xui/en/floater_merchant_items.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - Loading... - - - - - - - - Drag items you want to sell - - - - - - - - - - - - - - - - - - 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" /> + label="Marketplace listings..." + name="MarketplaceListings"> + parameter="marketplace_listings" /> + + + + diff --git a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml b/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml deleted file mode 100755 index a013516267..0000000000 --- a/indra/newview/skins/default/xui/en/panel_merchant_items_inventory.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - 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 The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. - Your Merchant Items folder is empty. - - + Your Marketplace Listings folder is empty. + + Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. -- cgit v1.2.3 From 68dbb5692f11eed39175ebf3313d96b5430231f9 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 14 Mar 2014 17:34:15 -0700 Subject: DD-17 : WIP : Add live status to active listing folders, clean up getLabelSuffix() code a bit --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 387ad138d9..1d3c112495 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2235,6 +2235,9 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. Error: This item can not be sold on the marketplace. Error: There was a problem with this item. Try again later. + no Mkt ID + live + Open landmarks -- cgit v1.2.3 From 28fe8352549c0fd99da0c3f0119d96386e52a703 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 18 Mar 2014 13:03:04 -0700 Subject: DD-17, DD-40 : Style active listings in bold, implement a working initialization indicator --- .../default/xui/en/floater_marketplace_listings.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 94a9466c16..b212518f85 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -13,6 +13,7 @@ reuse_instance="true" title="MARKETPLACE LISTINGS" width="333"> + Initializing... + - + -- cgit v1.2.3 From e08296f6dc44c1b18b1ca36a0ee7dc2f8578d84b Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 18 Mar 2014 15:14:09 -0700 Subject: DD-40 : WIP : Got rid o the useless Drop Target text (not part of that UI) --- .../xui/en/floater_marketplace_listings.xml | 40 ++++------------------ 1 file changed, 6 insertions(+), 34 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index b212518f85..625b71645e 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -66,40 +66,12 @@ - - - Drag items you want to sell - - - + Date: Tue, 18 Mar 2014 16:36:50 -0700 Subject: DD-50 : WIP : Add tabs to the marketplace listing UI --- .../en/panel_marketplace_listings_inventory.xml | 151 ++++++++++++++++----- 1 file changed, 120 insertions(+), 31 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index dcb634fe59..33ac08d87f 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -1,32 +1,121 @@ - - - - + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 15c0907942ae2e82876d4aaf25ab342da0bcf61e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 18 Mar 2014 20:59:49 -0700 Subject: DD-50 : Tabs added to the marketplace, fixed XUI, sorting not implemented yet --- .../xui/en/floater_marketplace_listings.xml | 122 ++++++++++----------- .../en/panel_marketplace_listings_inventory.xml | 2 +- 2 files changed, 62 insertions(+), 62 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 625b71645e..80d6187e1e 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -1,82 +1,82 @@ + Initializing... + - Initializing... - - + - - - Loading... - - - + + Loading... + + + + height="20"> Date: Wed, 19 Mar 2014 09:09:13 -0700 Subject: DD-10 : WIP : Added embryonic tool strip at the top of the marketplace floater --- .../en/panel_marketplace_listings_inventory.xml | 245 +++++++++++---------- 1 file changed, 131 insertions(+), 114 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index 4947cb57a2..89020c7e80 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -1,121 +1,138 @@ + + + + + - - - - - - - - - - - - + height="340" + halign="center" + tab_height="30" + tab_group="1" + tab_position="top" + tab_min_width="50"> + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 03622e0833fd2d2bdcc9ed3ed0c009ad9e9fee3e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 20 Mar 2014 09:31:35 -0700 Subject: DD-50 : Adding new filter code for marketplace filtered tabs (active, unactive and unassociated) --- .../skins/default/xui/en/panel_marketplace_listings_inventory.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index 89020c7e80..3c184ba54b 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -37,7 +37,7 @@ width="308" height="340"> Date: Thu, 20 Mar 2014 16:39:30 -0700 Subject: DD-16 : WIP : Update sort / show menu, not actionable yet though --- .../skins/default/xui/en/menu_marketplace_view.xml | 49 ++++++++++++++++++++++ .../en/panel_marketplace_listings_inventory.xml | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100755 indra/newview/skins/default/xui/en/menu_marketplace_view.xml (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml new file mode 100755 index 0000000000..6d31ff4960 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml index 3c184ba54b..54fc3a0c0f 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml @@ -23,7 +23,7 @@ width="31" height="25" left="2" - menu_filename="menu_people_nearby_view.xml" + menu_filename="menu_marketplace_view.xml" image_hover_unselected="Toolbar_Middle_Over" image_overlay="Conv_toolbar_sort" image_selected="Toolbar_Middle_Selected" -- cgit v1.2.3 From 5b0882872871a5601b216655ea408a2a9675f159 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 21 Mar 2014 15:43:07 -0700 Subject: DD-16 : WIP : More code on sort/show menu but still not actionable. --- .../skins/default/xui/en/menu_marketplace_view.xml | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml index 6d31ff4960..36c73b9f4b 100755 --- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -1,6 +1,6 @@ - + + function="Marketplace.ViewSort.Action" + parameter="show_all" /> + function="Marketplace.ViewSort.CheckItem" + parameter="show_all" /> - + + function="People.Nearby.ViewSort.Action" + parameter="show_active" /> + function="People.Nearby.ViewSort.CheckItem" + parameter="show_active" /> - + + parameter="show_inactive_listings" /> + parameter="show_inactive_listings" /> -- cgit v1.2.3 From f813a25224081e68d4772676909d2cff14407486 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 25 Mar 2014 10:22:10 -0700 Subject: DD-10 : WIP : Some XUI clean up, menu still not working --- .../skins/default/xui/en/menu_marketplace_view.xml | 4 +- .../default/xui/en/panel_marketplace_listings.xml | 138 +++++++++++++++++++++ .../en/panel_marketplace_listings_inventory.xml | 138 --------------------- 3 files changed, 140 insertions(+), 140 deletions(-) create mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings.xml delete mode 100755 indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml index 36c73b9f4b..9ed93e2f11 100755 --- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -32,10 +32,10 @@ diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml new file mode 100755 index 0000000000..54fc3a0c0f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml deleted file mode 100755 index 54fc3a0c0f..0000000000 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 48b6a713be449f39b33b3de190b3caccd5ad55a2 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 26 Mar 2014 10:55:42 -0700 Subject: DD-10 : Make the filter tool works in All tab and finished refactor --- .../skins/default/xui/en/floater_marketplace_listings.xml | 8 +++++++- indra/newview/skins/default/xui/en/menu_marketplace_view.xml | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 80d6187e1e..0f511c4a66 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -64,7 +64,13 @@ wrap="true" halign="left" /> - + + - + + parameter="show_unassociated" /> + parameter="show_unassociated" /> - + + parameter="show_inactive" /> + parameter="show_inactive" /> -- cgit v1.2.3 From 0ec8fbec6deaa24506391ef239c50009eebe1eef Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 28 Mar 2014 15:54:36 -0700 Subject: DD-24 : Add FT_MARKETPLACE_STOCK as a new type for folders, implement the promotion code for Drag and Drop, display of stock folders and embryonic marketplace validation --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 80b520622a..ce9bbbc8d2 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2273,6 +2273,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. no Mkt ID live + stock Open landmarks -- cgit v1.2.3 From c36b7fa963511023866b6518f245d2c6edd1add0 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 3 Apr 2014 18:14:59 -0700 Subject: DD-20 : Make drop in the panel when empty work again --- .../newview/skins/default/xui/en/floater_marketplace_listings.xml | 3 ++- indra/newview/skins/default/xui/en/panel_marketplace_listings.xml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml index 0f511c4a66..f5630aeecb 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_listings.xml @@ -15,11 +15,11 @@ reuse_instance="true"> Initializing... Date: Fri, 4 Apr 2014 12:33:40 -0700 Subject: DD-45 : Add Activate right click menu item to marketplace listings folders --- indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 6fa45d7d66..aa115c1ad1 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -726,6 +726,14 @@ parameter="send_to_marketplace" /> + + + -- cgit v1.2.3 From e1d2f71d348bafe0be783dcb3dfbeb56bc877c12 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 4 Apr 2014 16:56:17 -0700 Subject: DD-14 : Add all right click menu items for marketplace. Make Add, Activate and Deactivate work. Right click fails on non folder items though in marketplace --- .../skins/default/xui/en/menu_inventory.xml | 51 ++++++++++++++++++---- 1 file changed, 43 insertions(+), 8 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index aa115c1ad1..cde14e72f0 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -4,6 +4,49 @@ layout="topleft" name="Popup" visible="false"> + + + + + + + + + + + + + + + + - - - -- cgit v1.2.3 From fc4e9d2572635903449ade6ebf2a45aa9e971023 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 8 Apr 2014 18:12:48 -0700 Subject: DD-18 : Compute stock for all levels, get folders to update more consistently on all actions in the marketplace --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ce9bbbc8d2..55272750e7 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2274,6 +2274,7 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. no Mkt ID live stock + out of stock Open landmarks -- cgit v1.2.3 From 748bbeaf982c456b120d4b3f4d33aa6dce576908 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 9 Apr 2014 14:19:38 -0700 Subject: DD-13 : Clean up Associate/Disassociate listing. Also clarify the update folder code in marketplace --- indra/newview/skins/default/xui/en/menu_inventory.xml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index cde14e72f0..0be5509333 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -5,12 +5,12 @@ name="Popup" visible="false"> + name="Marketplace Associate Listing"> + parameter="marketplace_associate_listing" /> + + + -- cgit v1.2.3 From a0f5a63a661d3ebc03e82463897c63dd35918749 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 9 Apr 2014 15:51:28 -0700 Subject: DD-16 : WIP : Fix filtering on menu and tabs. Sort still not done --- indra/newview/skins/default/xui/en/menu_marketplace_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml index 4043c5c93d..d08cb23483 100755 --- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml +++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml @@ -30,7 +30,7 @@ function="Marketplace.ViewSort.CheckItem" parameter="show_unassociated" /> - + -- cgit v1.2.3 From 2a031df763ab7ea0f17f263ef9a03f53fbfb1187 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 11 Apr 2014 11:55:57 -0700 Subject: DD-12, DD-19 : Add a button to create a new listing folder. Also added a validate button though it does nothing ATM --- .../default/xui/en/panel_marketplace_listings.xml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml index 45e0fe04c0..3b48c2e48c 100755 --- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml +++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml @@ -28,6 +28,30 @@ image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" menu_position="bottomleft"/> + - \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml deleted file mode 100755 index 975b08be05..0000000000 --- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - Postcard from [SECOND_LIFE]. - - - Check this out! - - - Sending... - - - - E-mail - - - - - - - - - \ No newline at end of file diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml deleted file mode 100755 index 649d547ba0..0000000000 --- a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Postal desde [SECOND_LIFE]. - - - ¡Mira esto! - - - Enviando... - - - Correo-e - - + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..975b08be05 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml @@ -0,0 +1,103 @@ + + + + Postcard from [SECOND_LIFE]. + + + Check this out! + + + Sending... + + + + E-mail + + + + + + + + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..81a067a81b --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml @@ -0,0 +1,18 @@ + + + + Postal desde [SECOND_LIFE]. + + + ¡Mira esto! + + + Enviando... + + + Correo-e + + + + + diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..3f5ef04022 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml @@ -0,0 +1,18 @@ + + + + Carte postale de [SECOND_LIFE]. + + + Ouvrez-moi ! + + + Envoi en cours... + + + E-mail + + + + + diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..333ce5c12b --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml @@ -0,0 +1,18 @@ + + + + Cartolina da [SECOND_LIFE]. + + + Dai un'occhiata! + + + Invio... + + + E-mail + + + + + diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..756df9ecc2 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml @@ -0,0 +1,18 @@ + + + + [SECOND_LIFE] からのポストカードです。 + + + ぜひご覧ください！ + + + 送信中... + + + メール + + + + + diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..efcbec66ba --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml @@ -0,0 +1,18 @@ + + + + Postal do [SECOND_LIFE]. + + + Confira! + + + Enviando... + + + E-mail + + + + + diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..6e1b3a7516 --- /dev/null +++ b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml @@ -0,0 +1,18 @@ + + + + Открытка из [SECOND_LIFE]. + + + Побывай здесь! + + + Отправка... + + + Электронное письмо + + + + + diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..9b9e60d2e0 --- /dev/null +++ b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml @@ -0,0 +1,18 @@ + + + + SECOND_LIFE]'dan posta kartı. + + + Buna bakın! + + + Gönderiyor... + + + E-posta + + + + + diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..6dfeaf2505 --- /dev/null +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml @@ -0,0 +1,18 @@ + + + + 來自 [SECOND_LIFE] 的明信片。 + + + 快來看看這個！ + + + 傳送中... + + + 電郵 + + + + + -- cgit v1.2.3 From 5fd8a51f149ba5f05af1e10585c3aee457dc0193 Mon Sep 17 00:00:00 2001 From: MNikolenko ProductEngine Date: Thu, 7 May 2015 19:51:52 +0300 Subject: MAINT-4812 Restore sending snapshot as email from the viewer. --- indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml | 1 + indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml | 1 + indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml | 1 + indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml | 1 + indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml | 1 + indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml | 1 + indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml | 1 + indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml | 1 + 8 files changed, 8 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml index 81a067a81b..3373c29821 100644 --- a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml @@ -15,4 +15,5 @@ + diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml index 3f5ef04022..19e7b02cf8 100644 --- a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml @@ -15,4 +15,5 @@ + diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml index 333ce5c12b..e79e7aecbc 100644 --- a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml @@ -15,4 +15,5 @@ + diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml index 756df9ecc2..000a59117e 100644 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml @@ -15,4 +15,5 @@ + diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml index efcbec66ba..08bc60996d 100644 --- a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml @@ -15,4 +15,5 @@ + diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml index 6e1b3a7516..fa8ca1f9b4 100644 --- a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml @@ -15,4 +15,5 @@ + diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml index 9b9e60d2e0..e9b36b70a7 100644 --- a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml @@ -15,4 +15,5 @@ + diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml index 6dfeaf2505..a360822af5 100644 --- a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml @@ -15,4 +15,5 @@ + -- cgit v1.2.3 From 8735cd7e4fb0a9d268f3b147e0bd9e81181a884a Mon Sep 17 00:00:00 2001 From: eli Date: Mon, 11 May 2015 14:35:58 -0700 Subject: FIX INTL-173 Viewer Set43 translation for project viewer-directdelivery --- .../newview/skins/default/xui/de/floater_about.xml | 69 +- .../default/xui/de/floater_associate_listing.xml | 7 + .../default/xui/de/floater_edit_hover_height.xml | 4 + .../xui/de/floater_inventory_item_properties.xml | 69 +- .../default/xui/de/floater_item_properties.xml | 2 + .../xui/de/floater_marketplace_listings.xml | 10 + .../xui/de/floater_marketplace_validation.xml | 5 + .../skins/default/xui/de/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/de/floater_pay.xml | 37 +- .../skins/default/xui/de/floater_pay_object.xml | 42 +- .../skins/default/xui/de/menu_attachment_self.xml | 1 + .../skins/default/xui/de/menu_avatar_self.xml | 1 + .../skins/default/xui/de/menu_inventory.xml | 12 +- .../skins/default/xui/de/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/de/menu_viewer.xml | 6 +- .../newview/skins/default/xui/de/notifications.xml | 2929 +++----- indra/newview/skins/default/xui/de/panel_login.xml | 19 +- .../default/xui/de/panel_marketplace_listings.xml | 11 + .../de/panel_marketplace_listings_inventory.xml | 2 + .../xui/de/panel_marketplace_listings_listed.xml | 2 + .../de/panel_marketplace_listings_unassociated.xml | 2 + .../xui/de/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/de/panel_status_bar.xml | 26 +- .../skins/default/xui/de/sidepanel_item_info.xml | 73 +- .../skins/default/xui/de/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/de/strings.xml | 6978 +++++-------------- .../newview/skins/default/xui/es/floater_about.xml | 75 +- .../default/xui/es/floater_associate_listing.xml | 7 + .../default/xui/es/floater_edit_hover_height.xml | 4 + .../xui/es/floater_inventory_item_properties.xml | 69 +- .../default/xui/es/floater_item_properties.xml | 2 + .../xui/es/floater_marketplace_listings.xml | 10 + .../xui/es/floater_marketplace_validation.xml | 5 + .../skins/default/xui/es/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/es/floater_pay.xml | 38 +- .../skins/default/xui/es/floater_pay_object.xml | 42 +- .../skins/default/xui/es/menu_attachment_self.xml | 1 + .../skins/default/xui/es/menu_avatar_self.xml | 1 + .../skins/default/xui/es/menu_inventory.xml | 12 +- .../skins/default/xui/es/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/es/menu_viewer.xml | 6 +- .../newview/skins/default/xui/es/notifications.xml | 2923 +++----- indra/newview/skins/default/xui/es/panel_login.xml | 19 +- .../default/xui/es/panel_marketplace_listings.xml | 11 + .../es/panel_marketplace_listings_inventory.xml | 2 + .../xui/es/panel_marketplace_listings_listed.xml | 2 + .../es/panel_marketplace_listings_unassociated.xml | 2 + .../xui/es/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/es/panel_status_bar.xml | 26 +- .../skins/default/xui/es/sidepanel_item_info.xml | 71 +- .../skins/default/xui/es/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/es/strings.xml | 6858 +++++-------------- .../newview/skins/default/xui/fr/floater_about.xml | 69 +- .../default/xui/fr/floater_associate_listing.xml | 7 + .../default/xui/fr/floater_edit_hover_height.xml | 4 + .../xui/fr/floater_inventory_item_properties.xml | 67 +- .../default/xui/fr/floater_item_properties.xml | 2 + .../xui/fr/floater_marketplace_listings.xml | 10 + .../xui/fr/floater_marketplace_validation.xml | 5 + .../skins/default/xui/fr/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/fr/floater_pay.xml | 38 +- .../skins/default/xui/fr/floater_pay_object.xml | 43 +- .../skins/default/xui/fr/menu_attachment_self.xml | 1 + .../skins/default/xui/fr/menu_avatar_self.xml | 1 + .../skins/default/xui/fr/menu_inventory.xml | 12 +- .../skins/default/xui/fr/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/fr/menu_viewer.xml | 6 +- .../newview/skins/default/xui/fr/notifications.xml | 2921 +++----- indra/newview/skins/default/xui/fr/panel_login.xml | 19 +- .../default/xui/fr/panel_marketplace_listings.xml | 11 + .../fr/panel_marketplace_listings_inventory.xml | 2 + .../xui/fr/panel_marketplace_listings_listed.xml | 2 + .../fr/panel_marketplace_listings_unassociated.xml | 2 + .../xui/fr/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/fr/panel_status_bar.xml | 26 +- .../skins/default/xui/fr/sidepanel_item_info.xml | 71 +- .../skins/default/xui/fr/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/fr/strings.xml | 6978 +++++-------------- .../newview/skins/default/xui/it/floater_about.xml | 75 +- .../default/xui/it/floater_associate_listing.xml | 7 + .../default/xui/it/floater_edit_hover_height.xml | 4 + .../xui/it/floater_inventory_item_properties.xml | 67 +- .../default/xui/it/floater_item_properties.xml | 2 + .../xui/it/floater_marketplace_listings.xml | 10 + .../xui/it/floater_marketplace_validation.xml | 5 + .../skins/default/xui/it/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/it/floater_pay.xml | 38 +- .../skins/default/xui/it/floater_pay_object.xml | 43 +- .../skins/default/xui/it/menu_attachment_self.xml | 1 + .../skins/default/xui/it/menu_avatar_self.xml | 1 + .../skins/default/xui/it/menu_inventory.xml | 12 +- .../skins/default/xui/it/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/it/menu_viewer.xml | 6 +- .../newview/skins/default/xui/it/notifications.xml | 2915 +++----- indra/newview/skins/default/xui/it/panel_login.xml | 19 +- .../default/xui/it/panel_marketplace_listings.xml | 11 + .../it/panel_marketplace_listings_inventory.xml | 2 + .../xui/it/panel_marketplace_listings_listed.xml | 2 + .../it/panel_marketplace_listings_unassociated.xml | 2 + .../xui/it/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/it/panel_status_bar.xml | 26 +- .../skins/default/xui/it/sidepanel_item_info.xml | 71 +- .../skins/default/xui/it/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/it/strings.xml | 6862 +++++-------------- .../newview/skins/default/xui/ja/floater_about.xml | 69 +- .../default/xui/ja/floater_associate_listing.xml | 7 + .../default/xui/ja/floater_edit_hover_height.xml | 4 + .../xui/ja/floater_inventory_item_properties.xml | 67 +- .../default/xui/ja/floater_item_properties.xml | 2 + .../xui/ja/floater_marketplace_listings.xml | 10 + .../xui/ja/floater_marketplace_validation.xml | 5 + .../skins/default/xui/ja/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/ja/floater_pay.xml | 37 +- .../skins/default/xui/ja/floater_pay_object.xml | 42 +- .../skins/default/xui/ja/menu_attachment_self.xml | 1 + .../skins/default/xui/ja/menu_avatar_self.xml | 1 + .../skins/default/xui/ja/menu_inventory.xml | 12 +- .../skins/default/xui/ja/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/ja/menu_viewer.xml | 6 +- .../newview/skins/default/xui/ja/notifications.xml | 2927 +++----- indra/newview/skins/default/xui/ja/panel_login.xml | 19 +- .../default/xui/ja/panel_marketplace_listings.xml | 11 + .../ja/panel_marketplace_listings_inventory.xml | 2 + .../xui/ja/panel_marketplace_listings_listed.xml | 2 + .../ja/panel_marketplace_listings_unassociated.xml | 2 + .../xui/ja/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/ja/panel_status_bar.xml | 28 +- .../skins/default/xui/ja/sidepanel_item_info.xml | 71 +- .../skins/default/xui/ja/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/ja/strings.xml | 6976 +++++-------------- .../newview/skins/default/xui/pl/floater_about.xml | 95 +- .../default/xui/pl/floater_associate_listing.xml | 7 + .../default/xui/pl/floater_edit_hover_height.xml | 4 + .../xui/pl/floater_inventory_item_properties.xml | 71 +- .../default/xui/pl/floater_item_properties.xml | 2 + .../xui/pl/floater_marketplace_listings.xml | 10 + .../xui/pl/floater_marketplace_validation.xml | 5 + .../skins/default/xui/pl/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/pl/floater_pay.xml | 38 +- .../skins/default/xui/pl/floater_pay_object.xml | 43 +- .../skins/default/xui/pl/menu_attachment_self.xml | 1 + .../skins/default/xui/pl/menu_avatar_self.xml | 1 + .../skins/default/xui/pl/menu_inventory.xml | 11 + .../skins/default/xui/pl/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/pl/menu_viewer.xml | 62 +- .../newview/skins/default/xui/pl/notifications.xml | 1989 ++---- indra/newview/skins/default/xui/pl/panel_login.xml | 49 +- .../default/xui/pl/panel_marketplace_listings.xml | 11 + .../pl/panel_marketplace_listings_inventory.xml | 2 + .../xui/pl/panel_marketplace_listings_listed.xml | 2 + .../pl/panel_marketplace_listings_unassociated.xml | 2 + .../xui/pl/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/pl/panel_status_bar.xml | 34 +- .../skins/default/xui/pl/sidepanel_item_info.xml | 77 +- .../skins/default/xui/pl/sidepanel_task_info.xml | 112 +- indra/newview/skins/default/xui/pl/strings.xml | 5761 +++++----------- .../newview/skins/default/xui/pt/floater_about.xml | 68 +- .../default/xui/pt/floater_associate_listing.xml | 7 + .../default/xui/pt/floater_edit_hover_height.xml | 4 + .../xui/pt/floater_inventory_item_properties.xml | 67 +- .../default/xui/pt/floater_item_properties.xml | 2 + .../xui/pt/floater_marketplace_listings.xml | 10 + .../xui/pt/floater_marketplace_validation.xml | 5 + .../skins/default/xui/pt/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/pt/floater_pay.xml | 37 +- .../skins/default/xui/pt/floater_pay_object.xml | 43 +- .../skins/default/xui/pt/menu_attachment_self.xml | 1 + .../skins/default/xui/pt/menu_avatar_self.xml | 1 + .../skins/default/xui/pt/menu_inventory.xml | 12 +- .../skins/default/xui/pt/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/pt/menu_viewer.xml | 8 +- .../newview/skins/default/xui/pt/notifications.xml | 2919 +++----- indra/newview/skins/default/xui/pt/panel_login.xml | 19 +- .../default/xui/pt/panel_marketplace_listings.xml | 11 + .../pt/panel_marketplace_listings_inventory.xml | 2 + .../xui/pt/panel_marketplace_listings_listed.xml | 2 + .../pt/panel_marketplace_listings_unassociated.xml | 2 + .../xui/pt/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/pt/panel_status_bar.xml | 26 +- .../skins/default/xui/pt/sidepanel_item_info.xml | 73 +- .../skins/default/xui/pt/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/pt/strings.xml | 6812 +++++-------------- .../newview/skins/default/xui/ru/floater_about.xml | 65 +- .../default/xui/ru/floater_associate_listing.xml | 7 + .../default/xui/ru/floater_edit_hover_height.xml | 4 + .../xui/ru/floater_inventory_item_properties.xml | 67 +- .../default/xui/ru/floater_item_properties.xml | 2 + .../xui/ru/floater_marketplace_listings.xml | 10 + .../xui/ru/floater_marketplace_validation.xml | 5 + .../skins/default/xui/ru/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/ru/floater_pay.xml | 33 +- .../skins/default/xui/ru/floater_pay_object.xml | 41 +- .../skins/default/xui/ru/menu_attachment_self.xml | 1 + .../skins/default/xui/ru/menu_avatar_self.xml | 1 + .../skins/default/xui/ru/menu_inventory.xml | 12 +- .../skins/default/xui/ru/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/ru/menu_viewer.xml | 6 +- .../newview/skins/default/xui/ru/notifications.xml | 2915 +++----- indra/newview/skins/default/xui/ru/panel_login.xml | 19 +- .../default/xui/ru/panel_marketplace_listings.xml | 11 + .../ru/panel_marketplace_listings_inventory.xml | 2 + .../xui/ru/panel_marketplace_listings_listed.xml | 2 + .../ru/panel_marketplace_listings_unassociated.xml | 2 + .../xui/ru/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/ru/panel_status_bar.xml | 26 +- .../skins/default/xui/ru/sidepanel_item_info.xml | 71 +- .../skins/default/xui/ru/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/ru/strings.xml | 6990 +++++--------------- .../newview/skins/default/xui/tr/floater_about.xml | 66 +- .../default/xui/tr/floater_associate_listing.xml | 7 + .../default/xui/tr/floater_edit_hover_height.xml | 4 + .../xui/tr/floater_inventory_item_properties.xml | 67 +- .../default/xui/tr/floater_item_properties.xml | 2 + .../xui/tr/floater_marketplace_listings.xml | 10 + .../xui/tr/floater_marketplace_validation.xml | 5 + .../skins/default/xui/tr/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/tr/floater_pay.xml | 33 +- .../skins/default/xui/tr/floater_pay_object.xml | 41 +- .../skins/default/xui/tr/menu_attachment_self.xml | 1 + .../skins/default/xui/tr/menu_avatar_self.xml | 1 + .../skins/default/xui/tr/menu_inventory.xml | 12 +- .../skins/default/xui/tr/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/tr/menu_viewer.xml | 6 +- .../newview/skins/default/xui/tr/notifications.xml | 2903 +++----- indra/newview/skins/default/xui/tr/panel_login.xml | 19 +- .../default/xui/tr/panel_marketplace_listings.xml | 11 + .../tr/panel_marketplace_listings_inventory.xml | 2 + .../xui/tr/panel_marketplace_listings_listed.xml | 2 + .../tr/panel_marketplace_listings_unassociated.xml | 2 + .../xui/tr/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/tr/panel_status_bar.xml | 26 +- .../skins/default/xui/tr/sidepanel_item_info.xml | 71 +- .../skins/default/xui/tr/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/tr/strings.xml | 6988 +++++-------------- .../newview/skins/default/xui/zh/floater_about.xml | 66 +- .../default/xui/zh/floater_associate_listing.xml | 7 + .../default/xui/zh/floater_edit_hover_height.xml | 4 + .../xui/zh/floater_inventory_item_properties.xml | 69 +- .../default/xui/zh/floater_item_properties.xml | 2 + .../xui/zh/floater_marketplace_listings.xml | 10 + .../xui/zh/floater_marketplace_validation.xml | 5 + .../skins/default/xui/zh/floater_openobject.xml | 11 +- indra/newview/skins/default/xui/zh/floater_pay.xml | 33 +- .../skins/default/xui/zh/floater_pay_object.xml | 41 +- .../skins/default/xui/zh/menu_attachment_self.xml | 1 + .../skins/default/xui/zh/menu_avatar_self.xml | 1 + .../skins/default/xui/zh/menu_inventory.xml | 12 +- .../skins/default/xui/zh/menu_marketplace_view.xml | 5 + indra/newview/skins/default/xui/zh/menu_viewer.xml | 6 +- .../newview/skins/default/xui/zh/notifications.xml | 2915 +++----- indra/newview/skins/default/xui/zh/panel_login.xml | 19 +- .../default/xui/zh/panel_marketplace_listings.xml | 11 + .../zh/panel_marketplace_listings_inventory.xml | 2 + .../xui/zh/panel_marketplace_listings_listed.xml | 2 + .../zh/panel_marketplace_listings_unassociated.xml | 2 + .../xui/zh/panel_marketplace_listings_unlisted.xml | 2 + .../skins/default/xui/zh/panel_status_bar.xml | 26 +- .../skins/default/xui/zh/sidepanel_item_info.xml | 73 +- .../skins/default/xui/zh/sidepanel_task_info.xml | 124 +- indra/newview/skins/default/xui/zh/strings.xml | 6988 +++++-------------- 260 files changed, 28077 insertions(+), 73877 deletions(-) create mode 100644 indra/newview/skins/default/xui/de/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/de/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/de/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/de/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/de/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/de/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/de/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/de/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/de/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/de/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/de/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/es/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/es/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/es/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/es/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/es/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/es/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/es/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/es/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/es/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/es/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/es/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/fr/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/fr/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/fr/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/it/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/it/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/it/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/it/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/it/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/it/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/it/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/it/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/it/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/it/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/it/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/ja/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/ja/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/ja/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/pl/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/pl/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/pl/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/ru/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/ru/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/ru/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/ru/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/ru/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/ru/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/tr/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/tr/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/tr/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/tr/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/tr/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/tr/panel_marketplace_listings_unlisted.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_associate_listing.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_edit_hover_height.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_item_properties.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/zh/floater_marketplace_validation.xml create mode 100644 indra/newview/skins/default/xui/zh/menu_marketplace_view.xml create mode 100644 indra/newview/skins/default/xui/zh/panel_marketplace_listings.xml create mode 100644 indra/newview/skins/default/xui/zh/panel_marketplace_listings_inventory.xml create mode 100644 indra/newview/skins/default/xui/zh/panel_marketplace_listings_listed.xml create mode 100644 indra/newview/skins/default/xui/zh/panel_marketplace_listings_unassociated.xml create mode 100644 indra/newview/skins/default/xui/zh/panel_marketplace_listings_unlisted.xml (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index bc0eae7c5d..ee631476cb 100755 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -1,74 +1,16 @@ - - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) -[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] - - - Kompiliert mit [COMPILER] version [COMPILER_VERSION] - - - Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -SLURL: <nolink>[SLURL]</nolink> -(globale Koordinaten [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) -[SERVER_VERSION] -[SERVER_RELEASE_NOTES_URL] - - - CPU: [CPU] -Speicher: [MEMORY_MB] MB -Betriebssystem, Version: [OS_VERSION] -Grafikkarten-Hersteller: [GRAPHICS_CARD_VENDOR] -Grafikkarten: [GRAPHICS_CARD] - - - Windows Grafiktreiber-Version: [GRAPHICS_DRIVER_VERSION] - - - OpenGL Version: [OPENGL_VERSION] - -libcurl-Version: [LIBCURL_VERSION] -J2C-Decoderversion: [J2C_VERSION] -Audio-Treiberversion: [AUDIO_DRIVER_VERSION] -Qt Webkit-Version: [QT_WEBKIT_VERSION] -Voice-Serverversion: [VOICE_VERSION] - - - (keiner) - - - Paketverlust: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) - - - Fehler beim Abrufen der URL für die Server-Versionshinweise. -