summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/ja/floater_joystick.xml
AgeCommit message (Collapse)Author
2010-05-24ND-46735 WIP IT JA linguisticEli Linden
2010-02-08DEV-43688 Cycle3 Tim's resizing of JA GUIEli Linden
2010-01-20Convert all XML files to Unix line endingsBryan O'Sullivan
2010-01-13DEV-43688 commit new translations - DE, FR, JA cycle2Ramzi Linden
This adds new, raw translations to the viewer; they will not yet be formatted to fit cleanly to the user.
2009-09-15Merging revisions 132612-133369 of ↵Ramzi Ramey
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 DEV-38453 Conversion to 2.0: Modernize and rearrange the nodes of the localized XUI; NO CHANGES TO ENGLISH. - match the new structures/widget language of the post-skinning work - restore some strings.xml entries from the former ui_strings.xml file - copy the Low/Mid/High translations into strings.xml - strip out all superfluous length= and type= parameters; these default to the EN value anyway I intentionally did not yet rearrange menu_viewer.xml, since it is still in flux in English
2009-05-11Switch the XML file line endings to native.Bryan O'Sullivan
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
merge Branch_1-20-14-Viewer-merge -> release Includes Branch_1-20-Viewer-2 through 92456