From 1fad7d997d99715cc88b6e69ae325f28be413206 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Wed, 7 Sep 2011 19:12:35 +0300 Subject: STORM-1577 Made parsing translation responses more robust. JsonCpp is prone to aborting the program on failed assertions, so be super-careful and verify the response format. --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 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 2094275bed..146665b47d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3502,6 +3502,9 @@ Try enclosing path to the editor with double quotes. Error parsing the external editor command. External editor failed to run. + + Error parsing translation response. + Esc Space -- cgit v1.2.3 From d6c8d3dca8cad5d904d3fd4d6eb85ef2a76c0931 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 13 Sep 2011 03:20:58 +0300 Subject: STORM-1577 WIP Show translation errors in chat. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (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 146665b47d..f0bb82fdda 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3503,6 +3503,7 @@ Try enclosing path to the editor with double quotes. External editor failed to run. + Translation failed: [REASON] Error parsing translation response. -- 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 From 412e29ed9d62e975a5290c6008558a739b88065d Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 21 Sep 2011 17:25:38 -0700 Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars EXP-1232 FIX -- Create class to load and hold all of the command meta data associated with FUI toolbar actions * Added basic commands.xml file to define FUI-related toolbar actions. For now a basic "avatar" and "places" button are defined. * Added basic command manager to parse and hold strings that define potential toolbar command actions. * Broke out a separate floater function as a placeholder for the 3-state toolbar floater toggling. * LLUI::initClass now parses the new commands.xml file Reviewed by Richard. --- indra/newview/skins/default/xui/en/strings.xml | 8 +++++++- 1 file changed, 7 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 c0154ae9b3..3b986664db 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3651,4 +3651,10 @@ Try enclosing path to the editor with double quotes. Viewing media beacons (white) Hiding Particles - + + Avatar + Customize your avatar + Places + Destination guide + + -- cgit v1.2.3 From 53a8e1299305a4acad83f52401679c86485fcf51 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Fri, 23 Sep 2011 09:45:28 -0700 Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate the toybox floater window with all FUI toolbar buttons * Added all documented FUI commands from the wiki, 20 in all, with text, tooltips and placeholder icons. * Note current toolbar checked in toolbar code does not lay these commands out properly. --- indra/newview/skins/default/xui/en/strings.xml | 38 +++++++++++++++++++++++++- 1 file changed, 37 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 3b986664db..d4c2bc50ca 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3653,8 +3653,44 @@ Try enclosing path to the editor with double quotes. Avatar - Customize your avatar + Change the appearance of your avatar + Build + Building, reshaping terrain + Chat + Chat with people nearby + Compass + + Gestures + + How To + + Landmarks + + Map + + Move + + My Land + Information about the land you're visiting + My Stuff + View and use your belongings + People + Places Destination guide + Search + Find... + Settings + Preferences + Shop + + Snapshot + Take a picture + Speak + Speak with people nearby using your microphone + Upload + + View + Changing your view of the world -- cgit v1.2.3 From 9da5a8d01085f13c0586bba4c818ed540335ae2e Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 26 Sep 2011 14:34:42 -0700 Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate the toybox floater window with all FUI toolbar buttons EXP-1235 FIX -- Make the toybox available through the context menus associated with the other toolbars EXP-1248 FIX -- Implement context menu on toolbars * New commands are listed * Toolbars can now be made read-only (as in the toybox) or editable (as in the others) * Toolbars that are not read-only have a context menu that allows button type editing. Reviewed by Richard. --- 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 d4c2bc50ca..feea555fdc 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3668,6 +3668,8 @@ Try enclosing path to the editor with double quotes. Map + Mini Map + Move My Land -- cgit v1.2.3 From 66e21e0330b2f66b986a1ed76873af9752dcf2e1 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Thu, 29 Sep 2011 17:03:36 -0700 Subject: * Added latest set of FUI buttons and labels according to the wiki * Hooked up commands to their respective floaters --- indra/newview/skins/default/xui/en/strings.xml | 78 ++++++++++++++------------ 1 file changed, 42 insertions(+), 36 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 feea555fdc..158e1c711d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -16,16 +16,16 @@ Detecting hardware... Loading [APP_NAME]... Clearing cache... - Initializing Texture Cache... + Initializing texture cache... Initializing VFS... - Graphics Initialization Failed. Please Update Your Graphics Driver! + Graphics initialization failed. Please update your graphics driver! Restoring... - Changing Resolution... + Changing resolution... - Fullbright (Legacy) + Fullbright (legacy) Logging in. [APP_NAME] may appear frozen. Please wait. @@ -38,8 +38,8 @@ Initializing multimedia... Loading fonts... Verifying cache files (can take 60-90 seconds)... - Processing Response... - Initializing World... + Processing response... + Initializing world... Decoding images... Initializing QuickTime... QuickTime not found - unable to initialize. @@ -56,7 +56,7 @@ Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. - Network Error: Could not establish connection, please check your network connection. + Network error: Could not establish connection, please check your network connection. Login failed. Quit http://join.secondlife.com/ @@ -3652,47 +3652,53 @@ Try enclosing path to the editor with double quotes. Hiding Particles + + About land + Appearance Avatar - Change the appearance of your avatar Build - Building, reshaping terrain Chat - Chat with people nearby Compass - + Destinations Gestures - - How To - - Landmarks - + How to + Inventory Map - - Mini Map - + Marketplace + Mini-map Move - - My Land - Information about the land you're visiting - My Stuff - View and use your belongings People - Places - Destination guide + Preferences + Profile Search - Find... - Settings - Preferences - Shop - Snapshot - Take a picture Speak - Speak with people nearby using your microphone - Upload - View - Changing your view of the world + Nearby voice + + Information about the land you're visiting + Change your avatar + Choose a complete avatar + Building objects and reshaping them + Chat with people nearby using text + Compass + Destinations of interest + Gestures for your avatar + How to do common tasks + View and use your belongings + Map of the world + Go shopping + Show nearby people + Moving your avatar + Friends, groups, and nearby people + Places you've saved + Preferences + Edit or view your profile + Find places, events, people + Take a picture + Speak with people nearby using your microphone + Changing camera angle + People nearby with voice capability -- cgit v1.2.3 From 13a2431cb3ca24be1de51c041a046df6fe641b9e Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Fri, 7 Oct 2011 21:07:03 +0300 Subject: EXP-1255 FIXED (More spillover does not contain separator and "Open Landmarks" menuitem) - Added menu item "Open landmarks" as the last menu item in favorites menu --- 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 f021fdd6a1..be1ed234fc 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2051,6 +2051,8 @@ Returns a string with the requested data about the region Error: This item can not be sold on the marketplace. Error: There was a problem with this item. Try again later. + Open landmarks + -- cgit v1.2.3 From fba3f5dfd6ab51debd97c2c0e635ddcad388bcfe Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 10 Oct 2011 15:44:31 -0700 Subject: Added picks command and icon. Changed toolbar button text layout to halign left. --- 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 f021fdd6a1..d12dda88be 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3668,6 +3668,7 @@ Try enclosing path to the editor with double quotes. Mini-map Move People + Picks Places Preferences Profile @@ -3692,6 +3693,7 @@ Try enclosing path to the editor with double quotes. Show nearby people Moving your avatar Friends, groups, and nearby people + Favorite places Places you've saved Preferences Edit or view your profile -- cgit v1.2.3 From f95922c27330b12ba22434203bf6955c06b74ba4 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 12 Oct 2011 10:08:14 -0700 Subject: Updated tooltip for "picks" to match the wiki. --- 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 f19cfa19f2..04fc5c868c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3695,7 +3695,7 @@ Try enclosing path to the editor with double quotes. Show nearby people Moving your avatar Friends, groups, and nearby people - Favorite places + Places to show as favorites in your profile Places you've saved Preferences Edit or view your profile -- cgit v1.2.3 From 04eb6f0ef4e5b00103ea9f2b011ca709be8a1ef2 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 14 Oct 2011 17:55:04 -0400 Subject: STORM-910 Text formatting issues in Land/Assets accordion --- 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 a41330c9f6..c5bef9c6ab 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2267,7 +2267,7 @@ Returns a string with the requested data about the region [mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc] - + Balance Credits Debits -- cgit v1.2.3 From c69131be77b40ee2b0bc39303439c26b44b6a49d Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 14 Oct 2011 15:26:48 -0700 Subject: EXP-1378 FIX Build tooltip does not match wiki text --- 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 04fc5c868c..78e10d207c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3683,7 +3683,7 @@ Try enclosing path to the editor with double quotes. Information about the land you're visiting Change your avatar Choose a complete avatar - Building objects and reshaping them + Building objects and reshaping terrain Chat with people nearby using text Compass Destinations of interest -- cgit v1.2.3 From 492c93369ccc08dda1f1f51912737dec81d7de83 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 19 Oct 2011 17:25:45 -0700 Subject: EXP-1426 FIX Voice Settings floater button has label Nearby Voice and tool tip with label nearby voice --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 78e10d207c..f2617556e6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3678,7 +3678,7 @@ Try enclosing path to the editor with double quotes. Snapshot Speak View - Nearby voice + Voice settings Information about the land you're visiting Change your avatar @@ -3703,7 +3703,7 @@ Try enclosing path to the editor with double quotes. Take a picture Speak with people nearby using your microphone Changing camera angle - People nearby with voice capability + Volume controls for calls and people near you in world Retain% -- cgit v1.2.3 From f2952ded0396e98e1010ebe39de5bba0ae6ba5f7 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Fri, 21 Oct 2011 12:06:51 -0700 Subject: * Updated copy for empty inbox per MKT-3351. --- 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 f2617556e6..308208869d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2028,7 +2028,7 @@ Returns a string with the requested data about the region Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]. 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. + When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. http://marketplace.[DOMAIN_NAME] http://marketplace.[DOMAIN_NAME]/create_store http://marketplace.[DOMAIN_NAME]/learn_more -- cgit v1.2.3 From 8d6e7fa02c0d5cd18f91ac6862079ff4fa0719d4 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 24 Oct 2011 16:49:00 -0700 Subject: * Fixed destination guide floater to display on login based on per account "DisplayDestinationsOnInitialRun" setting or initial agent SL login. * Added toolbar enumeration for toolbar view so queries for commands can now indicate where the command currently is on the left, right or bottom toolbars. * Updated toybox toolbar button tooltips to indicate where the command currently resides in the view. * Added unused function to allow toolbar buttons to be changed to flash indefinitely. Reviewed by Richard. --- indra/newview/skins/default/xui/en/strings.xml | 6 +++++- 1 file changed, 5 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 308208869d..5e5bc0bde0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3705,7 +3705,11 @@ Try enclosing path to the editor with double quotes. Changing camera angle Volume controls for calls and people near you in world - + currently in your bottom toolbar + currently in your left toolbar + currently in your right toolbar + + Retain% Detail Better Detail -- cgit v1.2.3 From 5814695d71bc91eae556e682fa5d3ddd5ebdb628 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 26 Oct 2011 12:08:59 -0400 Subject: vwr-26120: add attachment points for Neck and Avatar Center --- 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 c4031de0f8..de5ade7fd9 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2183,6 +2183,8 @@ Returns a string with the requested data about the region Stomach Left Pec Right Pec + Neck + Avatar Center Invalid Attachment Point -- cgit v1.2.3 From 65e144d9fec4bb441050e73136ed95b48e6e363c Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Wed, 2 Nov 2011 19:05:13 +0200 Subject: STORM-1580 WIP Initial commit for PO review. --- 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 ec230773cc..befcc5dd87 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3724,4 +3724,12 @@ Try enclosing path to the editor with double quotes. Wrap Preview Normal + + + Very Low + Low + Medium + High + Very High + -- cgit v1.2.3 From 570d02dc7e41c3e08477e7f759d632db78690eb4 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Tue, 29 Nov 2011 16:57:37 -0800 Subject: Initial merchant outbox button --- 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 befcc5dd87..105c6095e6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3675,6 +3675,7 @@ Try enclosing path to the editor with double quotes. Marketplace Mini-map Move + Merchant outbox People Picks Places @@ -3700,6 +3701,7 @@ Try enclosing path to the editor with double quotes. Go shopping Show nearby people Moving your avatar + Transfer items to your marketplace for sale Friends, groups, and nearby people Places to show as favorites in your profile Places you've saved -- cgit v1.2.3 From f2f90b6ed8e493a42aff805135527d6a7a345e3e Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Wed, 30 Nov 2011 08:03:20 +0200 Subject: EXP-1636 FIXED Extend menubar label changes to floater titles and FUI button labels. --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 befcc5dd87..c25d1f57d6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3674,7 +3674,7 @@ Try enclosing path to the editor with double quotes. Map Marketplace Mini-map - Move + Walk / run / fly People Picks Places @@ -3683,7 +3683,7 @@ Try enclosing path to the editor with double quotes. Search Snapshot Speak - View + Camera controls Voice settings Information about the land you're visiting -- cgit v1.2.3 From 5535722ea5c2f64a25ca569c930e969f2e989af9 Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Thu, 1 Dec 2011 12:31:56 +0000 Subject: STORM-1708 Linux UI additions --- indra/newview/skins/default/xui/en/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 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 befcc5dd87..0d26465dfa 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -427,9 +427,10 @@ Please try logging in again in a minute. Compressed Images Load Files Choose Directory + Scripts - - + Sleeps script for [SLEEP_TIME] seconds. -- cgit v1.2.3 From 04d5ba4ab982eed493502dca228134191acb78da Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Fri, 9 Dec 2011 09:51:25 +0000 Subject: General cleanup of new code (removing commented lines, experimetal stuff), adding some comments per RB feedback. --- indra/newview/skins/default/xui/en/strings.xml | 52 +++++++++++++------------- 1 file changed, 26 insertions(+), 26 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 0d26465dfa..f962ff0aee 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -88,7 +88,7 @@ We are very sorry for the inconvenience. Logins are currently restricted to employees only. Check www.secondlife.com/status for updates. Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience. - + People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life. Second Life cannot be accessed from this computer. If you feel this is an error, please contact @@ -168,7 +168,7 @@ Please try logging in again in a minute. 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. - + Click to view this web page Click to view this location's information @@ -188,7 +188,7 @@ Please try logging in again in a minute. Click to view this object's description Click to view this location on a map Click to run the secondlife:// command - + Teleport to @@ -427,7 +427,7 @@ Please try logging in again in a minute. Compressed Images Load Files Choose Directory - Scripts + Scripts Shirt not worn Pants not worn @@ -1988,7 +1988,7 @@ Returns a string with the requested data about the region New [WEARABLE_ITEM] - + Next @@ -2314,7 +2314,7 @@ Returns a string with the requested data about the region Error: script information is only available in your current region Retrieving information... You do not have permission to examine this parcel - + Sitting On Chest Head @@ -2354,7 +2354,7 @@ Returns a string with the requested data about the region HUD Bottom Left HUD Bottom HUD Bottom Right - + Line [LINE], Column [COLUMN] @@ -2367,7 +2367,7 @@ Returns a string with the requested data about the region Content of object - New Script + New Script The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing. @@ -2397,7 +2397,7 @@ Returns a string with the requested data about the region Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile (will update after publish) - + You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified. User has no picks or classifieds @@ -3274,7 +3274,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. You have blocked this Resident. Sending a message will automatically unblock them. @@ -3300,7 +3300,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. You are not a session moderator. @@ -3313,12 +3313,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Unable to add users to chat session with [RECIPIENT]. Unable to send your message to the chat session with [RECIPIENT]. - + Unable to send your message to the chat session with [RECIPIENT]. @@ -3326,7 +3326,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Error while moderating. @@ -3347,9 +3347,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. The session initialization is timed out - + Home position set. - + http://secondlife.com/landing/voicemorphing @@ -3367,20 +3367,20 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. to join a group to upload to publish a classified ad - + Giving L$ [AMOUNT] Uploading costs L$ [AMOUNT] This costs L$ [AMOUNT] Buying selected land for L$ [AMOUNT] This object costs L$ [AMOUNT] - + Everyone Officers Owners Online Uploading... - + Abuse Report @@ -3474,23 +3474,23 @@ Abuse Report [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] - + none/none Can't load images larger than [WIDTH]*[HEIGHT] - + Despite our best efforts, something unexpected has gone wrong. - Please check status.secondlifegrid.net to see if there is a known problem with the service. + Please check status.secondlifegrid.net to see if there is a known problem with the service. If you continue to experience problems, please check your network and firewall setup. - Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday Sun:Mon:Tue:Wed:Thu:Fri:Sat @@ -3523,7 +3523,7 @@ Abuse Report Delete selected item? There are no items in this outfit - + Select an editor using the ExternalEditor setting. Cannot find the external editor you specified. -- cgit v1.2.3 From e826cbd90750fd38565e4e44390948f36254cf1f Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Dec 2011 15:02:52 -0800 Subject: EXP-1682 FIX EXP-1683 FIX EXP-1705 FIX EXP-1707 FIX * Outbox folder count now uses inventory API directly rather than inventory folder view for folder count and item status * Asynchronous fetches are triggered for the outbox content when the window is opened and when it receives focus * Marketplace URL's for empty and non-merchant outbox view have been updated * "Copy to Merchant Outbox" and "Delete" context menu items should be fully functional now with item counts, etc. --- indra/newview/skins/default/xui/en/strings.xml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 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 b8d5f93320..7dd965de84 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2029,18 +2029,28 @@ 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 When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. - http://marketplace.[DOMAIN_NAME] - http://marketplace.[DOMAIN_NAME]/create_store - http://marketplace.[DOMAIN_NAME]/learn_more + https://marketplace.[MARKETPLACE_DOMAIN_NAME] + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/create_store + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/[AGENT_ID]/store/dashboard + https://marketplace.[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 + 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 + + The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. + + [[MARKETPLACE_URL] Visit the Marketplace] + [[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] + + Your outbox is empty. 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. + + Drag folders to this area. When you are ready to send them to the Marketplace for sale, click the "Send to Marketplace" button below. + + [[MARKETPLACE_DASHBOARD_URL] Go to your Merchant Dashboard] + 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 d3f06b296203c08c900c4e569ce5df0ac2f27715 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Dec 2011 17:04:58 -0800 Subject: Fixed marketplace URL trailing '/' and updated to latest window shade code from viewer-experience --- 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 7dd965de84..3c7465cd7c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2029,7 +2029,7 @@ 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 When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. - https://marketplace.[MARKETPLACE_DOMAIN_NAME] + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ https://marketplace.[MARKETPLACE_DOMAIN_NAME]/create_store https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/[AGENT_ID]/store/dashboard https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more -- cgit v1.2.3 From 7f85f6be6af92868faeaf38b60accd3a3ab4491a Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 12 Dec 2011 20:07:34 -0500 Subject: VWR-27832 L$ Transfer failures show alert as if successful --- indra/newview/skins/default/xui/en/strings.xml | 4 ++++ 1 file changed, 4 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 c25d1f57d6..877c2e5c34 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3358,6 +3358,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. You paid L$[AMOUNT]. You paid [NAME] L$[AMOUNT]. You paid L$[AMOUNT] [REASON]. + You failed to pay [NAME] L$[AMOUNT] [REASON]. + You failed to pay L$[AMOUNT]. + You failed to pay [NAME] L$[AMOUNT]. + You failed to pay L$[AMOUNT] [REASON]. for [ITEM] for a parcel of land for a land access pass -- cgit v1.2.3 From 181eaa8196d19d5d0c1db17fe27bd2bdee11525b Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Dec 2011 17:22:47 -0800 Subject: EXP-1648 FIX * Merchant outbox no longer crashes for non-merchants. * Folder count is hidden for non-merchants. * Drag and drop to merchant outbox floater is disabled for non-merchants. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (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 3c7465cd7c..d8da56d338 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2042,6 +2042,7 @@ Returns a string with the requested data about the region The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. [[MARKETPLACE_URL] Visit the Marketplace] + [[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] Your outbox is empty. -- cgit v1.2.3 From 90e6336b27ae962052a68ec17205e7b1f87bdb4e Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Thu, 15 Dec 2011 09:51:26 -0800 Subject: EXP-1725 FIX -- Carriage return or tab characters shown in Outbox text on Windows * Removed tabs from outbox strings. --- indra/newview/skins/default/xui/en/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 d8da56d338..b83571a106 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2039,18 +2039,18 @@ Returns a string with the requested data about the region Anyone can sell items on the Marketplace. Become a merchant! - The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. - - [[MARKETPLACE_URL] Visit the Marketplace] +The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. + +[[MARKETPLACE_URL] Visit the Marketplace] - [[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] +[[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] Your outbox is empty. Drag and drop items here to prepare them for sale on the Marketplace - Drag folders to this area. When you are ready to send them to the Marketplace for sale, click the "Send to Marketplace" button below. - - [[MARKETPLACE_DASHBOARD_URL] Go to your Merchant Dashboard] +Drag folders to this area. When you are ready to send them to the Marketplace for sale, click the "Send to Marketplace" button below. + +[[MARKETPLACE_DASHBOARD_URL] Go to your Merchant Dashboard] No errors -- cgit v1.2.3 From 2e564abcd682c348de3a2d3a50ef58df545c143b Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Thu, 15 Dec 2011 14:26:42 -0800 Subject: EXP-1730 FIX EXP-1731 FIX EXP-1735 FIX EXP-1736 FIX EXP-1737 FIX EXP-1738 FIX EXP-1739 FIX * Users can no longer drag and drop items to the outbox from in world, notecards or the library. * Drag and drop now blocks the creation of hierarchies that are too deep, too many folders or contain too many items. * Settings now exist to specify drag and drop limitations to the outbox, named: InventoryOutboxMaxFolderDepth (4) InventoryOutboxMaxFolderCount (20) InventoryOutboxMaxItemCount (200) --- 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 b83571a106..0d9a7e5c41 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -165,8 +165,10 @@ 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. + You can only transfer objects in your inventory to your merchant outbox. 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 has too many subfolders. Reorganize the interior to a maximum of 20 folders. This folder contains more than 200 objects. Box some of the items to reduce the object count. -- cgit v1.2.3 From 399bd5643cdec65b98b76556b16e3a00df6db1b2 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sat, 17 Dec 2011 13:27:20 -0500 Subject: STORM-653 As a user i would like to be able to see the available number of attachments and remaining free slots. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (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 c25d1f57d6..30697278c3 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2133,6 +2133,7 @@ Returns a string with the requested data about the region All No attachments worn + Attachments ([COUNT] slots remain) -- cgit v1.2.3 From 6c26fdea4d62f723c3bdbec9ded032e6d77301b8 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 19 Dec 2011 16:46:26 -0800 Subject: EXP-1741 FIX -- Learn more link goes to page not found from Outbox for user that is not a merchant an Agni EXP-1746 FIX -- Update Outbox messaging EXP-1748 FIX -- Close down on messaging with Spinner MKT-3403 support -- viewer tooltips updated to match errors in marketplace * Copy has been updated to match the design per Leo and Brooke * Marketplace URL's have also been updated * The outbox floater now reports a status string in the existing folder count control --- indra/newview/skins/default/xui/en/strings.xml | 37 +++++++++++--------------- 1 file changed, 15 insertions(+), 22 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 0d9a7e5c41..18ca3033e9 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -164,12 +164,13 @@ 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. - You can only transfer objects in your inventory to your merchant outbox. - 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 has too many subfolders. Reorganize the interior to a maximum of 20 folders. - 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. + Your merchant outbox can only accept items directly from your inventory + You can not put items you are wearing into your merchant outbox + Depth of nested folders exceeds 3 + Subfolder count in top-level folder exceeds 20 + Item count in top-level folder exceeds 200 Click to view this web page @@ -2032,33 +2033,25 @@ Returns a string with the requested data about the region You do not have a copy of this texture in your inventory When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ - https://marketplace.[MARKETPLACE_DOMAIN_NAME]/create_store - https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/[AGENT_ID]/store/dashboard + http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4 + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard https://marketplace.[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! + -The Second Life Marketplace offers more than one million virtual products for sale, all of them created by Residents like you. You too can create items and sell them on the Marketplace. Creating a store is easy and free of charge. - -[[MARKETPLACE_URL] Visit the Marketplace] - -[[MARKETPLACE_LEARN_MORE_URL] Learn more about creating a store] +If you'd like to become a merchant, you'll need to [[MARKETPLACE_CREATE_STORE_URL] create a Marketplace store]. Your outbox is empty. - Drag and drop items here to prepare them for sale on the Marketplace + -Drag folders to this area. When you are ready to send them to the Marketplace for sale, click the "Send to Marketplace" button below. - -[[MARKETPLACE_DASHBOARD_URL] Go to your Merchant Dashboard] +Drag folders to this area and click "Send to Marketplace" 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). 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 failed to upload because your merchant account has too many items unassociated with products. To fix this error, log in 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. -- cgit v1.2.3 From 2455a4bb00b399e5cd5f22e9b177ca2aeaad2ba2 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Wed, 21 Dec 2011 14:09:56 +0200 Subject: EXP-1695 FIXED currency format in Group Profile > Land/Asset and New Group. --- 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 c25d1f57d6..ac5b027ea1 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2271,7 +2271,7 @@ Returns a string with the requested data about the region [mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc] - + Balance Credits Debits -- cgit v1.2.3 From 0ccf2b5a1c08c897326c0ce47caa48e30ec4b5fa Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Wed, 21 Dec 2011 14:10:02 +0200 Subject: EXP-1693 FIXED the date localization in Item Profile window, Voice Morphs window and in scroll list widget in general. - Added a customizable date format string to be used for scroll list cell of "date" type. - The date localization does not change the value of a scroll list cell changing only its string representation. - Added using localized week days and month names from strings.xml for all locales not only Ja and Pl as it was before. - Changed the date format in Item Profile window (French locale) as noted in the issue description. - For this fix the French locale still needs the localization of the following strings in strings.xml: --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 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 ac5b027ea1..e31fd167bc 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3498,6 +3498,9 @@ Abuse Report [MDAY] AM PM + + + [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] US$ [AMOUNT] -- cgit v1.2.3 From 912833bafa9a59734432787158e36b66ee9586aa Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 4 Jan 2012 14:04:32 -0800 Subject: EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders * Updated drag and drop to correctly handle moving to and from outbox as opposed to within the outbox when dealing with folder and item count limitations related to depth and total folder count. --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 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 18ca3033e9..6672d479a2 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -172,6 +172,9 @@ Please try logging in again in a minute. Subfolder count in top-level folder exceeds 20 Item count in top-level folder exceeds 200 + You can't move a folder into its child + You can't move a folder into itself + Click to view this web page Click to view this location's information -- cgit v1.2.3 From 98a85b1bf2d7decf477d3d1076859fdeec6f1b46 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 9 Jan 2012 13:39:58 -0800 Subject: EXP-1159 FIX -- User can get No transfer items into Merchant Outbox by rezzing object from Outbox, including No Transfer item in contents, and then taking back into Inventory * Drag and drop to the 3D world is now disabled from the outbox --- indra/newview/skins/default/xui/en/strings.xml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 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 20d9463186..a78f3df5b6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -18,7 +18,7 @@ Clearing cache... Initializing texture cache... Initializing VFS... - Graphics initialization failed. Please update your graphics driver! + Graphics initialization failed. Please update your graphics driver! Restoring... @@ -35,9 +35,9 @@ Previous login attempt failed. Logging in, attempt [NUMBER] Loading world... Initializing embedded web browser... - Initializing multimedia... - Loading fonts... - Verifying cache files (can take 60-90 seconds)... + Initializing multimedia... + Loading fonts... + Verifying cache files (can take 60-90 seconds)... Processing response... Initializing world... Decoding images... @@ -49,12 +49,12 @@ Waiting for region handshake... Connecting to region... Downloading clothing... - The server returned an invalid or corrupt certificate. Please contact the Grid administrator. - An invalid hostname was used to access the server, please check your SLURL or Grid hostname. - The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator. - The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. - Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. - The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. + The server returned an invalid or corrupt certificate. Please contact the Grid administrator. + An invalid hostname was used to access the server, please check your SLURL or Grid hostname. + The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator. + The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. + Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. + The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. Network error: Could not establish connection, please check your network connection. Login failed. @@ -165,6 +165,7 @@ Please try logging in again in a minute. Only a single item can be dragged here + You can not rez items in your merchant outbox One or more of these objects cannot be sold or transferred. Your merchant outbox can only accept items directly from your inventory You can not put items you are wearing into your merchant outbox -- cgit v1.2.3 From 59950f6178699b96e86bfd2c0bc701271b3f1a6b Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 11 Jan 2012 16:49:32 -0800 Subject: EXP-1778 FIX -- Link to Marketplace Error log in transfer failed viewer notification * Added a link to the "imports" log from the "done with errors" notification when sending folders to the marketplace. --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (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 a78f3df5b6..84fce6630b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2040,6 +2040,7 @@ Returns a string with the requested data about the region https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4 https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard + https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more Anyone can sell items on the Marketplace. -- cgit v1.2.3 From accf83394513c82e98fffa15bc0131ee25f63f00 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Tue, 17 Jan 2012 13:07:57 -0800 Subject: EXP-1805 FIX -- Block calling cards from being added to Merchant Outbox EXP-1810 PROGRESS -- Cannot resize Received items panel in Inventory window * Updated "copy to merchant outbox" context menu and drag and drop code to block calling cards. * Changed user_resize to true on the "Received Items" panel and the main inventory panel --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (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 84fce6630b..3b00969fd4 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -169,6 +169,7 @@ Please try logging in again in a minute. One or more of these objects cannot be sold or transferred. Your merchant outbox can only accept items directly from your inventory You can not put items you are wearing into your merchant outbox + You can not put calling cards into your merchant outbox Depth of nested folders exceeds 3 Subfolder count in top-level folder exceeds 20 Item count in top-level folder exceeds 200 -- cgit v1.2.3 From 098bbfef99b6a52855af9076837ca521d2cdd525 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 18 Jan 2012 13:53:05 -0800 Subject: EXP-1704 FIX -- Updated text for Empty Received Items panel in Viewer * Updated to latest text per Leo's comment in the JIRA. --- 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 3b00969fd4..3351ffe00f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2037,7 +2037,7 @@ Returns a string with the requested data about the region Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]. Drag a landmark here to add it to your favorites. You do not have a copy of this texture in your inventory - When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it. + Certain items you receive, such as premium gifts, will appear here. You may then drag them into your inventory. https://marketplace.[MARKETPLACE_DOMAIN_NAME]/ http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4 https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard -- cgit v1.2.3