Use nautilus_bonobo_set_label instead of

2002-07-02  Dave Camp  <dave@ximian.com>

	* src/file-manager/fm-icon-view.c: (fm_icon_view_update_menus):
	* src/file-manager/fm-directory-view.c:
	(reset_bonobo_open_with_menu), (real_update_menus): Use
	nautilus_bonobo_set_label instead of
	nautilus_bonobo_set_label_for_menu_item_and_command, since popups
	should now have mnemonics.
	* src/file-manager/nautilus-desktop-icon-view-ui.xml:
	* src/file-manager/nautilus-directory-view-ui.xml:
	* src/file-manager/nautilus-icon-view-ui.xml:
	* src/nautilus-shell-ui.xml: Added mnemonics to items on the popup
	menus, changed some mnemonics to prevent duplicates (including a
	patch from David Bordoley <bordoley@msu.edu>
	* libnautilus-private/nautilus-bonobo-extensions.c:
	(nautilus_bonobo_set_label_for_toolitem_and_command): Moved here
	from nautilus_bonobo_set_label_for_menu_item_and_command, since
	popups should display mnemonics.  This function isn't used
	anymore, but I'm leaving it in because it is still useful if we
	ever want to change the label of a verb with a toolbar button
	associated with it.

9 files changed, 109 insertions, 131 deletions

diff --git a/ChangeLog b/ChangeLog
index d403d2123..21878f22b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2002-07-02  Dave Camp  <dave@ximian.com>
 
+	* src/file-manager/fm-icon-view.c: (fm_icon_view_update_menus):
+	* src/file-manager/fm-directory-view.c:
+	(reset_bonobo_open_with_menu), (real_update_menus): Use
+	nautilus_bonobo_set_label instead of
+	nautilus_bonobo_set_label_for_menu_item_and_command, since popups
+	should now have mnemonics.
+	* src/file-manager/nautilus-desktop-icon-view-ui.xml:
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	* src/file-manager/nautilus-icon-view-ui.xml:
+	* src/nautilus-shell-ui.xml: Added mnemonics to items on the popup
+	menus, changed some mnemonics to prevent duplicates (including a
+	patch from David Bordoley <bordoley@msu.edu>
+	* libnautilus-private/nautilus-bonobo-extensions.c:
+	(nautilus_bonobo_set_label_for_toolitem_and_command): Moved here
+	from nautilus_bonobo_set_label_for_menu_item_and_command, since
+	popups should display mnemonics.  This function isn't used
+	anymore, but I'm leaving it in because it is still useful if we
+	ever want to change the label of a verb with a toolbar button
+	associated with it.
+
+2002-07-02  Dave Camp  <dave@ximian.com>
+
 	* src/nautilus-application.c (set_session_restart): Set the
 	restart style to RESTART_IF_RUNNING instead of RESTART_NEVER when
 	restart is FALSE.
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index d42dae99d..87c0fa49e 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -457,16 +457,16 @@ nautilus_bonobo_remove_menu_items_and_commands (BonoboUIComponent *ui,
 	g_free (remove_wildcard);
 }
 
-/* Call to set the user-visible label of a menu item to a string
+/* Call to set the user-visible label of a command to a string
  * containing an underscore accelerator. The underscore is stripped
- * off before setting the label of the command, because pop-up menu
- * and toolbar button labels shouldn't have the underscore.
+ * off before setting the label of the toolitem, because toolbar
+ * button labels shouldn't have the underscore.
  */
 void	 
-nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent *ui,
-						     const char	*menu_item_path,
-						     const char	*command_path,
-						     const char	*label_with_underscore)
+nautilus_bonobo_set_label_for_toolitem_and_command (BonoboUIComponent *ui,
+						    const char	*toolitem_path,
+						    const char	*command_path,
+						    const char	*label_with_underscore)
 {
 	char *label_no_underscore;
 
@@ -477,10 +477,10 @@ nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent *ui,
 
 	label_no_underscore = eel_str_strip_chr (label_with_underscore, '_');
 	nautilus_bonobo_set_label (ui,
-				   menu_item_path,
+				   command_path,
 				   label_with_underscore);
 	nautilus_bonobo_set_label (ui,
-				   command_path,
+				   toolitem_path,
 				   label_no_underscore);
 	
 	g_free (label_no_underscore);
diff --git a/libnautilus-private/nautilus-bonobo-extensions.h b/libnautilus-private/nautilus-bonobo-extensions.h
index 226bf9e9e..bfc301a76 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.h
+++ b/libnautilus-private/nautilus-bonobo-extensions.h
@@ -91,8 +91,8 @@ void                            nautilus_bonobo_add_menu_separator
 										     const char                       *path);
 void                            nautilus_bonobo_remove_menu_items_and_commands      (BonoboUIComponent                *ui,
 										     const char                       *container_path);
-void                            nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent                *ui,
-										     const char                       *menu_item_path,
+void                            nautilus_bonobo_set_label_for_toolitem_and_command  (BonoboUIComponent                *ui,
+										     const char                       *toolitem_path,
 										     const char                       *command_path,
 										     const char                       *label_with_underscore);
 void                            nautilus_bonobo_set_icon                            (BonoboUIComponent                *ui,
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 445958ed1..77289fa4f 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -3538,15 +3538,13 @@ reset_bonobo_open_with_menu (FMDirectoryView *view, GList *selection)
 		}
 		gnome_vfs_mime_component_list_free (components); 
 
-		nautilus_bonobo_set_label_for_menu_item_and_command 
+		nautilus_bonobo_set_label 
 			(view->details->ui,
-			 FM_DIRECTORY_VIEW_MENU_PATH_OTHER_APPLICATION,
 			 FM_DIRECTORY_VIEW_COMMAND_OTHER_APPLICATION,
 			 any_applications ? _("Other _Application...") : _("An _Application..."));
 
-		nautilus_bonobo_set_label_for_menu_item_and_command 
+		nautilus_bonobo_set_label 
 			(view->details->ui,
-			 FM_DIRECTORY_VIEW_MENU_PATH_OTHER_VIEWER,
 			 FM_DIRECTORY_VIEW_COMMAND_OTHER_VIEWER,
 			 any_applications ? _("Other _Viewer...") : _("A _Viewer..."));
 
@@ -4369,9 +4367,9 @@ real_update_menus (FMDirectoryView *view)
 		nautilus_bonobo_set_sensitive (view->details->ui, 
 					       FM_DIRECTORY_VIEW_COMMAND_OPEN_ALTERNATE,
 					       selection_count == 1);
-		nautilus_bonobo_set_label_for_menu_item_and_command 
+
+		nautilus_bonobo_set_label
 			(view->details->ui,
-			 FM_DIRECTORY_VIEW_MENU_PATH_OPEN_ALTERNATE,
 			 FM_DIRECTORY_VIEW_COMMAND_OPEN_ALTERNATE,
 			 _("Open _in This Window"));
 	} else {
@@ -4380,9 +4378,8 @@ real_update_menus (FMDirectoryView *view)
 		} else {
 			label_with_underscore = g_strdup_printf (_("Open _in %d New Windows"), selection_count);
 		}
