Index: libnautilus-private/nautilus-clipboard.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-clipboard.c,v
retrieving revision 1.5
diff -u -p -r1.5 nautilus-clipboard.c
--- libnautilus-private/nautilus-clipboard.c	26 May 2005 19:07:52 -0000	1.5
+++ libnautilus-private/nautilus-clipboard.c	26 May 2005 19:56:15 -0000
@@ -351,15 +351,15 @@ target_data_free (TargetCallbackData *ta
 
 static GtkActionEntry clipboard_entries[] = {
   { "Cut", GTK_STOCK_CUT,                  /* name, stock id */
-    N_("Cut _Text"), "<control>x",                /* label, accelerator */
+    NULL, NULL,                /* label, accelerator */
     N_("Cut the selected text to the clipboard"),                   /* tooltip */ 
     G_CALLBACK (action_cut_callback) },
   { "Copy", GTK_STOCK_COPY,                  /* name, stock id */
-    N_("_Copy Text"), "<control>c",                /* label, accelerator */
+    NULL, NULL,                /* label, accelerator */
     N_("Copy the selected text to the clipboard"),                   /* tooltip */ 
     G_CALLBACK (action_copy_callback) },
   { "Paste", GTK_STOCK_PASTE,                  /* name, stock id */
-    N_("_Paste Text"), "<control>v",                /* label, accelerator */
+    NULL, NULL,                /* label, accelerator */
     N_("Paste the text stored on the clipboard"),                   /* tooltip */ 
     G_CALLBACK (action_paste_callback) },
   { "Select All", NULL,                  /* name, stock id */
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.676
diff -u -p -r1.676 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	26 May 2005 19:07:53 -0000	1.676
+++ src/file-manager/fm-directory-view.c	26 May 2005 19:56:19 -0000
@@ -5301,27 +5301,27 @@ copy_or_cut_files (FMDirectoryView *view
 		name = nautilus_file_get_display_name (clipboard_contents->data);
 		if (cut) {
 			status_string = g_strdup_printf (_("\"%s\" will be moved "
-							   "if you select the Paste Files command"),
+							   "if you select the Paste command"),
 							 name);
 		} else {
 			status_string = g_strdup_printf (_("\"%s\" will be copied "
-							   "if you select the Paste Files command"),
+							   "if you select the Paste command"),
 							 name);
 		}
 		g_free (name);
 	} else {
 		if (cut) {
 			status_string = g_strdup_printf (ngettext("The %d selected item will be moved "
-								  "if you select the Paste Files command",
+								  "if you select the Paste command",
 								  "The %d selected items will be moved "
-								  "if you select the Paste Files command",
+								  "if you select the Paste command",
 								  count),
 							 count);
 		} else {
 			status_string = g_strdup_printf (ngettext("The %d selected item will be copied "
-								  "if you select the Paste Files command",
+								  "if you select the Paste command",
 								  "The %d selected items will be copied "
-								  "if you select the Paste Files command",
+								  "if you select the Paste command",
 								  count),
 							 count);
 		}
@@ -5987,25 +5987,25 @@ static GtkActionEntry directory_view_ent
     N_("Delete all items in the Trash"),                   /* tooltip */ 
     G_CALLBACK (action_empty_trash_callback) },
   { "Cut", GTK_STOCK_CUT,                  /* name, stock id */
-    N_("Cu_t Files"), "<control>x",                /* label, accelerator */
-    N_("Prepare the selected files to be moved with a Paste Files command"),                   /* tooltip */ 
+    NULL, NULL,                /* label, accelerator */
+    N_("Prepare the selected files to be moved with a Paste command"),                   /* tooltip */ 
     G_CALLBACK (action_cut_files_callback) },
   { "Copy", GTK_STOCK_COPY,                  /* name, stock id */
-    N_("_Copy Files"), "<control>c",                /* label, accelerator */
-    N_("Prepare the selected files to be copied with a Paste Files command"),                   /* tooltip */ 
+    NULL, NULL,                /* label, accelerator */
+    N_("Prepare the selected files to be copied with a Paste command"),                   /* tooltip */ 
     G_CALLBACK (action_copy_files_callback) },
   { "Paste", GTK_STOCK_PASTE,                  /* name, stock id */
-    N_("_Paste Files"), "<control>v",                /* label, accelerator */
-    N_("Move or copy files previously selected by a Cut Files or Copy Files command"),                   /* tooltip */ 
+    NULL, NULL,                /* label, accelerator */
+    N_("Move or copy files previously selected by a Cut or Copy command"),                   /* tooltip */ 
     G_CALLBACK (action_paste_files_callback) },
   /* We make accelerator "" instead of null here to not inherit the stock
      accelerator for paste */
   { "Paste Files Into", GTK_STOCK_PASTE,                  /* name, stock id */
-    N_("_Paste Files Into Folder"), "",                /* label, accelerator */
-    N_("Move or copy files previously selected by a Cut Files or Copy Files command into the selected folder"),                   /* tooltip */ 
+    N_("_Paste Into Folder"), "",                /* label, accelerator */
+    N_("Move or copy files previously selected by a Cut or Copy command into the selected folder"),                   /* tooltip */ 
     G_CALLBACK (action_paste_files_into_callback) },
   { "Select All", NULL,                  /* name, stock id */
-    N_("Select _All Files"), "<control>A",                /* label, accelerator */
+    N_("Select _All"), "<control>A",                /* label, accelerator */
     N_("Select all items in this window"),                   /* tooltip */ 
     G_CALLBACK (action_select_all_callback) },
   { "Select Pattern", NULL,                  /* name, stock id */
@@ -6065,11 +6065,11 @@ static GtkActionEntry directory_view_ent
 
   { FM_ACTION_LOCATION_CUT, GTK_STOCK_CUT,                  /* name, stock id */
     NULL, "",                /* label, accelerator */
-    N_("Prepare the open folder to be moved with a Paste Files command"),                   /* tooltip */ 
+    N_("Prepare the open folder to be moved with a Paste command"),                   /* tooltip */ 
     G_CALLBACK (action_location_cut_callback) },
   { FM_ACTION_LOCATION_COPY, GTK_STOCK_COPY,                  /* name, stock id */
     NULL, "",                /* label, accelerator */
-    N_("Prepare the open folder to be copied with a Paste Files command"),                   /* tooltip */ 
+    N_("Prepare the open folder to be copied with a Paste command"),                   /* tooltip */ 
     G_CALLBACK (action_location_copy_callback) },
 
   { FM_ACTION_LOCATION_TRASH, GTK_STOCK_DELETE,                  /* name, stock id */
@@ -6638,20 +6638,10 @@ real_update_menus (FMDirectoryView *view
 
 	action = gtk_action_group_get_action (view->details->dir_action_group,
 					      FM_ACTION_CUT);
-	g_object_set (action, "label",
-		      selection_count == 1
-		      ? _("Cu_t File")
-		      : _("Cu_t Files"),
-		      NULL);
 	gtk_action_set_sensitive (action, can_delete_files);
 
 	action = gtk_action_group_get_action (view->details->dir_action_group,
 					      FM_ACTION_COPY);
-	g_object_set (action, "label",
-		      selection_count == 1
-		      ? _("_Copy File")
-		      : _("_Copy Files"),
-		      NULL);
 	gtk_action_set_sensitive (action, can_copy_files);
 
 	real_update_paste_menu (view, selection, selection_count);
Index: src/file-manager/fm-tree-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-tree-view.c,v
retrieving revision 1.9
diff -u -p -r1.9 fm-tree-view.c
--- src/file-manager/fm-tree-view.c	22 Nov 2004 15:24:38 -0000	1.9
+++ src/file-manager/fm-tree-view.c	26 May 2005 19:56:19 -0000
@@ -893,11 +893,11 @@ copy_or_cut_files (FMTreeView *view,
 	name = nautilus_file_get_display_name (view->details->popup_file);
 	if (cut) {
 		status_string = g_strdup_printf (_("\"%s\" will be moved "
-						   "if you select the Paste Files command"),
+						   "if you select the Paste command"),
 						 name);
 	} else {
 		status_string = g_strdup_printf (_("\"%s\" will be copied "
-						   "if you select the Paste Files command"),
+						   "if you select the Paste command"),
 						 name);
 	}
 	g_free (name);
@@ -1096,7 +1096,7 @@ create_popup_menu (FMTreeView *view)
 	menu_image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
 					       GTK_ICON_SIZE_MENU);
 	gtk_widget_show (menu_image);
-	menu_item = gtk_image_menu_item_new_with_label (_("Open"));
+	menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
 				       menu_image);
 	g_signal_connect (menu_item, "activate",
@@ -1133,12 +1133,7 @@ create_popup_menu (FMTreeView *view)
 	gtk_menu_shell_append (GTK_MENU_SHELL (popup), separator_item);
 	
 	/* add the "cut folder" menu item */
-	menu_image = gtk_image_new_from_stock (GTK_STOCK_CUT,
-					       GTK_ICON_SIZE_MENU);
-	gtk_widget_show (menu_image);
-	menu_item = gtk_image_menu_item_new_with_label (_("Cut Folder"));
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
-				       menu_image);
+	menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CUT, NULL);
 	g_signal_connect (menu_item, "activate",
 			  G_CALLBACK (fm_tree_view_cut_cb),
 			  view);
