Index: gnumeric/src/GNOME_Gnumeric.xml
===================================================================
RCS file: /cvs/gnome/gnumeric/src/GNOME_Gnumeric.xml,v
retrieving revision 1.123
diff -u -r1.123 GNOME_Gnumeric.xml
--- gnumeric/src/GNOME_Gnumeric.xml	8 Dec 2002 08:19:15 -0000	1.123
+++ gnumeric/src/GNOME_Gnumeric.xml	27 Dec 2002 02:11:05 -0000
@@ -41,8 +41,8 @@
 	    pixtype="stock" pixname="gtk-properties"/>
 
 	<cmd name="FilePreferences"
-	    _label="Preferen_ces..."
-	    _tip="Change Gnumeric Preferences"
+	    _label="Pr_eferences..."
+	    _tip="Configure the application"
 	    pixtype="stock" pixname="gtk-preferences"/>
 
 	<cmd name="FileClose"
@@ -172,7 +172,6 @@
 	    <separator/>
 
 	    <menuitem name="FileSummary" verb=""/>
-	    <menuitem name="FilePreferences" verb=""/>
 	    <placeholder name="FileHistory" delimit="top"/>
 
 	    <separator/>
@@ -202,7 +201,8 @@
 
 	    <menuitem name="EditDelete" verb=""
 		_label="_Delete..."
-		_tip="Remove selected cells, shifting others into their place"/>
+		_tip="Remove selected cells, shifting others into their place"
+		pixtype="stock" pixname="gtk-delete"/>
 
 	    <separator/>
 
@@ -273,29 +273,15 @@
 		    _tip="Generate random numbers of a selection of distributions"/>
 	    </submenu>
 
-	    <menuitem name="EditSearch" verb=""
-		_label="Search..."
-		_tip="Search for some text"
-		pixtype="stock" pixname="gtk-find"
-		accel="F7"/>
-
-	    <menuitem name="EditSearchReplace" verb=""
-		_label="Search and Replace..."
-		_tip="Search for some text and replace it with something else"
-		pixtype="stock" pixname="gtk-find-and-replace"
-		accel="F6"/>
-
-	    <menuitem name="EditGoto" verb=""
-		_label="_Goto cell..."
-		_tip="Jump to a specified cell"
-		pixtype="stock" pixname="gtk-jump-to"
-		accel="F5"/>
-
 	    <menuitem name="EditRecalc" verb=""
 		_label="Recalculate"
 		_tip="Recalculate the spreadsheet"
 		accel="F9"/>
 
+	    <separator/>
+
+	    <menuitem name="FilePreferences" verb=""/>
+
 	    <placeholder name="ops"/>
 
 	</submenu>
@@ -322,6 +308,28 @@
 		_tip="Configure toolbars"/>
 	</submenu>
 
+	<submenu name="Search" _label="_Search">
+	    <menuitem name="EditSearch" verb=""
+		_label="_Find..."
+		_tip="Search for a string"
+		pixtype="stock" pixname="gtk-find"
+		accel="*Control*f"/>
+
+	    <menuitem name="EditSearchReplace" verb=""
+		_label="R_eplace..."
+		_tip="Replace a string"
+		pixtype="stock" pixname="gtk-find-and-replace"
+		accel="*Control*r"/>
+
+      	    <separator/>
+
+	    <menuitem name="EditGoto" verb=""
+		_label="_Jump to Cell..."
+		_tip="Jump to a specific cell or range of cells"
+		pixtype="stock" pixname="gtk-jump-to"
+		accel="F5"/>
+	</submenu>
+
 	<submenu name="Insert" _label="_Insert">
 
 	    <menuitem name="InsertCells" verb=""
@@ -480,11 +488,6 @@
 	    <menuitem name="FormatWorkbook" verb=""
 		_label="_Workbook..."
 		_tip="Modify the workbook attributes"/>
-
-	    <menuitem name="FormatGnumeric" verb="FilePreferences"
-	        _label="_Gnumeric..."
-	        _tip="Edit the Gnumeric Preferences"
-	        pixtype="stock" pixname="gtk-preferences"/>
 
 	    <menuitem name="FormatAuto" verb=""
 		_label="_Autoformat..."