-		nautilus_bonobo_set_label_for_menu_item_and_command 
+		nautilus_bonobo_set_label
 			(view->details->ui,
-			 FM_DIRECTORY_VIEW_MENU_PATH_OPEN_ALTERNATE,
 			 FM_DIRECTORY_VIEW_COMMAND_OPEN_ALTERNATE,
 			 label_with_underscore);
 		g_free (label_with_underscore);
@@ -4407,9 +4404,8 @@ real_update_menus (FMDirectoryView *view)
 		show_separate_delete_command = show_delete_command_auto_value;
 	}
 	
-	nautilus_bonobo_set_label_for_menu_item_and_command 
+	nautilus_bonobo_set_label
 		(view->details->ui,
-		 FM_DIRECTORY_VIEW_MENU_PATH_TRASH,
 		 FM_DIRECTORY_VIEW_COMMAND_TRASH,
 		 label);
 	nautilus_bonobo_set_accelerator (view->details->ui, 
@@ -4426,9 +4422,8 @@ real_update_menus (FMDirectoryView *view)
 				    FM_DIRECTORY_VIEW_COMMAND_DELETE,
 				    !show_separate_delete_command);
 	if (show_separate_delete_command) {
-		nautilus_bonobo_set_label_for_menu_item_and_command 
+		nautilus_bonobo_set_label
 			(view->details->ui,
-			 FM_DIRECTORY_VIEW_MENU_PATH_DELETE,
 			 FM_DIRECTORY_VIEW_COMMAND_DELETE,
 			 confirm_trash_auto_value ? _("De_lete...") : _("De_lete"));
 		nautilus_bonobo_set_sensitive (view->details->ui, 
@@ -4446,13 +4441,12 @@ real_update_menus (FMDirectoryView *view)
 				       background != NULL
 				       && nautilus_file_background_is_set (background));
 
-	nautilus_bonobo_set_label_for_menu_item_and_command 
+	nautilus_bonobo_set_label
 		(view->details->ui,
-		 FM_DIRECTORY_VIEW_MENU_PATH_CREATE_LINK,
 		 FM_DIRECTORY_VIEW_COMMAND_CREATE_LINK,
 		 selection_count > 1
-			? _("Make _Links")
-			: _("Make _Link"));
+			? _("_Make Links")
+			: _("_Make Link"));
 	nautilus_bonobo_set_sensitive (view->details->ui, 
 				       FM_DIRECTORY_VIEW_COMMAND_CREATE_LINK,
 				       can_link_files);
