summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-08-12 17:29:50 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-08-12 17:29:50 +0000
commit80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch)
tree9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/skins
parenta09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff)
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/ja/floater_joystick.xml14
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index b71cffac63..0f1541a385 100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Joystick" title="ジョイスティックの設定">
<check_box name="enable_joystick" width="120" >
ジョイスティックを使う:
@@ -112,9 +112,15 @@
<text left="0" name="ZoomDeadZone" width="140">
ズーム・デッド・ゾーン
</text>
- <spinner left="275" name="FlycamAxisDeadZone6" width="50" />
- <button label="SpaceNavigatorのデフォルト設定" left="330"
- name="SpaceNavigatorDefaults" width="210" />
+ <spinner left="275" width="50" name="FlycamAxisDeadZone6" />
+ <button label="SpaceNavigatorのデフォルト設定" name="SpaceNavigatorDefaults" width="210" left="330"/>
+
+ <string name="JoystickMonitor">
+ ジョイスティック・モニター
+ </string>
+ <string name="Axis">
+ 軸 [NUM]
+ </string>
<string name="NoDevice">
デバイスは検出されませんでした
</string>