Index: e-shell-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
retrieving revision 1.58
diff -u -r1.58 e-shell-importer.c
--- e-shell-importer.c	23 Jul 2003 15:06:55 -0000	1.58
+++ e-shell-importer.c	25 Aug 2003 06:33:41 -0000
@@ -640,7 +640,7 @@
 	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
 	gtk_box_pack_start (GTK_BOX (page->vbox), table, TRUE, TRUE, 0);
 
-	label = gtk_label_new (_("Filename:"));
+	label = gtk_label_new_with_mnemonic (_("_Filename:"));
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, 
 			  GTK_FILL, 0, 0, 0);
 	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
@@ -651,10 +651,11 @@
 
 	gtk_table_attach (GTK_TABLE (table), page->filename, 1, 2, 
 			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	gtk_label_set_mnemonic_widget(GTK_LABEL(label), page->filename);
 
 	row++;
 
-	label = gtk_label_new (_("File type:"));
+	label = gtk_label_new_with_mnemonic (_("File _type:"));
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
 			  GTK_FILL, 0, 0, 0);
 	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
@@ -664,6 +665,7 @@
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (page->filetype), page->menu);
 	gtk_table_attach (GTK_TABLE (table), page->filetype, 1, 2, 
 			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	gtk_label_set_mnemonic_widget(GTK_LABEL(label), page->filetype);
 
 	gtk_widget_show_all (table);
 
@@ -678,12 +680,12 @@
 	page = g_new0 (ImportDialogTypePage, 1);
 
 	page->vbox = gtk_vbox_new (FALSE, 5);
-	page->intelligent = gtk_radio_button_new_with_label (NULL, 
-							     _("Import data and settings from older programs"));
+	gtk_button_set_use_underline (GTK_BUTTON(page->intelligent), TRUE);
+	page->intelligent = gtk_radio_button_new_with_mnemonic (NULL, 
+							     _("Import data and settings from _older programs"));
 	gtk_box_pack_start (GTK_BOX (page->vbox), page->intelligent, FALSE, FALSE, 0);
-
-	page->file = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (page->intelligent),
-								  _("Import a single file"));
+	page->file = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (page->intelligent),
+								  _("Import a _single file"));
 	gtk_box_pack_start (GTK_BOX (page->vbox), page->file, FALSE, FALSE, 0);
 	gtk_widget_show_all (page->vbox);
 	return page;
@@ -1188,7 +1190,8 @@
 	g_signal_connect (data->druid, "cancel",
 			  G_CALLBACK (import_druid_cancel), data);
 
-	gtk_button_set_label((GtkButton *)((GnomeDruid *)data->druid)->finish, _("Import"));
+	gtk_button_set_use_underline ((GtkButton *)((GnomeDruid *)data->druid)->finish, TRUE);
+	gtk_button_set_label((GtkButton *)((GnomeDruid *)data->druid)->finish, _("_Import"));
 
 	data->start = GNOME_DRUID_PAGE_EDGE (glade_xml_get_widget (data->wizard, "page0"));
 
