reviewed by: Darin Adler <darin@eazel.com>

	Fixed bug 7303 (some menu items use duplicate, thus
	non-working, underline accelerators)

	* src/file-manager/nautilus-directory-view-ui.xml:
	New _Folder -> _New Folder to avoid conflict with _Find.
	_Open in New Window -> Open _in New Window to avoid conflict
	with _Open.
	Open With -> Open Wit_h
	_Select All Files -> Select _All Files to avoid conflict with
	_Stretch Icon

	* src/nautilus-shell-ui.xml:
	_New Window -> New _Window to avoid conflict with _New Folder.
	_Web Search -> We_b Search to avoid conflict with New _Window.
	_Select All -> Select _All to avoid conflict with _Stretch Icon
	Hide Sidebar -> Hide _Sidebar
	Hide Toolbar -> Hide _Toolbar
	Hide Location Bar -> Hide Location _Bar
	Hide Status Bar -> Hide St_atus Bar

	* src/file-manager/fm-directory-view.c: (real_update_menus):
	Open in <n> _New Window(s) -> Open _in <n> New Windows to match xml.

	* src/nautilus-window-menus.c:
	(nautilus_window_update_show_hide_menu_items):
	Add Show/Hide xxx accelerators to match xml.

6 files changed, 60 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index f793e14fd..2a468495a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2001-03-05  John Sullivan  <sullivan@eazel.com>
+
+	reviewed by: Darin Adler <darin@eazel.com>
+
+	Fixed bug 7303 (some menu items use duplicate, thus
+	non-working, underline accelerators)
+
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	New _Folder -> _New Folder to avoid conflict with _Find.
+	_Open in New Window -> Open _in New Window to avoid conflict
+	with _Open.
+	Open With -> Open Wit_h
+	_Select All Files -> Select _All Files to avoid conflict with
+	_Stretch Icon
+	
+	* src/nautilus-shell-ui.xml:
+	_New Window -> New _Window to avoid conflict with _New Folder.
+	_Web Search -> We_b Search to avoid conflict with New _Window.
+	_Select All -> Select _All to avoid conflict with _Stretch Icon
+	Hide Sidebar -> Hide _Sidebar
+	Hide Toolbar -> Hide _Toolbar
+	Hide Location Bar -> Hide Location _Bar
+	Hide Status Bar -> Hide St_atus Bar
+
+	* src/file-manager/fm-directory-view.c: (real_update_menus):
+	Open in <n> _New Window(s) -> Open _in <n> New Windows to match xml.
+	
+	* src/nautilus-window-menus.c:
+	(nautilus_window_update_show_hide_menu_items):
+	Add Show/Hide xxx accelerators to match xml.
+
 2001-03-05  Ramiro Estrugo  <ramiro@eazel.com>
 
 	reviewed by: Maciej Stachowiak  <mjs@eazel.com>
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 27711c305..64f0aa1f4 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -3189,9 +3189,9 @@ real_update_menus (FMDirectoryView *view)
 				       selection_count == 1);
 	
 	if (selection_count <= 1) {
-		label_with_underscore = g_strdup (_("Open in _New Window"));
+		label_with_underscore = g_strdup (_("Open _in New Window"));
 	} else {
-		label_with_underscore = g_strdup_printf (_("Open in %d _New Windows"), selection_count);
+		label_with_underscore = g_strdup_printf (_("Open _in %d New Windows"), selection_count);
 	}
 	nautilus_bonobo_set_label_for_menu_item_and_command 
 		(view->details->ui,
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index ae9bc4ea0..a1e16fb74 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -48,7 +48,7 @@
 
 		<placeholder name="New Items Placeholder">
 			<menuitem name="New Folder"
-				  _label="New _Folder"
+				  _label="_New Folder"
 			  	  accel="*Control*n"
 				  verb="New Folder"/>
 		</placeholder>
@@ -58,10 +58,10 @@
 				  accel="*Control*o"
 				  verb="Open"/>
 			<menuitem name="OpenNew"
-				  _label="_Open in New Window"
+				  _label="Open _in New Window"
 				  verb="OpenNew"/>
 			<submenu name="Open With" 
-				 _label="Open With" 
+				 _label="Open Wit_h" 
 				 _tip="Choose a program with which to open the selected item">
 				<placeholder name="Applications Placeholder" delimit="none"/>
 				<menuitem name="OtherApplication"
@@ -106,7 +106,7 @@
 
 	<submenu name="Edit">
 		<menuitem name="Select All"
-			  _label="_Select All Files" 
+			  _label="Select _All Files" 
 			  accel="*Control*a"
 			  verb="Select All"/>
 		
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 6f205bb0e..cbb5db874 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -421,26 +421,26 @@ nautilus_window_update_show_hide_menu_items (NautilusWindow *window)
 	nautilus_bonobo_set_label (window->details->shell_ui,
 				   MENU_PATH_SHOW_HIDE_STATUS_BAR,
 				   nautilus_window_status_bar_showing (window)
-				   ? _("Hide Status Bar")
-				   : _("Show Status Bar"));
+				   ? _("Hide St_atus Bar")
+				   : _("Show St_atus Bar"));
 		
 	nautilus_bonobo_set_label (window->details->shell_ui,
 				   MENU_PATH_SHOW_HIDE_SIDEBAR,
 				   nautilus_window_sidebar_showing (window)
-				   ? _("Hide Sidebar")
-				   : _("Show Sidebar"));
+				   ? _("Hide _Sidebar")
+				   : _("Show _Sidebar"));
 
 	nautilus_bonobo_set_label (window->details->shell_ui,
 				   MENU_PATH_SHOW_HIDE_TOOLBAR,
 				   nautilus_window_toolbar_showing (window)
-				   ? _("Hide Toolbar")
-				   : _("Show Toolbar"));
+				   ? _("Hide _Toolbar")
+				   : _("Show _Toolbar"));
 		
 	nautilus_bonobo_set_label (window->details->shell_ui,
 				   MENU_PATH_SHOW_HIDE_LOCATION_BAR,
 				   nautilus_window_location_bar_showing (window)
-				   ? _("Hide Location Bar")
-				   : _("Show Location Bar"));
+				   ? _("Hide Location _Bar")
+				   : _("Show Location _Bar"));
 	bonobo_ui_component_thaw (window->details->shell_ui, NULL);
 
 	nautilus_window_ui_thaw (window);
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 4f1db0745..27e36529f 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -39,7 +39,7 @@
 
 		<placeholder name="New Items Placeholder" delimit="none">
 			<menuitem name="New Window"