Index: gnumeric/src/GNOME_Gnumeric_Component.xml
===================================================================
RCS file: /cvs/gnome/gnumeric/src/GNOME_Gnumeric_Component.xml,v
retrieving revision 1.7
diff -u -r1.7 GNOME_Gnumeric_Component.xml
--- gnumeric/src/GNOME_Gnumeric_Component.xml	5 Dec 2002 14:23:53 -0000	1.7
+++ gnumeric/src/GNOME_Gnumeric_Component.xml	27 Dec 2002 02:11:05 -0000
@@ -81,10 +81,10 @@
 	    	pixtype="stock" pixname="gtk-clear"
 	    	verb="EditClear"/>
 	    <menuitem name="EditSearch" verb=""
-		_label="Search Workbook"
-		_tip="Search for some text"
+		_label="_Find..."
+		_tip="Search for a string"
 		pixtype="stock" pixname="gtk-find"
-		accel="F7"/>
+		accel="*Control*f"/>
 	</submenu>
 
         <!-- Freeze/Thaw Panes would also be useful in the viewer -->
Index: gnumeric/src/history.c
===================================================================
RCS file: /cvs/gnome/gnumeric/src/history.c,v
retrieving revision 1.51
diff -u -r1.51 history.c
--- gnumeric/src/history.c	27 Nov 2002 22:27:15 -0000	1.51
+++ gnumeric/src/history.c	27 Dec 2002 02:11:06 -0000
@@ -124,15 +124,15 @@
 /*
  * xgettext:
  * This string must translate to exactly the same strings as the
- * 'Preferences...' item in the
+ * 'Properties...' item in the
  * 'File' menu
  */
-	char const *menu_name = _("_File/Preferen_ces...");
+	char const *menu_name = _("_File/Proper_ties");
 	res->menu = gnome_app_find_menu_pos (GNOME_APP (wbcg->toplevel)->menubar,
 					    menu_name, &res->pos);
 	if (res->menu == NULL)
 		g_warning ("Probable mis-translation. '%s' : was not found. "
-			   "Does this match the '_File/Preferen_ces...' menu exactly ?",
+			   "Does this match the '_File/Proper_ties...' menu exactly ?",
 			   menu_name);
 }
 
Index: gnumeric/src/workbook-control-gui.c
===================================================================
RCS file: /cvs/gnome/gnumeric/src/workbook-control-gui.c,v
retrieving revision 1.384
diff -u -r1.384 workbook-control-gui.c
--- gnumeric/src/workbook-control-gui.c	22 Dec 2002 18:21:28 -0000	1.384
+++ gnumeric/src/workbook-control-gui.c	27 Dec 2002 02:11:16 -0000
@@ -3206,10 +3206,6 @@
 			       N_("Edit descriptive information"),
 			       cb_file_summary, GTK_STOCK_PROPERTIES),
 
-	GNOMEUIINFO_ITEM_STOCK (N_("Preferen_ces..."),
-			       N_("Change Gnumeric Preferences"),
-			       cb_file_preferences, GTK_STOCK_PREFERENCES),
-
 	GNOMEUIINFO_SEPARATOR,
 
 	GNOMEUIINFO_MENU_CLOSE_ITEM (cb_file_close, NULL),
@@ -3324,9 +3320,13 @@
 
 	GNOMEUIINFO_SUBTREE(N_("C_lear"), workbook_menu_edit_clear),
 
-	GNOMEUIINFO_ITEM_NONE (N_("_Delete..."),
-		N_("Remove selected cells, shifting other into their place"),
-		cb_edit_delete),
+	{ GNOME_APP_UI_ITEM, N_("_Delete..."),
+		  N_("Remove selected cells, shifting others into their place"),
+	          cb_edit_delete,
+		  NULL, NULL,
+		  GNOME_APP_PIXMAP_STOCK, GTK_STOCK_DELETE,
+		  0, 0 },
+
 	GNOMEUIINFO_SEPARATOR,
 
 	GNOMEUIINFO_SUBTREE(N_("S_heet"), workbook_menu_edit_sheet),
@@ -3335,29 +3335,17 @@
 
 	GNOMEUIINFO_SUBTREE(N_("_Fill"), workbook_menu_edit_fill),
 