@@ -1147,12 +1142,7 @@ create_popup_menu (FMTreeView *view)
 	view->details->popup_cut = menu_item;
 	
 	/* add the "copy folder" menu item */
-	menu_image = gtk_image_new_from_stock (GTK_STOCK_COPY,
-					       GTK_ICON_SIZE_MENU);
-	gtk_widget_show (menu_image);
-	menu_item = gtk_image_menu_item_new_with_label (_("Copy Folder"));
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
-				       menu_image);
+	menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
 	g_signal_connect (menu_item, "activate",
 			  G_CALLBACK (fm_tree_view_copy_cb),
 			  view);
@@ -1164,7 +1154,7 @@ create_popup_menu (FMTreeView *view)
 	menu_image = gtk_image_new_from_stock (GTK_STOCK_PASTE,
 					       GTK_ICON_SIZE_MENU);
 	gtk_widget_show (menu_image);
-	menu_item = gtk_image_menu_item_new_with_label (_("Paste Files into Folder"));
+	menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
 				       menu_image);
 	g_signal_connect (menu_item, "activate",
@@ -1197,12 +1187,7 @@ create_popup_menu (FMTreeView *view)
 	gtk_menu_shell_append (GTK_MENU_SHELL (popup), separator_item);
 	
 	/* add the "properties" menu item */
-	menu_image = gtk_image_new_from_stock (GTK_STOCK_PROPERTIES,
-					       GTK_ICON_SIZE_MENU);
-	gtk_widget_show (menu_image);
-	menu_item = gtk_image_menu_item_new_with_label (_("Properties"));
-	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
-				       menu_image);
+	menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
 	g_signal_connect (menu_item, "activate",
 			  G_CALLBACK (fm_tree_view_properties_cb),
 			  view);
