diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-02-24 20:12:41 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-02-24 20:12:41 +0000 |
| commit | 33250359f3e5d24ba22c4df95a496a692d9ae7b2 (patch) | |
| tree | 28668efa6581f53ad86d2f3c61ab09b6a3a6873d /indra/newview/skins/default/xui/ja/floater_bumps.xml | |
| parent | aa2b978bf59dd74083bec86c61a29fefb4ebb14c (diff) | |
QAR-1262 Merging non-voice related Viewer 1.22 RC 9 changes back to trunk.
svn merge -r109446-109676 -r109832-109921 -r109956 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.22
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_bumps.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_bumps.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml index 89748b4578..cbd6a2f9e2 100644 --- a/indra/newview/skins/default/xui/ja/floater_bumps.xml +++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="floater_bumps" title="ぶつかる、押す、および当たる"> +<floater name="floater_bumps" title="衝突の記録"> <text name="none_detected"> 検出なし </text> |