summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
AgeCommit message (Collapse)Author
2011-10-31merge changes for storm-1673Oz Linden
2011-10-28merge changes for storm-1577Oz Linden
2011-10-26Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-10-26vwr-26120: add attachment points for Neck and Avatar CenterOz Linden
2011-10-26Merge STORM-1577.Vadim ProductEngine
Resolved conflicts manually.
2011-10-24* Fixed destination guide floater to display on login based on per accountLeslie Linden
"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.
2011-10-21merge with viewer-devRichard@Callum-HP-PC.lindenlab.com
2011-10-21* Updated copy for empty inbox per MKT-3351.Leslie Linden
2011-10-20merge changes for storm-910Oz Linden
2011-10-19EXP-1426 FIX Voice Settings floater button has label Nearby Voice and tool ↵Richard Nelson
tip with label nearby voice
2011-10-14EXP-1378 FIX Build tooltip does not match wiki textRichard Nelson
2011-10-14STORM-910 Text formatting issues in Land/Assets accordionJonathan Yap
2011-10-12Updated tooltip for "picks" to match the wiki.Leslie Linden
2011-10-11EXP-1255 Merge with PE code from ↵callum
https://hg.lindenlab.com/paulgproductengine/exp-1255/ Changeset: 20863:0d094469fd91
2011-10-10Added picks command and icon. Changed toolbar button text layout to halign ↵Leslie Linden
left.
2011-10-07EXP-1255 FIXED (More spillover does not contain separator and "Open ↵Paul ProductEngine
Landmarks" menuitem) - Added menu item "Open landmarks" as the last menu item in favorites menu
2011-10-05merge with viewer-developmentRichard Nelson
2011-09-29 * Added latest set of FUI buttons and labels according to the wikiLeslie Linden
* Hooked up commands to their respective floaters
2011-09-30merge changes for storm-1614Oz Linden
2011-09-26EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all ↵Leslie Linden
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.
2011-09-23EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all ↵Leslie Linden
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.
2011-09-21EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all ↵Leslie Linden
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.
2011-09-21STORM-1614 FIXED Untranslatable gesture: /bowVadim ProductEngine
Backed out changeset ed2791ae1cf0.
2011-09-14mergeBrad Payne (Vir Linden)
2011-09-13STORM-1577 WIP Show translation errors in chat.Vadim ProductEngine
2011-09-07Merge from viewer-experienceLeslie Linden
2011-09-07STORM-1577 Made parsing translation responses more robust.Vadim ProductEngine
JsonCpp is prone to aborting the program on failed assertions, so be super-careful and verify the response format.
2011-08-31mergeBrad Payne (Vir Linden)
2011-08-26EXP-1126 FIX -- Cannot use arrow keys to scroll up and down in Inbox and Outboxleslie@leslie-HPz600.lindenlab.com
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
2011-08-23EXP-1068 Disallow marketplace listing of items that are currently being wornLeyla Farazha
2011-08-22mergeBrad Payne (Vir Linden)
2011-08-19EXP-840 FIX -- Create outbox panels to help the user get started on the ↵Leslie Linden
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.
2011-08-19SH-2285 FIXED Add localization capability to mesh uploader stringsPaul ProductEngine
- Added ability to translate "Preview" and "Normal" strings.
2011-08-18EXP-1098 User can drag folders into Outbox with more than 3 levels of nested ↵Leyla Farazha
folders EXP-1100 Show tooltips when drag and drop operations are not allowed
2011-08-17SH-2285 FIXED Add localization capability to mesh uploader stringsPaul ProductEngine
- Added the convex decomposition strings to the strings.xml - Added names to hardcoded strings.
2011-08-12STORM-1554 FIXED Fixed typo in a gesture name.Vadim ProductEngine
2011-08-04merge changes for storm-1291Oz Linden
2011-08-02STORM-1291 FOLLOWUP Localized common (unisex) gestures.Vadim ProductEngine
2011-07-25merging latest viewer-development to mesh merge candidate.Nyx (Neal Orman)
2011-07-21mergeBrad Payne (Vir Linden)
2011-07-19STORM-1221 FIXED Hard coded dates made localizable under Group Profile ↵Seth ProductEngine
Land/Assets. Added a function for parsing a date string of specific format. Added strings defining the date format in Group Profile Land/Assets that should be localized.
2011-07-14Potential fix for SH-1854 and SH-1125 (caps issues)Don Kjer
2011-07-11Automated merge with ↵Xiaohong Bao
https://bitbucket.org/squire_linden/viewer-development-crash-horde
2011-07-11more fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-11merge changes for storm-1472Oz Linden
2011-07-08fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-08merge changes for storm-1491Oz Linden
2011-07-07Merge latest from viewer trunksimon@lindenlab.com
2011-07-07Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-07-06STORM-1472 FIXED Favorites folder in inventory does not translate properlyPaul ProductEngine
Reason: Instead of changing value of existing strings (Favorite and favorite) a new string(My Favorites) with wrong key was added. Solution: Deleted unnecessary string ("My Favorites") and added proper translation to the existing strings (Favorite and favorite).