@@ -4462,9 +4456,8 @@ real_update_menus (FMDirectoryView *view)
 				       selection_count != 0
 			      		&& fm_directory_view_supports_properties (view));
 
-	nautilus_bonobo_set_label_for_menu_item_and_command 
+	nautilus_bonobo_set_label
 		(view->details->ui,
-		 FM_DIRECTORY_VIEW_MENU_PATH_EMPTY_TRASH,
 		 FM_DIRECTORY_VIEW_COMMAND_EMPTY_TRASH,
 		 confirm_trash_auto_value
 			? _("_Empty Trash...")
@@ -4474,9 +4467,8 @@ real_update_menus (FMDirectoryView *view)
 				       !nautilus_trash_monitor_is_empty ());
 
 
-	nautilus_bonobo_set_label_for_menu_item_and_command 
+	nautilus_bonobo_set_label
 		(view->details->ui,
-		 FM_DIRECTORY_VIEW_MENU_PATH_REMOVE_CUSTOM_ICONS,
 		 FM_DIRECTORY_VIEW_COMMAND_REMOVE_CUSTOM_ICONS,
 		 selection_count > 1
 			? _("R_emove Custom Icons")
@@ -4489,9 +4481,8 @@ real_update_menus (FMDirectoryView *view)
 				       NAUTILUS_COMMAND_SELECT_ALL,
 				       !fm_directory_view_is_empty (view));
 
-	nautilus_bonobo_set_label_for_menu_item_and_command 
+	nautilus_bonobo_set_label
 		(view->details->ui,
-		 FM_DIRECTORY_VIEW_MENU_PATH_CUT_FILES,
 		 FM_DIRECTORY_VIEW_COMMAND_CUT_FILES,
 		 selection_count == 1
 		 ? _("Cu_t File")
@@ -4500,9 +4491,8 @@ real_update_menus (FMDirectoryView *view)
 				       FM_DIRECTORY_VIEW_COMMAND_CUT_FILES,
 				       can_delete_files);
 
-	nautilus_bonobo_set_label_for_menu_item_and_command 
+	nautilus_bonobo_set_label
 		(view->details->ui,
-		 FM_DIRECTORY_VIEW_MENU_PATH_COPY_FILES,
 		 FM_DIRECTORY_VIEW_COMMAND_COPY_FILES,
 		 selection_count == 1
 		 ? _("_Copy File")
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 5a3b26030..a00761c30 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -1376,13 +1376,12 @@ fm_icon_view_update_menus (FMDirectoryView *view)
 				       && icon_container != NULL
 			    	       && !nautilus_icon_container_has_stretch_handles (icon_container));
 
