diff --git a/Translations/en/menu.xml b/Translations/en/menu.xml index 604330f5b..f8491ff61 100644 --- a/Translations/en/menu.xml +++ b/Translations/en/menu.xml @@ -12,7 +12,8 @@ <snap-shot>Screenshot </snap-shot> <snap-shot-dir>Screenshot Directory</snap-shot-dir> <sound-config>Sound Configuration</sound-config> - <input-config>Input Configuration</input-config> + <input-config>Mouse Configuration</input-config> + <joystick-config>Joystick Configuration</joystick-config> <terrasync>Scenery Download</terrasync> <aircraft-center>Aircraft Center (Experimental)</aircraft-center> <exit>Quit</exit> @@ -114,7 +115,7 @@ <rendering-buffers>Hide/Show Rendering Buffers</rendering-buffers> <rembrandt-buffers-choice>Select Rendering Buffers</rembrandt-buffers-choice> <interface-config>User-interface options</interface-config> - + <!-- Help menu --> <help>Help</help> <help-browser>Help (opens in browser)</help-browser> @@ -123,7 +124,6 @@ <aircraft-checklists>Aircraft Checklists</aircraft-checklists> <common-keys>Common Aircraft Keys</common-keys> <basic-keys>Basic Simulator Keys</basic-keys> - <joystick-config>Joystick Configuration</joystick-config> <joystick-info>Joystick Information</joystick-info> <tutorial-start>Tutorials</tutorial-start> <menu-about>About</menu-about> diff --git a/gui/menubar.xml b/gui/menubar.xml index e0a1bf5ff..6639704be 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -66,7 +66,15 @@ <dialog-name>input-config</dialog-name> </binding> </item> - + + <item> + <name>joystick-config</name> + <binding> + <command>dialog-show</command> + <dialog-name>joystick-config</dialog-name> + </binding> + </item> + <item> <name>terrasync</name> <binding> @@ -293,7 +301,7 @@ <menu> <name>environment</name> - + <item> <name>global-weather</name> <binding> @@ -797,7 +805,7 @@ <script>gui.showHelpDialog("/sim/help")</script> </binding> </item> - + <item> <name>aircraft-checklists</name> <binding> @@ -822,14 +830,6 @@ </binding> </item> - <item> - <name>joystick-config</name> - <binding> - <command>dialog-show</command> - <dialog-name>joystick-config</dialog-name> - </binding> - </item> - <item> <label>------------------</label> <enabled>false</enabled>