-				  _label="_New Window"
+				  _label="New _Window"
 				  verb="New Window"/>
 		</placeholder>
 		<placeholder name="Open Placeholder" delimit="top"/>
@@ -67,7 +67,7 @@
 			  accel="*Control*f"
 			  verb="Toggle Find Mode"/>
 		<menuitem name="Go to Web Search"
-			  _label="_Web Search"
+			  _label="We_b Search"
 			  _tip="Search the World Wide Web"
 			  accel="*Control**Shift*f"
 			  verb="Go to Web Search"/>
@@ -115,7 +115,7 @@
 		<separator/>
 
 		<menuitem name="Select All"
-			  _label="_Select All" 
+			  _label="Select _All" 
 			  verb="Select All"/>
 		
 		<separator/>
@@ -143,19 +143,19 @@
 
 		<placeholder name="Show Hide Placeholder" delimit="top">
 			<menuitem name="Show Hide Sidebar" 
-				  _label="Hide Sidebar"
+				  _label="Hide _Sidebar"
 				  _tip="Change the visibility of this window's sidebar"
 				  verb="Show Hide Sidebar"/>
 			<menuitem name="Show Hide Toolbar" 
-				  _label="Hide Toolbar"
+				  _label="Hide _Toolbar"
 				  _tip="Change the visibility of this window's toolbar"
 				  verb="Show Hide Toolbar"/>
 			<menuitem name="Show Hide Location Bar" 
-				  _label="Hide Location Bar"
+				  _label="Hide Location _Bar"
 				  _tip="Change the visibility of this window's location bar"
 				  verb="Show Hide Location Bar"/>
 			<menuitem name="Show Hide Status Bar" 
-				  _label="Hide Status Bar"
+				  _label="Hide St_atus Bar"
 				  _tip="Change the visibility of this window's status bar"
 				  verb="Show Hide Status Bar"/>
 		</placeholder>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 6f205bb0e..cbb5db874 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -421,26 +421,26 @@ nautilus_window_update_show_hide_menu_items (NautilusWindow *window)
 	nautilus_bonobo_set_label (window->details->shell_ui,
 				   MENU_PATH_SHOW_HIDE_STATUS_BAR,
 				   nautilus_window_status_bar_showing (window)
-				   ? _("Hide Status Bar")
-				   : _("Show Status Bar"));
+				   ? _("Hide St_atus Bar")
+				   : _("Show St_atus Bar"));
 		
 	nautilus_bonobo_set_label (window->details->shell_ui,
 				   MENU_PATH_SHOW_HIDE_SIDEBAR,
 				   nautilus_window_sidebar_showing (window)
-				   ? _("Hide Sidebar")
-				   : _("Show Sidebar"));
+				   ? _("Hide _Sidebar")
+				   : _("Show _Sidebar"));
 
 	nautilus_bonobo_set_label (window->details->shell_ui,
 				   MENU_PATH_SHOW_HIDE_TOOLBAR,
 				   nautilus_window_toolbar_showing (window)
-				   ? _("Hide Toolbar")
-				   : _("Show Toolbar"));
+				   ? _("Hide _Toolbar")
+				   : _("Show _Toolbar"));
 		
 	nautilus_bonobo_set_label (window->details->shell_ui,
 				   MENU_PATH_SHOW_HIDE_LOCATION_BAR,
 				   nautilus_window_location_bar_showing (window)
-				   ? _("Hide Location Bar")
-				   : _("Show Location Bar"));
+				   ? _("Hide Location _Bar")
+				   : _("Show Location _Bar"));
 	bonobo_ui_component_thaw (window->details->shell_ui, NULL);
 
 	nautilus_window_ui_thaw (window);