From 1d4ccaeb74641ebf199072c8568e26f8fe002d32 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Wed, 17 Aug 2011 16:29:20 +0300 Subject: SH-2285 FIXED Add localization capability to mesh uploader strings - Added the convex decomposition strings to the strings.xml - Added names to hardcoded strings. --- indra/newview/skins/default/xui/en/strings.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f049f857f0..72b412efe2 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3625,5 +3625,13 @@ Try enclosing path to the editor with double quotes. Viewing sound beacons (yellow) Viewing media beacons (white) Hiding Particles + + + Retain% + Detail + Better Detail + Surface + Solid + Wrap -- cgit v1.2.3 From 8baafe6613e62a76c6a0b85842cc7d542d615e71 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 18 Aug 2011 14:33:54 -0700 Subject: EXP-1098 User can drag folders into Outbox with more than 3 levels of nested folders EXP-1100 Show tooltips when drag and drop operations are not allowed --- indra/newview/skins/default/xui/en/strings.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f049f857f0..ced1826a03 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -165,7 +165,12 @@ Please try logging in again in a minute. Only a single item can be dragged here - + One or more of these objects cannot be sold or transferred to another user. + ou are wearing one or more of these objects. Remove them from your avatar and try moving them again. + This folder has too many levels of subfolders. Rearrange the interior folders to a maximum of 4 levels deep (Root Folder contains A contains B contains C). + This folder contains more than 200 objects. Box some of the items to reduce the object count. + + Click to view this web page Click to view this location's information Click to view this Resident's profile -- cgit v1.2.3 From ba79c8a3caaac0b37fc2eb9c54849e1ca2a121c2 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Fri, 19 Aug 2011 18:49:17 +0300 Subject: SH-2285 FIXED Add localization capability to mesh uploader strings - Added ability to translate "Preview" and "Normal" strings. --- indra/newview/skins/default/xui/en/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 72b412efe2..23e0da7f7e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3633,5 +3633,7 @@ Try enclosing path to the editor with double quotes. Surface Solid Wrap + Preview + Normal -- cgit v1.2.3 From 7b09592bf9968dfda5c4cedf4b55e0459e6bd764 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Fri, 19 Aug 2011 16:20:29 -0700 Subject: EXP-840 FIX -- Create outbox panels to help the user get started on the marketplace and to indicate drag and drop targets. EXP-858 PROGRESS -- Outbox sync failure error handling EXP-908 FIX -- Hide outbox when appropriate EXP-1062 FIX -- Add modal dialog for outbox sync complete EXP-1096 FIX -- Extra space below Received Items panel for an account that does not have a Merchant Account setup, no outbox display EXP-1104 FIX -- User can activate Merchant Outbox synch button when outbox is empty * Added separate class for outbox view to support error tag rendering * Added confirmation for sync complete. * Added different outbox messages for empty outbox, non-merchant and error: merchant but no outbox * Progress on a bunch of other fronts. --- indra/newview/skins/default/xui/en/strings.xml | 28 +++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ced1826a03..2eff3f2290 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -164,17 +164,16 @@ Please try logging in again in a minute. Land: Only a single item can be dragged here - - One or more of these objects cannot be sold or transferred to another user. - ou are wearing one or more of these objects. Remove them from your avatar and try moving them again. - This folder has too many levels of subfolders. Rearrange the interior folders to a maximum of 4 levels deep (Root Folder contains A contains B contains C). - This folder contains more than 200 objects. Box some of the items to reduce the object count. - - + One or more of these objects cannot be sold or transferred to another user. + ou are wearing one or more of these objects. Remove them from your avatar and try moving them again. + This folder has too many levels of subfolders. Rearrange the interior folders to a maximum of 4 levels deep (Root Folder contains A contains B contains C). + This folder contains more than 200 objects. Box some of the items to reduce the object count. + + Click to view this web page Click to view this location's information Click to view this Resident's profile - Learn more about this Resident + Learn more about this Resident Click to mute this Resident Click to unmute this Resident Click to IM this Resident @@ -2030,7 +2029,18 @@ Returns a string with the requested data about the region Drag a landmark here to add it to your favorites. You do not have a copy of this texture in your inventory Items purchased through the marketplace will be delivered here. - Drag items here in preparation for listing on your marketplace storefront. + http://marketplace.[DOMAIN_NAME] + http://marketplace.[DOMAIN_NAME]/create_store + http://marketplace.[DOMAIN_NAME]/learn_more + Your Merchant Outbox is not properly configured + Merchant Outbox configuration error + Please contact Customer Service to correct the problem. + Anyone can sell items on the Marketplace + Become a merchant! + [[MARKETPLACE_URL] The Second Life Marketplace] offers more than one million virtual products for sale, all of them created by Residents. You, too, can sell items you create, as well as some of the items you have purchased. It’s easy and setup is free. [[LEARN_MORE_URL] Learn more] or [[CREATE_STORE_URL] create a store] on the Marketplace to get started. + A new way to send items to the Marketplace + Drag and drop items here to prepare them for sale on the Marketplace + Drag items or folders that you wish to sell into this area. A copy of the item will appear, leaving your inventory unchanged, unless you have dragged a no-copy item. When you are ready to send the items to the Marketplace, click the Upload button. Once your items have been moved to your Marketplace Inventory, they will disappear from this folder. -- cgit v1.2.3 From a0a4a3de9bbd2740b8160882ed96075c3400e555 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Tue, 23 Aug 2011 14:40:51 -0700 Subject: EXP-1068 Disallow marketplace listing of items that are currently being worn --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2eff3f2290..5377b0ab05 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -165,7 +165,7 @@ Please try logging in again in a minute. Only a single item can be dragged here One or more of these objects cannot be sold or transferred to another user. - ou are wearing one or more of these objects. Remove them from your avatar and try moving them again. + You are wearing one or more of these objects. Remove them from your avatar and try moving them again. This folder has too many levels of subfolders. Rearrange the interior folders to a maximum of 4 levels deep (Root Folder contains A contains B contains C). This folder contains more than 200 objects. Box some of the items to reduce the object count. -- cgit v1.2.3 From c2443b95d3cd9f0f26e5e8f5c2dbeb5f6c307447 Mon Sep 17 00:00:00 2001 From: "leslie@leslie-HPz600.lindenlab.com" Date: Fri, 26 Aug 2011 16:33:47 -0700 Subject: EXP-1126 FIX -- Cannot use arrow keys to scroll up and down in Inbox and Outbox EXP-1003 FIX -- Renaming a folder in Received Items panel resets the New flag for that folder EXP-1001 FIX -- Newness is removed on next login if you log out or crash before opening inventory panel EXP-857 FIX -- Add context menu entries as alternate path to populate outbox EXP-858 FIX -- Outbox sync failure error handling EXP-1158 FIX -- Viewer crash when deleting items from Outbox when some folders are open * Made inbox, outbox and inventory panels all legit tab stops for keyboard focus * Added mouse over indication on inventory panel primarily for increased clarity on outbox error messages * Disabled "Rename" option on inbox items * Added context menu option to copy/move an item to the merchant outbox * Context menu option to copy/move to outbox is visible and/or enabled/disabled when appropriate * "LastInventoryInboxCollapse" no longer written out as a setting when the panel is not visible * Fixed up collapse time check to not try to parse empty string on first load (deminishes text spam in log greatly) * Disabled double-click as a way to equip items in the inbox or outbox * Viewer code no longer removes items from the outbox after sync. We rely on the sim to do this now. * Basic outbox sync error handling now displays error messages as tooltips along with badge over item in outbox * Moved some scroll container default values out of code and into xml --- indra/newview/skins/default/xui/en/strings.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 5377b0ab05..1351ad6e52 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2041,7 +2041,17 @@ Returns a string with the requested data about the region A new way to send items to the Marketplace Drag and drop items here to prepare them for sale on the Marketplace Drag items or folders that you wish to sell into this area. A copy of the item will appear, leaving your inventory unchanged, unless you have dragged a no-copy item. When you are ready to send the items to the Marketplace, click the Upload button. Once your items have been moved to your Marketplace Inventory, they will disappear from this folder. - + + No errors + Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge). + Error: This folder has no contents. + Error: This item failed to upload because your merchant account has too many items unassociated with products. To fix this error, login to the marketplace website and reduce your unassociated item count. + Error: This item contains too many objects. Fix this error by placing objects together in boxes to reduce the total count to less than 200. + Error: This item contains too many levels of nested folders. Reorganize it to a maximum of 3 levels of nested folders. + Error: This item can not be sold on the marketplace. + Error: There was a problem with this item. Try again later. + + -- cgit v1.2.3 From 0db01825c5895b4bbee15abea5f0e24b9aa93021 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Wed, 21 Sep 2011 00:34:35 +0300 Subject: STORM-1614 FIXED Untranslatable gesture: /bow Backed out changeset ed2791ae1cf0. --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c0154ae9b3..1351ad6e52 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3439,7 +3439,7 @@ Abuse Report Female - Stick tougue out Female - Wow - /bow1 + /bow /clap /count /extinguish -- cgit v1.2.3