From d836ea78f17afa81e8c7e0e5993968cb97931446 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Mon, 3 Sep 2012 22:22:09 +0100
Subject: [PATCH] Menu bar changes to expose Joystick Configuration dialog, and
 minor typo in button config fix.

---
 gui/dialogs/button-config.xml | 2 +-
 gui/menubar.xml               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gui/dialogs/button-config.xml b/gui/dialogs/button-config.xml
index 81d6fb19f..cdd8a2021 100644
--- a/gui/dialogs/button-config.xml
+++ b/gui/dialogs/button-config.xml
@@ -56,7 +56,7 @@ var assignButton = func(cmd) {
 	
 	<text>
 	  <halign>left</halign>
-	  <label>Select the command you wish to assign to this button</label>
+	  <label>Select the command you wish to assign to this button.</label>
   </text>
   
   <hrule/>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 912669d71..2d074f404 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -737,10 +737,10 @@
 		</item>
 
 		<item>
-			<name>joystick-info</name>
+			<name>joystick-config</name>
 			<binding>
 				<command>dialog-show</command>
-				<dialog-name>joystick-info</dialog-name>
+				<dialog-name>joystick-config</dialog-name>
 			</binding>
 		</item>