Index: data/ui/rhythmbox-ui.xml
===================================================================
RCS file: /cvs/gnome/rhythmbox/data/ui/rhythmbox-ui.xml,v
retrieving revision 1.34
diff -u -u -r1.34 rhythmbox-ui.xml
--- data/ui/rhythmbox-ui.xml	4 Jan 2006 09:50:15 -0000	1.34
+++ data/ui/rhythmbox-ui.xml	15 Jan 2006 11:53:43 -0000
@@ -30,13 +30,13 @@
       <menuitem name="EditCutMenu" action="EditCut"/>
       <menuitem name="EditCopyMenu" action="EditCopy"/>
       <menuitem name="EditPasteMenu" action="EditPaste"/>
-      <separator name="EditSep1"/> 
+      <menuitem name="EditDeleteMenu" action="EditDelete"/>
+      <separator/> 
       <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
       <menuitem name="EditSelectNoneMenu" action="EditSelectNone"/>
-      <separator name="EditSep2"/> 
-      <menuitem name="EditDeleteMenu" action="EditDelete"/>
+      <separator/> 
       <menuitem name="EditMovetoTrash" action="EditMovetoTrash"/>
-      <separator name="EditSep3"/>
+      <separator/>
       <menuitem name="EditPreferencesMenu" action="EditPreferences"/> 
     </menu>
 
@@ -98,9 +98,10 @@
 
   <popup name="LibraryViewPopup">
     <menuitem name="CopyLibraryPopup" action="EditCopy"/>
+    <menuitem name="AddToQueueLibraryPopup" action="AddToQueue"/>
     <menuitem name="DeleteLibraryPopup" action="EditDelete"/>
+    <separator/>
     <menuitem name="MovetoTrashPopup" action="EditMovetoTrash"/>
-    <menuitem name="AddToQueueLibraryPopup" action="AddToQueue"/>
     <separator/>
     <menuitem name="BrowseGenreLibraryPopup" action="LibrarySrcChooseGenre"/>
     <menuitem name="BrowseArtistLibraryPopup" action="LibrarySrcChooseArtist"/>
@@ -113,9 +114,10 @@
     <menuitem name="CopyPlaylistPopup" action="EditCopy"/>
     <menuitem name="CutPlaylistPopup" action="EditCut"/>
     <menuitem name="DeletePlaylistPopup" action="EditDelete"/>
-    <menuitem name="MovetoTrashPlaylistPopup" action="EditMovetoTrash"/>
     <menuitem name="AddToQueuePlaylistPopup" action="AddToQueue"/>
     <separator/>
+    <menuitem name="MovetoTrashPlaylistPopup" action="EditMovetoTrash"/>
+    <separator/>
     <menuitem name="PropertiesPlaylistPopup" action="MusicProperties"/>
   </popup>
 
@@ -161,9 +163,9 @@
   </popup>
 
   <popup name="PodcastViewPopup">
-    <menuitem name="DeletePodcastPopup" action="EditDelete"/>
     <menuitem name="DownloadPodcastPopup" action="PodcastSrcDownloadPost"/>
     <menuitem name="CancelDownloadPopup" action="PodcastSrcCancelDownload"/>
+    <menuitem name="DeletePodcastPopup" action="EditDelete"/>
     <menuitem name="AddToQueuePodcastPopup" action="AddToQueue"/>
     <separator/>
     <menuitem name="PropertiesPodcastPopup" action="MusicProperties"/>
Index: shell/rb-shell-clipboard.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-shell-clipboard.c,v
retrieving revision 1.31
diff -u -u -r1.31 rb-shell-clipboard.c
--- shell/rb-shell-clipboard.c	10 Dec 2005 12:08:24 -0000	1.31
+++ shell/rb-shell-clipboard.c	15 Jan 2006 11:53:50 -0000
@@ -123,8 +123,8 @@
 	{ "EditPaste", GTK_STOCK_PASTE, N_("_Paste"), "<control>V",
 	  N_("Paste selection"),
 	  G_CALLBACK (rb_shell_clipboard_cmd_paste) },
-	{ "EditDelete", NULL, N_("_Delete"), NULL,
-	  N_("Delete selection"),
+	{ "EditDelete", NULL, N_("_Remove"), NULL,
+	  N_("Remove selection"),
 	  G_CALLBACK (rb_shell_clipboard_cmd_delete) },
 	{ "EditMovetoTrash", NULL, N_("_Move To Trash"), "<control>T",
 	  N_("Move selection to the trash"),
@@ -133,8 +133,8 @@
 	{ "AddToQueue", GTK_STOCK_ADD, N_("Add _to Play Queue"), "<control>T",
 	  N_("Add the selected songs to the play queue"),
 	  G_CALLBACK (rb_shell_clipboard_cmd_add_song_to_queue) },
-	{ "QueueDelete", NULL, N_("Delete"), NULL,
-	  N_("Delete selection"),
+	{ "QueueDelete", NULL, N_("Remove"), NULL,
+	  N_("Remove selection"),
 	  G_CALLBACK (rb_shell_clipboard_cmd_queue_delete) },
 
 	{ "MusicProperties", GTK_STOCK_PROPERTIES, N_("_Properties"), "<Alt>Return",