-	nautilus_bonobo_set_label_for_menu_item_and_command 
+	nautilus_bonobo_set_label
 		(icon_view->details->ui,
-		 MENU_PATH_UNSTRETCH_ICONS,
 		 COMMAND_UNSTRETCH_ICONS,
 		 eel_g_list_more_than_one_item (selection)
-		 	? _("Restore Icons' _Original Sizes")
-		 	: _("Restore Icon's _Original Size"));
+		 	? _("Restore Icons' Original Si_zes")
+		 	: _("Restore Icon's Original Si_ze"));
 	nautilus_bonobo_set_sensitive (icon_view->details->ui, 
 				       COMMAND_UNSTRETCH_ICONS,
 				       icon_container != NULL
diff --git a/src/file-manager/nautilus-desktop-icon-view-ui.xml b/src/file-manager/nautilus-desktop-icon-view-ui.xml
index 72a53fc35..322036687 100644
--- a/src/file-manager/nautilus-desktop-icon-view-ui.xml
+++ b/src/file-manager/nautilus-desktop-icon-view-ui.xml
@@ -1,7 +1,7 @@
 <Root>
 <commands>
         <cmd name="Change Background"
-         _label="Change Desktop Background"
+         _label="Change Desktop _Background"
          _tip="Show a window that lets you set your desktop background's pattern or color"/>
         <cmd name="Close" sensitive="0"/>
         <cmd name="Add Bookmark" sensitive="0"/>
@@ -9,26 +9,26 @@
          _label="Empty Trash"
          _tip="Delete all items in the Trash"/>
 	<cmd name="Unmount Volume Conditional"
-         _label="Unmount Volume"
-         _tip="Unmount Volume Conditionally"/>
+         _label="_Unmount Volume"
+         _tip="Unmount the selected volume"/>
         <cmd name="Format Conditional"
-         _label="Format"
-         _tip="Format Conditionally"/>
+         _label="_Format"
+         _tip="Format the selected volume"/>
         <cmd name="Protect Conditional"
-         _label="Protect"
-         _tip="Protect Conditionally"/>
+         _label="Prot_ect"
+         _tip="Protect the selected volume"/>
         <cmd name="Media Properties Conditional"
-         _label="Media Properties"
-         _tip="Media Properties Conditionally"/>
+         _label="Medi_a Properties"
+         _tip="Show media properties for the selected volume"/>
         <cmd name="New Terminal"
-         _label="New Terminal"
+         _label="New T_erminal"
          _tip="Open a new GNOME terminal window"/>
         <cmd name="New Launcher Desktop"
-         _label="New Launcher"
+         _label="New L_auncher"
          _tip="Create a new launcher"/>
         <cmd name="OpenAlternate" hidden="1"/>
         <cmd name="Reset Background"
-         _label="Use Default Background"
+         _label="Use _Default Background"
          _tip="Use the default desktop background"/>
 </commands>
 <menu>
@@ -55,7 +55,7 @@
                         </placeholder>
                         <placeholder name="Volume Items" delimit="top">
                                 <submenu name="Disks" tearoff="0"
-                                         _label="Disks"
+                                         _label="Dis_ks"
                                          _tip="Mount or unmount disks"/>
                         </placeholder>
                 </placeholder>
@@ -72,10 +72,10 @@
                         <menuitem name="Empty Trash" verb="Empty Trash Conditional"/>
                 </placeholder>
                 <placeholder name="Removabel Media Holder" delimit="top">
-                        <menuitem name="Unmount Volume" _label="Unmount Volume" verb="Unmount Volume Conditional"/>
-                        <menuitem name="Protect Media" _label="Protect" verb="Protect Conditional"/>
-                        <menuitem name="Format Media" _label="Format" verb="Format Conditional"/>
-                        <menuitem name="Media Properties" _label="Media Properties" verb="Media Properties Conditional"/>
+                        <menuitem name="Unmount Volume" verb="Unmount Volume Conditional"/>
+                        <menuitem name="Protect Media" verb="Protect Conditional"/>
+                        <menuitem name="Format Media" verb="Format Conditional"/>
+                        <menuitem name="Media Properties" verb="Media Properties Conditional"/>
                 </placeholder>
         </popup>
 </popups>
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index 00cf88f4c..ae0a724c0 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -1,73 +1,73 @@
 <Root>
 <commands>
 	<cmd name="Rename"
-         _label="Rename"
+         _label="_Rename"
 	 _tip="Rename selected item"/>
 	<cmd name="Create Link"
-         _label="Make Link"
+         _label="_Make Link"
 	 _tip="Create a symbolic link for each selected item"/>
 	<cmd name="Delete"
-         _label="Delete"
+         _label="De_lete"
 	 _tip="Delete each selected item, without moving to the Trash"/>
 	<cmd name="Duplicate"
-         _label="Duplicate"
+         _label="_Duplicate"
 	 _tip="Duplicate each selected item"/>
 	<cmd name="Empty Trash"
-         _label="Empty Trash"
+         _label="_Empty Trash"
 	 _tip="Delete all items in the Trash"/>
 	<cmd name="New Folder"
-         _label="New Folder"
+         _label="_New Folder"
 	 _tip="Create a new empty folder inside this folder"/>
         <cmd name="New Launcher"
-         _label="New Launcher"
+         _label="New L_auncher"
          _tip="Create a new launcher"/>
         <cmd name="Edit Launcher"
          _label="Edit Launcher"
          _tip="Edit the launcher information"/>
 	<cmd name="Open"
-         _label="Open"
+         _label="_Open"
 	 _tip="Open the selected item in this window"/>
 	<cmd name="OpenAlternate"
-         _label="Open in New Window"
+         _label="Open _in New Window"
 	 _tip="Open each selected item in a new window"/>
 	<cmd name="Open Scripts Folder"
-         _label="Open Scripts Folder"
+         _label="_Open Scripts Folder"
 	 _tip="Show the folder containing the scripts that appear in this menu"/>
 	<cmd name="OtherApplication"
-         _label="Other Application..."
+         _label="Other _Application..."
 	 _tip="Choose another application with which to open the selected item"/>
 	<cmd name="OtherViewer"
-         _label="Other Viewer..."
+         _label="Other _Viewer..."
 	 _tip="Choose another viewer with which to view the selected item"/>
 	<cmd name="Remove Custom Icons"
-         _label="Remove Custom Icons"
+         _label="R_emove Custom Icons"
 	 _tip="Remove any custom images from selected icons"/>
 	<cmd name="Reset to Defaults"
-         _label="Reset View to Default"
+         _label="Reset View to _Defaults"
 	 _tip="Reset sorting order and zoom level to match preferences for this view"/>
 	<cmd name="Reset Background"
-         _label="Use Default Background"
+         _label="Use _Default Background"
 	 _tip="Use the default background for this location"/>
 	<cmd name="Cut Files"
-         _label="Cut Files"
+         _label="Cu_t Files"
 	 _tip="Prepare the selected files to be moved with a Paste Files command"/>
 	<cmd name="Copy Files"
-         _label="Copy Files"
+         _label="_Copy Files"
 	 _tip="Prepare the selected files to be copied with a Paste Files command"/>
 	<cmd name="Paste Files"
-         _label="Paste Files"
+         _label="_Paste Files"
 	 _tip="Move or copy files previously selected by a Cut Files or Copy Files command"/>
 	<cmd name="Select All"
-         _label="Select All Files"
+         _label="Select _All Files"
 	 _tip="Select all items in this window"/>
 	<cmd name="Properties"
-         _label="Properties"
+         _label="_Properties"
 	 _tip="View or modify the properties of each selected item"/>
 	<cmd name="Show Trash"
-         _label="Show Trash"
+         _label="_Show Trash"
 	 _tip="Show the contents of the Trash"/>
 	<cmd name="Trash"
-         _label="Move to Trash"
+         _label="Move to _Trash"
 	 _tip="Move each selected item to the Trash"/>
 </commands>
 <keybindings>
@@ -83,23 +83,19 @@
 
 		<placeholder name="New Items Placeholder">
 			<menuitem name="New Folder"
-				  _label="_New Folder"
 			  	  accel="*Shift**Control*n"
 				  pixtype="stock" pixname="gtk-new"
 				  verb="New Folder"/>
 			<menuitem name="New Launcher"
-				  _label="New La_uncher"
 				  pixtype="stock" pixname="gtk-new"
 				  verb="New Launcher"/>
 		</placeholder>
 		<placeholder name="Open Placeholder">
 			<menuitem name="Open"
-				  _label="_Open"
                                   accel="*Control*o"
 				  pixtype="stock" pixname="gtk-open"
 				  verb="Open"/>
 			<menuitem name="OpenAlternate"
-				  _label="Open _in New Window"
 				  accel="*Control**Shift*o"
 				  verb="OpenAlternate"/>
 			<submenu name="Open With" 
@@ -107,12 +103,10 @@
 				 _tip="Choose a program with which to open the selected item">
 				<placeholder name="Applications Placeholder" delimit="none"/>
 				<menuitem name="OtherApplication"
-					  _label="Other _Application..."
 					  verb="OtherApplication"/>
 				<separator/>
 				<placeholder name="Viewers Placeholder" delimit="none"/>
 				<menuitem name="OtherViewer"
-					  _label="Other _Viewer..."
 					  verb="OtherViewer"/>
 			</submenu>
 			<menuitem name="Edit Launcher"
@@ -123,67 +117,54 @@
 				 <placeholder name="Scripts Placeholder" delimit="none"/>
 				 <separator name="After Scripts"/>
 				 <menuitem name="Open Scripts Folder" 
-				 	   _label="_Open Scripts Folder"
 				 	   verb="Open Scripts Folder"/>
 			</submenu>
 		</placeholder>
 
 		<placeholder name="File Items Placeholder">
 			<menuitem name="Properties"
-				  _label="_Properties"
 				  accel="*Control*i"
 				  verb="Properties"/>
 			<menuitem name="Duplicate"
-				  _label="_Duplicate"
 				  verb="Duplicate"/>
 			<menuitem name="Create Link"
-				  _label="_Make Link"
 				  accel="*Control*m"
 				  verb="Create Link"/>
 			<menuitem name="Rename"
 				  accel="F2"
-				  _label="_Rename"
 				  verb="Rename"/>
 		</placeholder>
 		<placeholder name="Dangerous File Items Placeholder">
 			<menuitem name="Trash"
-				  _label="Move to _Trash"
 				  accel="*Control*t"
 				  pixtype="stock" pixname="gtk-delete"
 				  verb="Trash"/>
 			<menuitem name="Delete"
-				  _label="De_lete"
 				  verb="Delete"/>
 		</placeholder>
 
 		<placeholder name="Global File Items Placeholder">
 			<menuitem name="Show Trash"
-				  _label="_Show Trash"
 				  verb="Show Trash"/>
 			<menuitem name="Empty Trash"
-				  _label="_Empty Trash"
 				  verb="Empty Trash"/>
 		</placeholder>
 	</submenu>
 
 	<submenu name="Edit">
 		<menuitem name="Cut"
-			  _label="Cu_t Files"
 			  accel="*Control*x"
 			  pixtype="stock" pixname="gtk-cut"
 			  verb="Cut Files"/>
 		<menuitem name="Copy"
-			  _label="_Copy Files"
 			  accel="*Control*c"
 			  pixtype="stock" pixname="gtk-copy"
 			  verb="Copy Files"/>
 		<menuitem name="Paste"
-			  _label="_Paste Files"
 			  accel="*Control*v"
 			  pixtype="stock" pixname="gtk-paste"
 			  verb="Paste Files"/>
 		<menuitem name="Select All"
-			  _label="Select _All Files"
 			  accel="*Control*a"
 			  verb="Select All"/>
 		
@@ -196,7 +177,6 @@
 	<submenu name="View">
 		<placeholder name="View Preferences Placeholder">
 			<menuitem name="Reset to Defaults"
-				  _label="Reset View to _Defaults"
 				  verb="Reset to Defaults"/>
 		</placeholder>
 	</submenu>
@@ -248,7 +228,7 @@
 			<menuitem name="OpenAlternate" 
 			 verb="OpenAlternate"/>
 			<submenu name="Open With" 
-				 _label="Open With" 
+				 _label="Open Wit_h" 
 				 tearoff="0"
 				 _tip="Choose a program with which to open the selected item">
 				<placeholder name="Applications Placeholder" delimit="none"/>
diff --git a/src/file-manager/nautilus-icon-view-ui.xml b/src/file-manager/nautilus-icon-view-ui.xml
index 6358d2b65..affebdb5e 100644
--- a/src/file-manager/nautilus-icon-view-ui.xml
+++ b/src/file-manager/nautilus-icon-view-ui.xml
@@ -1,47 +1,45 @@
 <Root>
 <commands>
 	<cmd name="Stretch"
-         _label="Stretch Icon"
+         _label="_Stretch Icon"
 	 _tip="Make the selected icon stretchable"/>
 	<cmd name="Unstretch"
-         _label="Restore Icons' Original Sizes"
+         _label="Restore Icons' Original Si_zes"
 	 _tip="Restore each selected icon to its original size"/>
 	<cmd name="Manual Layout"
-         _label="Manually"
+         _label="_Manually"
 	 _tip="Leave icons wherever they are dropped"/>
 	<cmd name="Sort by Name"
-         _label="By Name"
+         _label="By _Name"
 	 _tip="Keep icons sorted by name in rows"/>
 	<cmd name="Sort by Size"
-         _label="By Size"
+         _label="By _Size"
 	 _tip="Keep icons sorted by size in rows"/>
 	<cmd name="Sort by Type"
-         _label="By Type"
+         _label="By _Type"
 	 _tip="Keep icons sorted by type in rows"/>
 	<cmd name="Sort by Modification Date"
-         _label="By Modification Date"
+         _label="By Modification _Date"
 	 _tip="Keep icons sorted by modification date in rows"/>
 	<cmd name="Sort by Emblems"
-         _label="By Emblems"
+         _label="By _Emblems"
 	 _tip="Keep icons sorted by emblems in rows"/>
 	<cmd name="Tighter Layout"
-         _label="Tighter Layout"
+         _label="Tighter _Layout"
 	 _tip="Toggle using a tighter layout scheme"/>
 	<cmd name="Reversed Order"
-         _label="Reversed Order"
+         _label="Re_versed Order"
 	 _tip="Display icons in the opposite order"/>
 	<cmd name="Clean Up"
-         _label="Clean Up by Name"
+         _label="Clean _Up by Name"
 	 _tip="Reposition icons to better fit in the window and avoid overlapping"/>
 </commands>
 <menu>
 	<submenu name="Edit">
 		<placeholder name="Edit Items Placeholder">
 			<menuitem name="Stretch"
-				  _label="_Stretch Icon"
 				  verb="Stretch"/>
 			<menuitem name="Unstretch"
-				  _label="Restore Icons' _Original Sizes"
 				  verb="Unstretch"/>
 		</placeholder>
 
@@ -49,45 +47,36 @@
 
 	<submenu name="View">
 		<placeholder name="View Items Placeholder">
-			<submenu name="Arrange Items" _label="_Arrange Items">
+			<submenu name="Arrange Items" _label="Arran_ge Items">
 				<menuitem name="Manual Layout"
-					  _label="_Manually"
 					  type="radio" group="layout group"
 					  id="Manual Layout"/>
 				<placeholder name="Auto Layout" delimit="top">
 					<menuitem name="Sort by Name"
-						  _label="By _Name"
 						  type="radio" group="layout group"
 						  id="Sort by Name"/>
 					<menuitem name="Sort by Size"
-						  _label="By _Size"
 						  type="radio" group="layout group"
 						  id="Sort by Size"/>
 					<menuitem name="Sort by Type"
-						  _label="By _Type"
 						  type="radio" group="layout group"
 						  id="Sort by Type"/>
 					<menuitem name="Sort by Modification Date" 
-						  _label="By Modification _Date"
 						  type="radio" group="layout group"
 						  id="Sort by Modification Date"/>
 					<menuitem name="Sort by Emblems"
-						  _label="By _Emblems"
 						  type="radio" group="layout group"
 						  id="Sort by Emblems"/>
 				</placeholder>
 				<separator/>
 				<menuitem name="Tighter Layout"
-					  _label="Tighter _Layout"
                                           id="Tighter Layout"
                                           type="toggle"/>
 				<menuitem name="Reversed Order"
-					  _label="Re_versed Order"
                                           id="Reversed Order"
                                           type="toggle"/>
 			</submenu>
 			<menuitem name="Clean Up"
-				  _label="_Clean Up by Name"
 				  verb="Clean Up"/>
 		</placeholder>
 		
@@ -97,7 +86,7 @@
 	<popup name="background">
 		<placeholder name="Before Zoom Items">
 			<placeholder name="View Items">
-				<submenu name="Arrange Items" _label="Arrange Items" tearoff="0">
+				<submenu name="Arrange Items" _label="Arran_ge Items" tearoff="0">
 					<menuitem name="Manual Layout"
 						  type="radio" group="context menu layout group"
 						  id="Manual Layout"/>
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index a18d31086..2f99d7e49 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -20,7 +20,7 @@
 	 _label="Find"
 	 _tip="Search this computer for files"/>
 	<cmd name="New Window"
-	 _label="New Window"
+	 _label="New _Window"
 	 _tip="Open another Nautilus window for the displayed location"/>
 	<cmd name="Home"
 	 _tip="Go to the home location"/>
@@ -33,11 +33,11 @@
         <cmd name="Clear" sensitive="0"/>
 	<cmd name="Reload"
 	 _tip="Display the latest contents of the current location"/>
-	<cmd name="Zoom In" _label="Zoom In"
+	<cmd name="Zoom In" _label="Zoom _In"
 	 _tip="Show the contents in more detail"/>
-	<cmd name="Zoom Out" _label="Zoom Out"
+	<cmd name="Zoom Out" _label="Zoom _Out"
 	 _tip="Show the contents in less detail"/>
-	<cmd name="Zoom Normal" _label="Normal Size"
+	<cmd name="Zoom Normal" _label="Normal Si_ze"
 	 _tip="Show the contents at the normal size"/>
 	<cmd name="View as" _label="View as..."
 	 _tip="Choose a view for the current location, or modify the set of views"/>
@@ -54,7 +54,6 @@
 		<placeholder name="New Items Placeholder" delimit="none">
 			<menuitem name="New Window"
 			  	  accel="*Control*n"
-				  _label="New _Window"
 				  verb="New Window"/>
 		</placeholder>
 		<placeholder name="Open Placeholder" delimit="top"/>
@@ -173,15 +172,14 @@
 		
 		<placeholder name="Zoom Items Placeholder" delimit="top">
 			<menuitem name="Zoom In"
-				  _label="Zoom _In" accel="*Control*plus"
+				  accel="*Control*plus"
 				  pixtype="stock" pixname="zoom-in"
 				  verb="Zoom In"/>
 			<menuitem name="Zoom Out"
-				  _label="Zoom _Out" accel="*Control*minus"
+				  accel="*Control*minus"
 				  pixtype="stock" pixname="zoom-out"
 				  verb="Zoom Out"/>
 			<menuitem name="Zoom Normal"
-				  _label="_Normal Size"
 				  pixtype="stock" pixname="zoom-100"
 				  verb="Zoom Normal"/>
 		</placeholder>