diff options
author | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
---|---|---|
committer | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
commit | 8ed056fde9fe5fc9755158013a5cb8be73066e2c (patch) | |
tree | d7f5f6de35c99ca645e48dc8817d908cc6d2f348 /indra/newview/skins/default/xui/it/floater_joystick.xml | |
parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) |
svn merge -r124872:124873
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a
QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
Diffstat (limited to 'indra/newview/skins/default/xui/it/floater_joystick.xml')
-rw-r--r-- | indra/newview/skins/default/xui/it/floater_joystick.xml | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml index dcd637f199..ced227a845 100644 --- a/indra/newview/skins/default/xui/it/floater_joystick.xml +++ b/indra/newview/skins/default/xui/it/floater_joystick.xml @@ -3,23 +3,24 @@ <check_box name="enable_joystick"> Abilita Joystick: </check_box> - <spinner label="Mapping asse X" name="JoystickAxis1"/> - <spinner label="Mapping asse Y" name="JoystickAxis2"/> - <spinner label="Mapping asse Z" name="JoystickAxis0"/> - <spinner label="Mapping della direzione o Pitch" name="JoystickAxis4"/> - <spinner label="Mapping dell'altitudine o Yaw" name="JoystickAxis5"/> - <spinner label="Mapping del Roll" name="JoystickAxis3"/> - <spinner label="Mapping dello Zoom" name="JoystickAxis6"/> - <check_box label="Zoom diretto" name="ZoomDirect"/> + <text left="120" name="joystick_type" width="380"/> + <spinner label="Mapping: asse X" name="JoystickAxis1" label_width="140" width="180" left="12"/> + <spinner label="Mapping: asse Y" name="JoystickAxis2" label_width="134" width="174" left="205"/> + <spinner label="Mapping: asse Z" name="JoystickAxis0" label_width="94" width="134" left="390"/> + <spinner label="Mapping: direzione o Pitch" name="JoystickAxis4" label_width="140" width="180" left="12"/> + <spinner label="Mapping: altitudine o Yaw" name="JoystickAxis5" label_width="134" width="174" left="205"/> + <spinner label="Mapping del Roll" name="JoystickAxis3" label_width="94" width="134" left="390"/> + <spinner label="Mapping dello Zoom" name="JoystickAxis6" label_width="140" width="180" left="12"/> + <check_box label="Zoom diretto" name="ZoomDirect" left="205"/> <check_box label="Cursore 3D" name="Cursor3D"/> <check_box label="Auto livellamento" name="AutoLeveling"/> - <text name="Control Modes:"> + <text name="Control Modes:" left="3" width="113"> Modalità di controllo: </text> <check_box name="JoystickAvatarEnabled"> Avatar </check_box> - <check_box name="JoystickBuildEnabled"> + <check_box name="JoystickBuildEnabled" left="192"> Costruire </check_box> <check_box name="JoystickFlycamEnabled"> @@ -34,14 +35,14 @@ <text name="ZScale"> Regolazione Z </text> - <text name="PitchScale"> - Regolazione della direzione o Pitch + <text name="PitchScale" left="3" width="112"> + Regolazione: Pitch </text> - <text name="YawScale"> - Regolazione dell'altitudine o Yaw + <text name="YawScale" left="3" width="112"> + Regolazione: Yaw </text> - <text name="RollScale"> - Regolazione del Roll + <text name="RollScale" left="3" width="112"> + Regolazione: Roll </text> <text name="XDeadZone"> Angolo morto X @@ -52,22 +53,22 @@ <text name="ZDeadZone"> Angolo morto Z </text> - <text name="PitchDeadZone"> - Angolo morto della direzione o Pitch + <text name="PitchDeadZone" left="3" width="112"> + Angolo morto: Pitch </text> - <text name="YawDeadZone"> - Angolo morto dell'altitudine o Yaw + <text name="YawDeadZone" left="3" width="112"> + Angolo morto: Yaw </text> - <text name="RollDeadZone"> - Angolo morto del Roll + <text name="RollDeadZone" left="3" width="112"> + Angolo morto: Roll </text> <text name="Feathering"> Smussamento </text> - <text name="ZoomScale2"> + <text name="ZoomScale2" width="135" left="6"> Regolazione dello zoom </text> - <text name="ZoomDeadZone"> + <text name="ZoomDeadZone" width="135" left="6"> Angolo morto dello zoom </text> <button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/> |