-	{ GNOME_APP_UI_ITEM, N_("Search..."),
-		  N_("Search for some text"),
-	          cb_edit_search,
-		  NULL, NULL,
-		  GNOME_APP_PIXMAP_STOCK, GTK_STOCK_FIND, GDK_F7, 0 },
-
-	{ GNOME_APP_UI_ITEM, N_("Search and Replace..."),
-		  N_("Search for some text and replace it with something else"),
-	          cb_edit_search_replace,
-		  NULL, NULL,
-		  GNOME_APP_PIXMAP_STOCK, GTK_STOCK_FIND_AND_REPLACE, GDK_F6, 0 },
-
-	{ GNOME_APP_UI_ITEM, N_("_Goto cell..."),
-		  N_("Jump to a specified cell"),
-		  cb_edit_goto,
-		  NULL, NULL,
-		  GNOME_APP_PIXMAP_STOCK, GTK_STOCK_JUMP_TO, GDK_F5, 0 },
-
 	{ GNOME_APP_UI_ITEM, N_("Recalculate"),
 		  N_("Recalculate the spreadsheet"),
 		  cb_edit_recalc,
 		  NULL, NULL, 0, 0, GDK_F9, 0 },
 
+	GNOMEUIINFO_SEPARATOR,
+
+	GNOMEUIINFO_ITEM_STOCK (N_("Pr_eferences..."),
+		N_("Configure the application"),
+		cb_format_preferences, GTK_STOCK_PREFERENCES),
+
 	GNOMEUIINFO_END
 };
 
@@ -3382,6 +3370,24 @@
 	GNOMEUIINFO_END
 };
 
+/* Search menu */
+
+static GnomeUIInfo workbook_menu_search [] = {
+
+	GNOMEUIINFO_MENU_FIND_ITEM (cb_edit_search, NULL),
+	GNOMEUIINFO_MENU_REPLACE_ITEM (cb_edit_search_replace, NULL),
+
+	GNOMEUIINFO_SEPARATOR,
+
+	{ GNOME_APP_UI_ITEM, N_("_Jump to Cell..."),
+		  N_("Jump to a specific cell or range of cells"),
+		  cb_edit_goto,
+		  NULL, NULL,
+		  GNOME_APP_PIXMAP_STOCK, GTK_STOCK_JUMP_TO, GDK_F5, 0 },
+
+	GNOMEUIINFO_END
+};
+
 /* Insert menu */
 
 static GnomeUIInfo workbook_menu_insert_special [] = {
@@ -3550,9 +3556,6 @@
 	GNOMEUIINFO_ITEM_NONE (N_("_Workbook..."),
 		N_("Modify the workbook attributes"),
 		cb_workbook_attr),
-	GNOMEUIINFO_ITEM_STOCK (N_("_Gnumeric..."),
-		N_("Edit the Gnumeric Preferences"),
-		cb_format_preferences, GTK_STOCK_PREFERENCES),
 
 	GNOMEUIINFO_ITEM_NONE (N_("_Autoformat..."),
 			      N_("Format a region of cells according to a pre-defined template"),
@@ -3768,7 +3771,7 @@
 
 	GNOMEUIINFO_SUBTREE(N_("_Group and Outline"),   workbook_menu_data_outline),
 	GNOMEUIINFO_ITEM_STOCK (N_("_PivotTable..."),
-		N_("Create a pivot table."),
+		N_("Create a pivot table"),
 		cb_data_pivottable, "Gnumeric_PivotTable"),
 	GNOMEUIINFO_SUBTREE(N_("Get _External Data"),   workbook_menu_data_external),
 
@@ -3785,6 +3788,7 @@
         GNOMEUIINFO_MENU_FILE_TREE (workbook_menu_file),
 	GNOMEUIINFO_MENU_EDIT_TREE (workbook_menu_edit),
 	GNOMEUIINFO_MENU_VIEW_TREE (workbook_menu_view),
+	GNOMEUIINFO_SUBTREE(N_("_Search"), workbook_menu_search),
 	GNOMEUIINFO_SUBTREE(N_("_Insert"), workbook_menu_insert),
 	GNOMEUIINFO_SUBTREE(N_("F_ormat"), workbook_menu_format),
 	GNOMEUIINFO_SUBTREE(N_("_Tools"),  workbook_menu_tools),
