Index: gnome-panel/GNOME_Panel_Popup.xml
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/GNOME_Panel_Popup.xml,v
retrieving revision 1.3
diff -u -r1.3 GNOME_Panel_Popup.xml
--- gnome-panel/GNOME_Panel_Popup.xml	26 May 2003 13:41:07 -0000	1.3
+++ gnome-panel/GNOME_Panel_Popup.xml	16 May 2004 08:52:46 -0000
@@ -7,7 +7,7 @@
          <menuitem name="remove" verb="RemoveAppletFromPanel" _label="_Remove From Panel"
                    pixtype="stock" pixname="gtk-remove"/>
 
-         <menuitem name="lock" verb="LockAppletToPanel" _label="_Lock"/>
+         <menuitem name="lock" verb="LockAppletToPanel" _label="_Lock Position"/>
    
          <menuitem name="move" verb="MoveApplet" _label="_Move"/>
    
Index: gnome-panel/applet.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/applet.c,v
retrieving revision 1.231
diff -u -r1.231 applet.c
--- gnome-panel/applet.c	7 Apr 2004 16:03:18 -0000	1.231
+++ gnome-panel/applet.c	16 May 2004 08:52:47 -0000
@@ -100,7 +100,7 @@
 	locked = panel_applet_toggle_locked (info);
 
 	gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)->child),
-			     locked ? _("Un_lock") : _("_Lock"));
+			     locked ? _("Un_lock Position") : _("_Lock Position"));
 
 	if (info->move_item)
 		gtk_widget_set_sensitive (info->move_item, !locked);
@@ -467,7 +467,8 @@
 
 		menuitem = gtk_image_menu_item_new ();
 		image = gtk_image_new ();
-		setup_menuitem (menuitem, GTK_ICON_SIZE_MENU, image, locked ? _("Un_lock") : _("_Lock"), FALSE);
+		setup_menuitem (menuitem, GTK_ICON_SIZE_MENU, image,
+				locked ? _("Un_lock Position") : _("_Lock Position"), FALSE);
 		g_signal_connect (menuitem, "activate",
 				  G_CALLBACK (panel_applet_lock), info);
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
Index: gnome-panel/panel-applet-frame.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-applet-frame.c,v
retrieving revision 1.116
diff -u -r1.116 panel-applet-frame.c
--- gnome-panel/panel-applet-frame.c	21 Jan 2004 13:22:42 -0000	1.116
+++ gnome-panel/panel-applet-frame.c	16 May 2004 08:52:48 -0000
@@ -106,7 +106,7 @@
 	bonobo_ui_component_set_prop (frame->priv->ui_component,
 				      "/popups/button3/placeholder/lock",
 				      "label",
-				      locked ? _("Un_lock") : _("_Lock"),
+				      locked ? _("Un_lock Position") : _("_Lock Position"),
 				      NULL);
 
 	/* First sensitivity */
@@ -119,7 +119,7 @@
 	bonobo_ui_component_set_prop (frame->priv->ui_component,
 				      "/commands/RemoveAppletFromPanel",
 				      "sensitive",
-				      locked ? "0" : (removable ? "1" : "0"),
+				      removable ? "1" : "0",
 				      NULL);
 
 	bonobo_ui_component_set_prop (frame->priv->ui_component,
