summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/ja/floater_snapshot.xml
AgeCommit message (Collapse)Author
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-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
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-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk (for real)
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
merge viewer_1-21 96116-97380 -> release
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
merge viewer_1-21 94770-96059 -> release
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 19:16:28 +0000