summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
AgeCommit message (Collapse)Author
2010-06-02EXT-7528 FIX fix typoYuri Chebotarev
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/491/ --HG-- branch : product-engine
2010-06-01EXT-6710 FIXED Added inventory items sharing confirmation and modified alert ↵Alexei Arabadji
about non-copy objects sharing. Current behavior: * user will be prompted about sharing items regardless is it one or more items; * user will be prompted about trying to share one ore more non-copy items; * in case user tries to share non-copy items among with copy items — copy tems will be shared and user will be prompted about sharing non-copy items reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/475/ --HG-- branch : product-engine
2010-05-31Manual merge from default branch.Vadim Savchuk
Semi-automatically resolved conflicts in: * indra/newview/llappearancemgr.cpp * indra/newview/llappviewer.cpp * indra/newview/llcofwearables.cpp * indra/newview/llinventoryfunctions.cpp * indra/newview/llpaneloutfitedit.cpp * indra/newview/skins/default/xui/en/strings.xml * indra/newview/skins/default/xui/ja/strings.xml --HG-- branch : product-engine
2010-05-28EXT-7466 - [BROKEN STRING] the word "administrator" is broken in strings.xml ↵Roxie Linden
in 2 places Simple fix
2010-05-28EXT-7013 FIX time formatting function didn't work for some parameters for ↵Yuri Chebotarev
Japanise (like weekdays). reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/457/ --HG-- branch : product-engine
2010-05-27automated mergeRoxie Linden
2010-05-25EXT-7323 FIXED Moved to strings.xml unexpected server side problem message.Alexei Arabadji
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/431/ --HG-- branch : product-engine
2010-05-20EXT-7051 additional fix - add more hardcoded words to translated dictionaryYuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/414/ --HG-- branch : product-engine
2010-05-17EXT-7051 FIX Add more server hardcoded strings to localization dict.Yuri Chebotarev
--HG-- branch : product-engine
2010-05-14EXT-7221 FIXED Now the 'Get More >>' link exists exactly before the 'View ↵Andrew Polunin
All >>' link in the Gestures list - Added new setting GesturesMarketplaceURL in settings.xml to represent URL which points to the Gesture's Marketplace. - Added mGetMoreItemIndex instance variable (similar to mViewAllItemIndex which was already there). - Added mGetMoreItemIndex handling in the LLGestureComboList::onCommitGesture() (again, similar to mViewAllItemIndex). - Added new string in strings.xml with name GetMoreGestures to represent Gesture's list item. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/386/ --HG-- branch : product-engine
2010-05-04Automated mergeRoxie Linden
2010-04-30mergeMike Antipov
--HG-- branch : product-engine
2010-04-30WIP: normal bug EXT-6865 (Voice isn't blocked for Avaline callers connected ↵Mike Antipov
via PSTN bridge) Applyied Aimee's patch to enable blocking of avaline caller: added an "External" mute type which isn't sent to the SL servers or stored in the cache across sessions. The caller's ID will change each time so there's no point cluttering up the mute list by persisting them. Known issue: Right now the mute is added with the caller's phone number as the name shown in the block list, so that will need changing to "Avaline Caller 1" etc --HG-- branch : product-engine
2010-04-29Fixed EXT-7163(normal) - Create dummy inventory item panel (an item panel ↵Dmitry Zaporozhan
for unworn wearable types) Added new wearable list item - LLPanelDummyClothingListItem for not worn wearable types, it displays grayed wearable type icon, grayed title '<clothing type> not worn' and 'add' button. Modified base class to be more flexible. Moved init() to protected section. Modified COF panel to use dummy item. Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/335/ --HG-- branch : product-engine
2010-04-28Fixed low bug EXT-6776 ([FRAGMENTATION] Call strings need change).Andrew Dyukov
- Removed string fragmentation by changing concatenation of name and action to whole-sentence strings. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/328 --HG-- branch : product-engine
2010-04-28Fixed critical bug EXT-4837 ( [NUX] When filter results in null state, ↵Mike Antipov
provide a message suggesting the user try global search.) Implemented passing of entered filter substring without head spaces to search URI in help message for null filtered results. * Updated setting "no item message" to use search term from filter editor for avatar & group lists and for inventory panels. * Updated appropriate translatable strings to get [SEARCH_TERM] substitution. * Updated processing of filter substring to pass original string to methods applied new filter. Additional necessary changes * Changed place to set "no item message" for group list from refresh to where filter is updated (like in avatar lists) * Removed converting of filter substring to upper case in Places & My Appearance sidepanels (this conversion has already been implemented in where filter is applied) * Added a separate message for Landmarks to set search URI to secondlife:///app/search/places for Lanmarks panel; other inventory related panels have URL to all searched categories (secondlife:///app/search/all) Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/326/ --HG-- branch : product-engine
2010-04-27Fixed normal bug EXT-6882 ([EN FORMATTING] Comprar terreno (Buying Land) ↵Paul Guslisty
window. Blank space needed between \"...de terreno.\" and \"Este terreno...\") - added space in the strings.xml for translation, so that languages that need the space (English, Spanish, French, etc.) can have it, and languages that don't (Japanese, Chinese etc) can remove it Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/314/ --HG-- branch : product-engine
2010-04-23automated mergeRoxie Linden
2010-04-23Fixed normal bug EXT-6651 ([HARDCODE] System message in Nearby Chat window ↵Paul Guslisty
appears in EN) - Added instead of hardcoded string two strings to the strings.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/294/ --HG-- branch : product-engine
2010-04-22Fixed EXT-6597(normal) - Clicking the maturity rating icons in the navbar ↵Dmitry Zaporozhan
need tooltips and clicking should link to a help article. Added LLButton::setImagePressed(), there was no way to set pressed image at run-time. The only place where pressed image is initialized was LLButton constructor. Replaced Maturity icon with button to simplify handling clicks. Icon does not provide click callback and we would need to handle mouse up/down events and track clicked widget. Added icon for Moderate regions. Did not find maturity help topic, added a "TODO". Reviewed by Sergey Litovchuk - https://codereview.productengine.com/secondlife/r/243/ --HG-- branch : product-engine
2010-04-21Automated mergeRoxie Linden
2010-04-21Automated mergeRoxie Linden
2010-04-21Fixed critical bug EXT-4837 ([NUX] When filter results in null state, ↵Mike Antipov
provide a message suggesting the user try global search.) implementation for: * Places->My Landmarks * My Inventory->My Inventory * My Inventory->Recent * My Appearance->Wearing * My Appearance->My Outfits updated common text and search url (secondlife:///app/search/all because concrete category without <search_term> is not supported). * People/Friends (Common avatar list support can not be used due to accordions) * added two strings with help messages into panel_people.xml (one for case when an avatar has no any friends - moved from textbox, another to be shown when there are no friends matching filter) * moved logic to show help text into separate method * and updated to be used in both cases: friend list is changed, filter is changed. --HG-- branch : product-engine
2010-04-20Fixed bug EXT-6881 ([FORMATTING] Acerca del terreno (About Land) window > ↵Vadim Savchuk
Contrato tab. Space in blank needed). Added a space after the colon, so the translatable string is now "Last Modified: ". Reviewed by Mike: https://codereview.productengine.com/secondlife/r/272/ --HG-- branch : product-engine
2010-04-20no ticket/review fix typoYuri Chebotarev
--HG-- branch : product-engine
2010-04-20fix after wrong merge for EXT-4082 - long stringYuri Chebotarev
--HG-- branch : product-engine
2010-04-20Fixed EXT-6542(normal) - [HARD CODED] - Land-Info, Medien: none/none needs ↵Dmitry Zaporozhan
to be localized Added "DefaultMimeType" string to strings.xml to make "none/none" mime type localizable. Replaced all occurrences of "none/none" string with call to static method. Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/265/ --HG-- branch : product-engine
2010-04-19Fixed bug EXT-6842 ([I18N] Date format in Profile - mm/dd/yyyy needs to be: ↵Vadim Savchuk
yyyy/mm/dd for Japanese). - Made avatar registration date localizeable. - Specified localization templates for English, Japanese and German. Reviewed by Mike: https://jira.secondlife.com/browse/EXT-6842 --HG-- branch : product-engine
2010-04-19automated merge with trunkRoxie Linden
2010-04-14Fixed normal bug EXT-4301 (PDD: Dial-in to a PSTN bridge shows "(???) ↵Mike Antipov
(???)" for the name.) * Implementation notes: ** special item is cloned from VCP to be used in LLAvatarList to reflect an Avaline caller. ** LLAvatarList extended to create instances of Avaline Caller ** Participant list now determines type of adding session participant (Avatar/Avaline Caller) and selects a way item will be created in avatar list * Implementation behavior: ** The problem is when Avaline caller ends a call it is removed from Voice Client session but still exists in LLSpeakerMgr. Server does not send such information. HUCK was implemented to notify subscribers that Avaline callers are not anymore in the voice call. ** For now Avaline Caller is removed from the LLSpeakerMgr List when it is removed from the Voice Client session. This happens in two cases: if Avaline Caller ends call itself or if Resident ends group call. ** If Resident joins group call where Avaline caller already exists that caller will appear in Resident's viewer (VCP & Group IM window) ** The callers are displayed as "AvaLine Caller 1", "AvaLine Caller 2" etc. * Known issues: ** LLNonAvatarCaller should be removed from VCP (for avaline p2p calls). Updated Avatar & Participant Lists can be used instead of it. Separate ticket will be opened to refactor this code. --HG-- branch : product-engine
2010-04-09Fixed normal bug EXT-6319 (Rejected voice call says "user Joined the voice ↵Andrew Dyukov
call"). - Removed names from strings containing info about other user joining or ending the call to make them more general. See comment to JIRA ticket for more info. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/210/ --HG-- branch : product-engine
2010-04-08Fixed normal bug EXT-6751 (Wrong "You paid" text in notification when ↵Andrew Dyukov
creating a classified). - Bug was caused by absence of localizable string for "You paid..." notifications without name and reason simultaneously. Added such string("you_paid_ldollars_no_info") to strings.xml and used it in code. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/206/ --HG-- branch : product-engine
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-03-29Automated mergeRoxie Linden
2010-03-23EXT-5982 correcting meaning errorEli Linden
2010-03-24Manual merge from default branch.Vadim Savchuk
Resolved conflicts in llpanellandmarks.cpp. --HG-- branch : product-engine
2010-03-23Fixed low bug EXT-4081 (Lag Meter: Ctrl+W does not close floater)Paul Guslisty
- Set 'Close' text of tooltip instead of 'Close (Ctrl+W)' for close button of chrome floaters Reviewed by Mike Antipov --HG-- branch : product-engine
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-22Merge headsMike Antipov
--HG-- branch : product-engine
2010-03-18(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)Sergei Litovchuk
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/ --HG-- branch : product-engine
2010-03-18working on EXT-5839 Creating a new wearable ...Yuri Chebotarev
some strings for localization --HG-- branch : product-engine
2010-03-18Low task (EXT-6261) [HARD CODED] Abuse Report: After sending an abuse ↵Sergei Litovchuk
report, there is a popup window stating that the report is sent/uploaded. The window isn´t localized. - Removed hardcoded string. Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/23/ --HG-- branch : product-engine
2010-03-18Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-18Related to EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message needs ↵Andrew Dyukov
translation)- removed unnecessary symbol in xml which was occasionally introduceded in 10453:cbac8ca300e0. --HG-- branch : product-engine
2010-03-18Partial fix for EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message ↵Andrew Dyukov
needs translation) - only changes to strings.xml are commited to make sure they make their way to localization. Code changes are to follow. Discussed at https://codereview.productengine.com/secondlife/r/55/ --HG-- branch : product-engine
2010-03-17PE mergeTofu Linden
2010-03-17PE merge.Tofu Linden
2010-03-17EXT-6335: Add custom labels for specific agent SLapp commands.Lynx Linden
We now display custom labels and tooltips for the various secondlife:///app/agent SLapp suffixes that we support. These include: /mute, /unmute, /pay, /im, /offerteleport, and /requestfriend. For example, entering: secondlife:///app/agent/3e2d81e8-6269-8100-860e-c64e5cee3c2c/mute Now displays the SLapp in text chat as "Mute <Name>", rather than simply "<Name>".
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 22:51:37 +0000