summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
AgeCommit message (Collapse)Author
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-19better fix of EXT-299 "Mute" still showing in avatar Context menu, although ↵Ramzi Linden
label says "Block" The original fix at r6543 created a duplicate node, which breaks localization. Renaming that new node with a unique name=.
2010-01-14Backed out changeset f34a69c2af56Tofu Linden
(this backs-out my backout, now that I'm happy the original merge works okay :))
2010-01-14Backed out changeset d5b761982e63Tofu Linden
This got pushed too early - sorry. Sigh.
2010-01-14Merge from viewer2, including fix for the test failure biting qarl.Tofu Linden
Minor conflict in llviewerfloaterreg.cpp resolved.
2010-01-13Merge.Tofu Linden
2010-01-13EXT-3383 adhere to style guide for capitalization of 'Resident'Ramzi Linden
2010-01-12Shortened string to accomodate side panel width.Chuck Linden
http://jira.secondlife.com/browse/EXT-3798
2010-01-08EXT-4049 Change About SL window label from ABOUT Second Life to About Second ↵Tofu Linden
Life
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
U indra/llui/lluictrlfactory.cpp U indra/newview/llinventorybridge.cpp U indra/newview/llviewertexture.cpp U indra/newview/llviewertexture.h
2009-12-24fixed minor bug EXT-3459 (Not user friendly notification after leaving group ↵Andrew Polunin
while group chat is opened) --HG-- branch : product-engine
2009-12-23fixed EXT-3400 Instuction string doesn't fit button's caption in IM floaterIgor Borovkov
--HG-- branch : product-engine
2009-12-22fixed minor bug EXT-3462 Voice Chat vs Voice CallAndrew Polunin
--HG-- branch : product-engine
2009-12-21mergerichard
2009-12-21fixed normal bug EXT-3562 MissingString(message) appears instead of warning ↵Andrew Polunin
about blocked text chat --HG-- branch : product-engine
2009-12-21Fixed bad XML that was checked into strings.xml.Lynx Linden
This caused lots of fallout, like menu accelerators appearing as "missing_string(accel-win-ctrl)" instead of "Ctrl+". The offending line was the ATTACH_HUD_CENTER_2 string, which had a messed up XML close tag.
2009-12-19Added a first view script limits floatergabriel
reviewed by Mani
2009-12-18ext-3307 - nearby chat stays scrolled at bottomrichard
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-16Un-hardcoded a couple of strings.Vadim Savchuk
--HG-- branch : product-engine
2009-12-16Fixed low bug EXT-3188 ("There are no picks/classfields here" messageAndrew Dyukov
should appear in "Picks" tab after the server response and not to). - added "Loading..." message - changed condition on which "There are no picks/classfields here" is shown and moved message string to strings.xml --HG-- branch : product-engine
2009-12-15Merge from default branch.Vadim Savchuk
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs remote change) by removing them. --HG-- branch : product-engine
2009-12-14mergerichard
2009-12-14Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-14Fixed Normal bug EXT-3115 ("Unable to start new chat session" ↵Mike Antipov
MissingString(generic)) -- added string with name="generic" with the same value as "generic_request_error" into strings.xml (because "generic" is a part of server's response body) --HG-- branch : product-engine
2009-12-11DEV-40452 (followup) Correct a few more inconsistencies in the 3 new LSL ↵Ramzi Linden
editor tooltips
2009-12-11Merge, fixed conflict in panel_preferences_sound.xmlJames Cook
2009-12-10Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-10Work on major task EXT-2808 (Add speakers moderation (both voice and text) ↵Mike Antipov
to the Voice Control Panel (Active Speakers List)) -- Implemented Actions to Mute/Unmute Participants without using Agent's Block List -- Updated missing strings to show error while moderating --HG-- branch : product-engine
2009-12-09EXT-299 "Mute" still showing in menu_pie_avatar.xml although label says "Block"James Cook
2009-12-09MergeJames Cook
2009-12-09ext-2976 change "alerts" to read "notifications"Lis Pardi
2009-12-09automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-09Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-08EXT-3256 : Show help message in Favorites bar if emptyLoren Shih
--HG-- branch : avatar-pipeline
2009-12-08L10N: Add much-needed linguistic context in the comments of strings.xmlRamzi Linden
2009-12-08Fixed low bug EXT-3037 ("MissingString(share_alert)" message appears in p2p ↵Eugene Mutavchi
chat window after clicking "Share" btn on IM floater) --HG-- branch : product-engine
2009-12-08Grabbed more viewer 2 changes that should fix parabuild problemPalmer
2009-12-07EXT-2855 delete 2 more entries in strings.xml that are not actually user-visibleRamzi Linden
2009-12-07MergeSteve Bennetts
2009-12-07L10N: Add much-needed linguistic context in the comments of strings.xml;Ramzi Linden
L10N: consistency in phrasing on the 2 separate places in the Nav Bar where you create/edit a Landmark Also, add a separator to menu_NavBar so its easier to parse visually.
2009-12-07Merge of viewer 2 changesPalmer
2009-12-07Manual merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-04Implemented normal task EXT-2832 (Hide "undock" icon on the floaters).Andrew Dyukov
--HG-- branch : product-engine
2009-12-03EXT-2966 Parcel property icons on nav bar have no tool-tipsJames Cook
Added tooltips in strings.xml so they can be localized.
2009-12-02merge from remote repoangela
2009-12-01DEV-40702: Internationalize the unknown Vivox version string ratherLynx Linden
than hardcode it in llvoiceclient.cpp. Also rename the string from "Unknown" to "Not connected", to better reflect the fact that we get the Vivox version once voice is connected.
2009-12-01EXT-2854 Replace instances in the viewer with the final search maturity namesangela
2009-11-25EXT-2855 Strings.xml has entries which are not actually user-visibleRamzi Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 17:03:48 +0000