? depcomp
? nautilus-folder-handler.desktop
? stamp-h1
? libnautilus-private/nautilus-file.c.SAVED
? src/diff
? src/file-manager/fm-properties-window.c.SAVED
Index: libnautilus-private/nautilus-desktop-link-monitor.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-desktop-link-monitor.c,v
retrieving revision 1.11
diff -u -r1.11 nautilus-desktop-link-monitor.c
--- libnautilus-private/nautilus-desktop-link-monitor.c	12 Dec 2004 20:01:33 -0000	1.11
+++ libnautilus-private/nautilus-desktop-link-monitor.c	5 Mar 2005 19:17:30 -0000
@@ -105,7 +105,7 @@
 			 _("You cannot delete a volume icon."),
 			 _("If you want to eject the volume, please use Eject in the "
 			   "right-click menu of the volume."),
-			 _("Can't Delete Volume"),
+			 "",
 			 GTK_STOCK_OK, NULL);
 		break;
 	}
Index: libnautilus-private/nautilus-emblem-utils.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-emblem-utils.c,v
retrieving revision 1.9
diff -u -r1.9 nautilus-emblem-utils.c
--- libnautilus-private/nautilus-emblem-utils.c	18 Dec 2003 18:38:23 -0000	1.9
+++ libnautilus-private/nautilus-emblem-utils.c	5 Mar 2005 19:17:30 -0000
@@ -196,12 +196,12 @@
 	if (keyword == NULL || strlen (keyword) == 0) {
 		eel_show_error_dialog (_("The emblem cannot be installed."),
 				       _("Sorry, but you must specify a non-blank keyword for the new emblem."), 
-				       _("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
+				       "", GTK_WINDOW (parent_window));
 		return FALSE;
 	} else if (!emblem_keyword_valid (keyword)) {
 		eel_show_error_dialog (_("The emblem cannot be installed."),
 				       _("Sorry, but emblem keywords can only contain letters, spaces and numbers."), 
-				       _("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
+				       "", GTK_WINDOW (parent_window));
 		return FALSE;
 	} else if (is_reserved_keyword (keyword)) {
 		char *error_string;
@@ -212,7 +212,7 @@
 		 */
 		error_string = g_strdup_printf (_("Sorry, but there is already an emblem named \"%s\"."), display_name);
 		eel_show_error_dialog (_("Please choose a different emblem name."), error_string,
-				       _("Couldn't install emblem"), GTK_WINDOW (parent_window));
+				       "", GTK_WINDOW (parent_window));
 		g_free (error_string);
 		return FALSE;
 	} 
@@ -256,7 +256,7 @@
 	if (eel_gdk_pixbuf_save_to_file (pixbuf, path) != TRUE) {
 		eel_show_error_dialog (_("The emblem cannot be installed."),
 				       _("Sorry, unable to save custom emblem."), 
-				       _("Couldn't Install Emblem"), 
+				       "", 
 				       GTK_WINDOW (parent_window));
 		g_free (dir);
 		g_free (stat_dir);
@@ -273,7 +273,7 @@
 		if (file == NULL) {
 			eel_show_error_dialog (_("The emblem cannot be installed."),
 					       _("Sorry, unable to save custom emblem name."), 
-					       _("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
+					       "", GTK_WINDOW (parent_window));
 			g_free (stat_dir);
 			g_free (dir);
 			return;
Index: libnautilus-private/nautilus-file-operations.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file-operations.c,v
retrieving revision 1.186
diff -u -r1.186 nautilus-file-operations.c
--- libnautilus-private/nautilus-file-operations.c	22 Feb 2005 10:41:46 -0000	1.186
+++ libnautilus-private/nautilus-file-operations.c	5 Mar 2005 19:17:33 -0000
@@ -810,7 +810,6 @@
 	char *detail;
 	char *formatted_source_name;
 	char *formatted_target_name;
-	const char *dialog_title;
 	NautilusFileOperationsErrorKind error_kind;
 	NautilusFileOperationsErrorLocation error_location;
 	
@@ -904,32 +903,11 @@
 				    progress_info->vfs_status,
 				    &text, &detail);
 
-		switch (transfer_info->kind) {
-		case TRANSFER_COPY:
-		case TRANSFER_DUPLICATE:
-			dialog_title = _("Error While Copying");
-			break;
-		case TRANSFER_MOVE:
-			dialog_title = _("Error While Moving");
-			break;
-		case TRANSFER_LINK:
-			dialog_title = _("Error While Linking");
-			break;
-		case TRANSFER_DELETE:
-		case TRANSFER_EMPTY_TRASH:
-		case TRANSFER_MOVE_TO_TRASH:
-			dialog_title = _("Error While Deleting");
-			break;
-		default:
-			dialog_title = NULL;
-			break;
-		}
-
 		if (error_location == ERROR_LOCATION_TARGET ||
 		    error_kind == ERROR_SOURCE_IN_TARGET) {
 			/* We can't continue, just tell the user. */
 			eel_run_simple_dialog (parent_for_error_dialog (transfer_info),
-				TRUE, GTK_MESSAGE_ERROR, text, detail, dialog_title, GTK_STOCK_OK, NULL);
+				TRUE, GTK_MESSAGE_ERROR, text, detail, "", GTK_STOCK_OK, NULL);
 			error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT;
 
 		} else if ((error_location == ERROR_LOCATION_SOURCE
@@ -944,7 +922,7 @@
 			error_dialog_button_pressed = eel_run_simple_dialog
 				(parent_for_error_dialog (transfer_info), TRUE, 
 				 GTK_MESSAGE_ERROR, text, 
-				 detail, dialog_title,
+				 detail, "",
 				 GTK_STOCK_CANCEL, _("_Skip"), NULL);
 				 
 			switch (error_dialog_button_pressed) {
@@ -965,7 +943,7 @@
 			error_dialog_button_pressed = eel_run_simple_dialog
 				(parent_for_error_dialog (transfer_info), TRUE, 
 				 GTK_MESSAGE_ERROR, text, 
-				 detail, dialog_title,
+				 detail, "",
 				 _("_Skip"), GTK_STOCK_CANCEL, _("_Retry"), NULL);
 
 			switch (error_dialog_button_pressed) {
@@ -1072,7 +1050,7 @@
 		}
 		
 		eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, GTK_MESSAGE_ERROR, primary_text, secondary_text,
-				       _("Unable to Replace File"), GTK_STOCK_OK, NULL, NULL);
+				       "", GTK_STOCK_OK, NULL, NULL);
 
 		g_free (primary_text);
 		g_free (formatted_name);
@@ -1114,7 +1092,7 @@
 			 GTK_MESSAGE_QUESTION, 
 			 text, 
 			 secondary_text, 
-			 _("Conflict While Copying"),
+			 "",
 			 _("_Skip"), _("_Replace"), NULL);
 		g_free (text);	 
 
@@ -1133,7 +1111,7 @@
 		result = eel_run_simple_dialog
 			(parent_for_error_dialog (transfer_info), TRUE, GTK_MESSAGE_QUESTION, text, 
 			 secondary_text, 
-			 _("Conflict While Copying"),
+			 "",
 			 _("Replace _All"), _("_Skip"), _("_Replace"), NULL);
 		g_free (text);
 
@@ -1991,7 +1969,7 @@
 				 ? _("You cannot copy items into the trash.")
 				 : _("You cannot create links inside the trash."),
 				 _("Files and folders can only be moved into the trash."), 
-				 NULL,
+				 "",
 				 GTK_STOCK_OK, NULL);
 			result = GNOME_VFS_ERROR_NOT_PERMITTED;
 		}
@@ -2017,9 +1995,7 @@
 						 ? _("You cannot move this trash folder.")
 						 : _("You cannot copy this trash folder."),
 					 _("A trash folder is used for storing items moved to the trash."),
-					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0)
-						 ? _("Can't Change Trash Location")
-						 : _("Can't Copy Trash"),
+					 "",
 					 GTK_STOCK_OK, NULL, NULL);
 
 				result = GNOME_VFS_ERROR_NOT_PERMITTED;
@@ -2046,9 +2022,7 @@
 					 ? _("You cannot move a folder into itself.")
 					 : _("You cannot copy a folder into itself."), 
 					 _("The destination folder is inside the source folder."), 
-					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0) 
-					 ? _("Can't Move Into Self")
-					 : _("Can't Copy Into Self"),
+					 "",
 					 GTK_STOCK_OK, NULL, NULL);			
 
 				result = GNOME_VFS_ERROR_NOT_PERMITTED;
@@ -2063,7 +2037,7 @@
 					 GTK_MESSAGE_ERROR,
 					 _("You cannot copy a file over itself."),
 					 _("The destination and source are the same file."), 
-					 _("Can't Copy Over Self"), 
+					 "", 
 					 GTK_STOCK_OK, NULL, NULL);			
 
 				result = GNOME_VFS_ERROR_NOT_PERMITTED;
@@ -2124,7 +2098,7 @@
 		error_string_to_free = (char *)error_string;
 	}
 	
-	eel_show_error_dialog (_("Error creating new folder."), error_string, _("Error Creating New Folder"),
+	eel_show_error_dialog (_("Error creating new folder."), error_string, "",
 				    GTK_WINDOW (gtk_widget_get_toplevel (state->parent_view)));
 	
 	g_free (error_string_to_free);
@@ -2264,7 +2238,7 @@
 		error_string_to_free = (char *)error_string;
 	}
 	
-	eel_show_error_dialog (_("Error creating new document."), error_string, _("Error Creating New Document"),
+	eel_show_error_dialog (_("Error creating new document."), error_string, "",
 			       GTK_WINDOW (gtk_widget_get_toplevel (state->parent_view)));
 	
 	g_free (error_string_to_free);
Index: libnautilus-private/nautilus-icon-dnd.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-dnd.c,v
retrieving revision 1.141
diff -u -r1.141 nautilus-icon-dnd.c
--- libnautilus-private/nautilus-icon-dnd.c	13 Jan 2005 13:27:51 -0000	1.141
+++ libnautilus-private/nautilus-icon-dnd.c	5 Mar 2005 19:17:34 -0000
@@ -770,7 +770,7 @@
 		}
 	}
 
-	dialog = eel_show_yes_no_dialog (message, detail, _("Switch to Manual Layout?"),
+	dialog = eel_show_yes_no_dialog (message, detail, "",
 					 _("Switch"), GTK_STOCK_CANCEL,
 					 GTK_WINDOW (gtk_widget_get_toplevel(GTK_WIDGET(container))));
 
Index: libnautilus-private/nautilus-program-choosing.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-choosing.c,v
retrieving revision 1.77
diff -u -r1.77 nautilus-program-choosing.c
--- libnautilus-private/nautilus-program-choosing.c	6 Feb 2005 15:48:08 -0000	1.77
+++ libnautilus-private/nautilus-program-choosing.c	5 Mar 2005 19:17:34 -0000
@@ -147,7 +147,7 @@
 		
 		message_dialog = eel_show_yes_no_dialog (prompt, 
 		                                         message,
-							 _("Can't Open Location"), 
+							 "", 
 							 GTK_STOCK_OK,
 							 GTK_STOCK_CANCEL,
 							 parent_window);
@@ -180,7 +180,7 @@
 				    "it.");
 		}
 				
-		eel_show_info_dialog (prompt, message, _("Can't Open Location"), parent_window);
+		eel_show_info_dialog (prompt, message, "", parent_window);
 		g_free (prompt);
 	}	
 
@@ -641,7 +641,7 @@
 	}
 
 	if (error_message != NULL) {
-		eel_show_error_dialog (error_message, detail_message, _("Can't Display Location"), parent_window);
+		eel_show_error_dialog (error_message, detail_message, "", parent_window);
 		
 		g_free (error_message);
 		g_free (detail_message);
@@ -873,7 +873,7 @@
 			(_("Sorry, but you can't execute commands from "
 			   "a remote site."), 
 			 _("This is disabled due to security considerations."),
-			 _("Can't Execute Remote Links"),
+			 "",
 			 parent_window);
 			 
 		return;
@@ -887,7 +887,7 @@
 		eel_show_error_dialog
 			(_("There was an error launching the application."),
 			 message,
-			 _("Error Launching Application"),
+			 "",
 			 parent_window);			
 			 
 		g_error_free (error);
@@ -918,7 +918,7 @@
 				(_("This drop target only supports local files."),
 				 _("To open non-local files copy them to a local folder and then"
 				   " drop them again."),
-				 _("Drop Target Only Supports Local Files"),
+				 "",
 				 parent_window);
 			
 			gnome_desktop_item_unref (ditem);
@@ -930,7 +930,7 @@
 				(_("This drop target only supports local files."),
 				 _("To open non-local files copy them to a local folder and then"
 				   " drop them again. The local files you dropped have already been opened."),
-				 _("Drop Target Only Supports Local Files"),
+				 "",
 				 parent_window);
 		}		
 	}
@@ -956,7 +956,7 @@
 		eel_show_error_dialog
 			(_("There was an error launching the application."),
 			 message,
-			 _("Error Launching Application"),
+			 "",
 			 parent_window);			
 			 
 		g_error_free (error);
Index: src/nautilus-application.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-application.c,v
retrieving revision 1.232
diff -u -r1.232 nautilus-application.c
--- src/nautilus-application.c	3 Mar 2005 16:01:44 -0000	1.232
+++ src/nautilus-application.c	5 Mar 2005 19:17:36 -0000
@@ -223,7 +223,6 @@
 	char *directories_as_string;
 	char *error_string;
 	char *detail_string;
-	char *dialog_title;
 	GtkDialog *dialog;
 	int failed_count;
 	
@@ -250,20 +249,18 @@
 		directories_as_string = eel_string_list_as_string (directories, ", ", EEL_STRING_LIST_ALL_STRINGS);
 
 		if (failed_count == 1) {
-			dialog_title = _("Couldn't Create Required Folder");
 			error_string = g_strdup_printf (_("Nautilus could not create the required folder \"%s\"."),
 							directories_as_string);
 			detail_string = _("Before running Nautilus, please create the following folder, or "
 					  "set permissions such that Nautilus can create it.");
 		} else {
-			dialog_title = _("Couldn't Create Required Folders");
 			error_string = g_strdup_printf (_("Nautilus could not create the following required folders: "
 							  "%s."), directories_as_string);
   			detail_string = _("Before running Nautilus, please create these folders, or "
 					  "set permissions such that Nautilus can create them.");
 		}
 		
-		dialog = eel_show_error_dialog (error_string, detail_string, dialog_title, NULL);
+		dialog = eel_show_error_dialog (error_string, detail_string, "", NULL);
 		/* We need the main event loop so the user has a chance to see the dialog. */
 		nautilus_main_event_loop_register (GTK_OBJECT (dialog));
 
@@ -346,7 +343,7 @@
 		eel_show_info_dialog (_("A link called \"Link To Old Desktop\" has been created on the desktop."),
 				      _("The location of the desktop directory has changed in GNOME 2.4. "
 					"You can open the link and move over the files you want, then delete the link."),
-				      _("Migrated Old Desktop"),
+				      "",
 				      NULL);
 	}
 	g_free (old_desktop_dir);
@@ -578,7 +575,7 @@
 		}
 
 		if (message != NULL) {
-			dialog = eel_show_error_dialog_with_details (message, NULL, NULL, detailed_message, NULL);
+			dialog = eel_show_error_dialog_with_details (message, NULL, "", detailed_message, NULL);
 			/* We need the main event loop so the user has a chance to see the dialog. */
 			nautilus_main_event_loop_register (GTK_OBJECT (dialog));
 			goto out;
Index: src/nautilus-bookmarks-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-bookmarks-window.c,v
retrieving revision 1.83
diff -u -r1.83 nautilus-bookmarks-window.c
--- src/nautilus-bookmarks-window.c	14 Feb 2005 10:59:23 -0000	1.83
+++ src/nautilus-bookmarks-window.c	5 Mar 2005 19:17:36 -0000
@@ -33,6 +33,7 @@
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gnome-extensions.h>
+#include <eel/eel-stock-dialogs.h>
 #include <libnautilus-private/nautilus-icon-factory.h>
 #include <libnautilus-private/nautilus-undo-signal-handlers.h>
 #include <gtk/gtkhbbox.h>
@@ -146,19 +147,10 @@
 			gtk_window_get_screen (GTK_WINDOW (dialog)), &error);
 
 		if (error) {
-			GtkWidget *err_dialog;
-			err_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
-							     GTK_DIALOG_DESTROY_WITH_PARENT,
-							     GTK_MESSAGE_ERROR,
-							     GTK_BUTTONS_OK,
-							     _("There was an error displaying help: \n%s"),
-							     error->message);
-
-			g_signal_connect (G_OBJECT (err_dialog),
-					  "response", G_CALLBACK (gtk_widget_destroy),
-					  NULL);
-			gtk_window_set_resizable (GTK_WINDOW (err_dialog), FALSE);
-			gtk_widget_show (err_dialog);
+			eel_show_error_dialog (_("Could not display help"),
+			                       error->message,
+			                       "",
+			                       GTK_WINDOW (dialog));
 			g_error_free (error);
 		}
 	} else if (response_id == GTK_RESPONSE_CLOSE) {
Index: src/nautilus-connect-server-dialog-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-connect-server-dialog-main.c,v
retrieving revision 1.1
diff -u -r1.1 nautilus-connect-server-dialog-main.c
--- src/nautilus-connect-server-dialog-main.c	14 Jan 2005 11:11:38 -0000	1.1
+++ src/nautilus-connect-server-dialog-main.c	5 Mar 2005 19:17:36 -0000
@@ -68,7 +68,7 @@
 
 		error_dialog = eel_show_error_dialog (error_message,
 						      error->message,
-						      _("Can't Display Location"),
+						      "",
 						      NULL);
 
 		open_dialogs++;
Index: src/nautilus-connect-server-dialog.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-connect-server-dialog.c,v
retrieving revision 1.12
diff -u -r1.12 nautilus-connect-server-dialog.c
--- src/nautilus-connect-server-dialog.c	17 Jan 2005 09:08:04 -0000	1.12
+++ src/nautilus-connect-server-dialog.c	5 Mar 2005 19:17:37 -0000
@@ -140,7 +140,7 @@
 				(_("\"%s\" is not a valid location."),
 				 uri);
 			eel_show_error_dialog (error_message, _("Please check the spelling and try again."), 
-					       _("Can't Connect to Server"), GTK_WINDOW (dialog));
+					       "", GTK_WINDOW (dialog));
 			g_free (error_message);
 			return;
 		} else {
@@ -155,7 +155,7 @@
 		if (strlen (server) == 0) {
 			eel_show_error_dialog (_("You must enter a name for the server."), 
 					       _("Please enter a name and try again."), 
-					       _("Can't Connect to Server"), GTK_WINDOW (dialog));
+					       "", GTK_WINDOW (dialog));
 			g_free (server);
 			return;
 		}
Index: src/nautilus-emblem-sidebar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-emblem-sidebar.c,v
retrieving revision 1.3
diff -u -r1.3 nautilus-emblem-sidebar.c
--- src/nautilus-emblem-sidebar.c	29 Nov 2004 16:39:31 -0000	1.3
+++ src/nautilus-emblem-sidebar.c	5 Mar 2005 19:17:37 -0000
@@ -240,7 +240,7 @@
 	} else {
 		error = g_strdup_printf (_("Couldn't remove emblem with name '%s'."), emblem_sidebar->details->popup_emblem_display_name);
 		eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one you added yourself."),
-				       _("Couldn't Remove Emblem"),
+				       "",
 				       NULL);
 		g_free (error);
 	}
@@ -275,7 +275,7 @@
 	} else {
 		error = g_strdup_printf (_("Couldn't rename emblem with name '%s'."), name);
 		eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
-				       _("Couldn't Rename Emblem"),
+				       "",
 				       NULL);
 		g_free (error);
 	}
@@ -776,9 +776,9 @@
 		nautilus_icon_dnd_uri_list_free_strings (uris);
 
 		if (had_failure && emblems != NULL) {
-			eel_show_error_dialog (_("Some of the files could not be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
+			eel_show_error_dialog (_("Some of the files could not be added as emblems."), _("The emblems do not appear to be valid images."), "", NULL);
 		} else if (had_failure && emblems == NULL) {
-			eel_show_error_dialog (_("None of the files could be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
+			eel_show_error_dialog (_("None of the files could be added as emblems."), _("The emblems do not appear to be valid images."), "", NULL);
 
 		}
  
@@ -799,7 +799,7 @@
 		uri = g_strndup (data->data, data->length);
 
 		if (!eel_is_valid_uri (uri)) {
-			eel_show_error_dialog (_("The emblem cannot be added."), _("The dragged text was not a valid file location."), _("Couldn't Add Emblem"), NULL);
+			eel_show_error_dialog (_("The emblem cannot be added."), _("The dragged text was not a valid file location."), "", NULL);
 			break;
 		}
 
@@ -824,7 +824,7 @@
 			} else {
 				error = g_strdup (_("The dragged file does not appear to be a valid image."));
 			}
-			eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
+			eel_show_error_dialog (_("The emblem cannot be added."), error, "",
 					       NULL);
 			g_free (error);
 			g_free (uri_utf8);
@@ -874,7 +874,7 @@
 			g_warning ("Tried to load '%s', but failed.\n",
 				   uri);
 			error = g_strdup_printf (_("The file '%s' does not appear to be a valid image."), uri);
-			eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
+			eel_show_error_dialog (_("The emblem cannot be added."), error, "",
 					       NULL);
 			g_free (error);
 		}
Index: src/nautilus-file-management-properties.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-file-management-properties.c,v
retrieving revision 1.16
diff -u -r1.16 nautilus-file-management-properties.c
--- src/nautilus-file-management-properties.c	16 Jul 2004 12:04:29 -0000	1.16
+++ src/nautilus-file-management-properties.c	5 Mar 2005 19:17:38 -0000
@@ -45,6 +45,7 @@
 #include <eel/eel-gconf-extensions.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-preferences-glade.h>
+#include <eel/eel-stock-dialogs.h>
 
 #include <libnautilus-private/nautilus-column-chooser.h>
 #include <libnautilus-private/nautilus-column-utilities.h>
@@ -212,7 +213,6 @@
 		       char const *sect_id)
 {
 	GError *error = NULL;
-	GtkWidget *dialog;
 
 	g_return_if_fail (helpfile != NULL);
 	g_return_if_fail (sect_id != NULL);
@@ -222,18 +222,10 @@
 				    helpfile, sect_id, &error);
 
 	if (error) {
-		dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
-						 GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("There was an error displaying help: \n%s"),
-						 error->message);
-
-		g_signal_connect (G_OBJECT (dialog),
-				  "response", G_CALLBACK (gtk_widget_destroy),
-				  NULL);
-		gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-		gtk_widget_show (dialog);
+		eel_show_error_dialog (_("Could not display help"),
+		                       error->message,
+		                       "",
+		                       GTK_WINDOW (parent));
 		g_error_free (error);
 	}
 }
Index: src/nautilus-information-panel.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-information-panel.c,v
retrieving revision 1.228
diff -u -r1.228 nautilus-information-panel.c
--- src/nautilus-information-panel.c	25 Nov 2004 14:13:37 -0000	1.228
+++ src/nautilus-information-panel.c	5 Mar 2005 19:17:39 -0000
@@ -546,7 +546,7 @@
 			eel_show_error_dialog (
 				_("You can't assign more than one custom icon at a time."),
 				_("Please drag just one image to set a custom icon."), 
-				_("More Than One Image"),
+				"",
 				window);
 			break;
 		}
@@ -567,14 +567,14 @@
 				eel_show_error_dialog (
 					_("The file that you dropped is not local."),
 					_("You can only use local images as custom icons."), 
-					_("Local Images Only"),
+					"",
 					window);
 			
 			} else {
 				eel_show_error_dialog (
 					_("The file that you dropped is not an image."),
 					_("You can only use images as custom icons."),
-					_("Images Only"),
+					"",
 					window);
 			}
 		}	
@@ -982,7 +982,7 @@
 			    NULL,
 			    &error)) {
 		eel_show_error_dialog (_("Unable to launch the cd burner application."), error->message,
-				       _("Can't Launch CD Burner"),
+				       "",
 				       GTK_WINDOW (gtk_widget_get_toplevel (button)));
 		g_error_free (error);
 	}
Index: src/nautilus-location-bar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-location-bar.c,v
retrieving revision 1.102
diff -u -r1.102 nautilus-location-bar.c
--- src/nautilus-location-bar.c	14 Feb 2005 10:59:23 -0000	1.102
+++ src/nautilus-location-bar.c	5 Mar 2005 19:17:39 -0000
@@ -167,7 +167,7 @@
 			 GTK_MESSAGE_QUESTION,
 			 prompt,
 			 detail,
-			 _("View in Multiple Windows?"),
+			 "",
 			 GTK_STOCK_CANCEL, GTK_STOCK_OK,
 			 NULL) != 0 /* GNOME_OK */;
 
Index: src/nautilus-navigation-window-menus.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-navigation-window-menus.c,v
retrieving revision 1.270
diff -u -r1.270 nautilus-navigation-window-menus.c
--- src/nautilus-navigation-window-menus.c	17 Feb 2005 02:51:08 -0000	1.270
+++ src/nautilus-navigation-window-menus.c	5 Mar 2005 19:17:40 -0000
@@ -135,7 +135,7 @@
 					   
 	dialog = eel_create_question_dialog (prompt,
 					     detail,
-					     _("Clear History"), 
+					     "", 
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					     GTK_STOCK_CLEAR, RESPONSE_FORGET,
 					     GTK_WINDOW (window));
@@ -290,7 +290,7 @@
 	
 	dialog = eel_show_yes_no_dialog (prompt, detail,
 					 _("Bookmark for Nonexistent Location"),
-					 _("Remove"), GTK_STOCK_CANCEL,
+					 "", GTK_STOCK_CANCEL,
 					 GTK_WINDOW (window));
 	
 	eel_gtk_signal_connect_free_data
Index: src/nautilus-property-browser.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-property-browser.c,v
retrieving revision 1.208
diff -u -r1.208 nautilus-property-browser.c
--- src/nautilus-property-browser.c	29 Nov 2004 16:39:31 -0000	1.208
+++ src/nautilus-property-browser.c	5 Mar 2005 19:17:41 -0000
@@ -904,7 +904,7 @@
 	if (gnome_vfs_unlink (pattern_uri) != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but pattern %s couldn't be deleted."), pattern_name);
 		char *detail = _("Check that you have permission to delete the pattern.");
-		eel_show_error_dialog (message, detail, _("Couldn't Delete Pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, detail, "", GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 	
@@ -934,7 +934,7 @@
 	if (gnome_vfs_unlink (emblem_uri) != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but emblem %s couldn't be deleted."), emblem_name);
 		char *detail = _("Check that you have permission to delete the emblem.");
-		eel_show_error_dialog (message, detail, _("Couldn't Delete Emblem"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, detail, "", GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 	else {
@@ -1099,7 +1099,7 @@
 			message = g_strdup (_("Sorry, but you did not supply a valid file name."));
 			detail = _("Please try again.");
 		}
-		eel_show_error_dialog (message, detail, _("Couldn't Install Pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, detail, "", GTK_WINDOW (property_browser));
 		g_free (message);
 		return;
 	}
@@ -1112,7 +1112,7 @@
 	if (basename && eel_strcmp (basename, RESET_IMAGE_NAME) == 0) {
 		eel_show_error_dialog (_("Sorry, but you can't replace the reset image."), 
 		                       _("Reset is a special image that cannot be deleted."), 
-		                       _("Not an Image"), NULL);
+		                       "", NULL);
 		g_free (path_uri);
 		g_free (basename);
 		return;
@@ -1144,7 +1144,7 @@
 	result = eel_copy_uri_simple (path_name, destination_name);		
 	if (result != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but the pattern %s couldn't be installed."), path_name);
-		eel_show_error_dialog (message, NULL, _("Couldn't Install Pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, NULL, "", GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 		
@@ -1226,7 +1226,7 @@
 		if (strlen (stripped_color_name) == 0) {
 			eel_show_error_dialog (_("The color cannot be installed."),
 					       _("Sorry, but you must specify a non-blank name for the new color."), 
-			                       _("Couldn't Install Color"), GTK_WINDOW (property_browser));
+			                       "", GTK_WINDOW (property_browser));
 		
 		} else {
 			add_color_to_file (property_browser, color_spec, stripped_color_name);
@@ -1316,7 +1316,7 @@
 				} else {
 					char *message = g_strdup_printf
 						(_("Sorry, but \"%s\" is not a usable image file."), emblem_path);
-					eel_show_error_dialog (_("The file is not an image."), message, _("Not an Image"), GTK_WINDOW (property_browser));
+					eel_show_error_dialog (_("The file is not an image."), message, "", GTK_WINDOW (property_browser));
 					g_free (message);
 					g_free (emblem_path);
 					return;
@@ -1332,7 +1332,7 @@
 		if (pixbuf == NULL) {
 			char *message = g_strdup_printf
 				(_("Sorry, but \"%s\" is not a usable image file."), property_browser->details->image_path);
-			eel_show_error_dialog (_("The file is not an image."), message, _("Not an Image"), GTK_WINDOW (property_browser));
+			eel_show_error_dialog (_("The file is not an image."), message, "", GTK_WINDOW (property_browser));
 			g_free (message);
 		}
 		
@@ -1432,25 +1432,16 @@
 help_button_callback (GtkWidget *widget, GtkWidget *property_browser)
 {
 	GError *error = NULL;
-	GtkWidget *dialog;
 
 	gnome_help_display_desktop_on_screen (
 		NULL, "user-guide", "user-guide.xml", "gosnautilus-50",
 		gtk_window_get_screen (GTK_WINDOW (property_browser)), &error);
 
 	if (error) {
-		dialog = gtk_message_dialog_new (GTK_WINDOW (property_browser),
-						 GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("There was an error displaying help: \n%s"),
-						 error->message);
-
-		g_signal_connect (G_OBJECT (dialog),
-				  "response", G_CALLBACK (gtk_widget_destroy),
-				  NULL);
-		gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-		gtk_widget_show (dialog);
+		eel_show_error_dialog (_("Could not display help"),
+		                       error->message,
+		                       "",
+		                       GTK_WINDOW (property_browser));
 		g_error_free (error);
 	}
 }
Index: src/nautilus-window-manage-views.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-manage-views.c,v
retrieving revision 1.347
diff -u -r1.347 nautilus-window-manage-views.c
--- src/nautilus-window-manage-views.c	14 Feb 2005 10:59:23 -0000	1.347
+++ src/nautilus-window-manage-views.c	5 Mar 2005 19:17:43 -0000
@@ -576,7 +576,7 @@
 
 	label = nautilus_window_get_view_label (window);
 	message = g_strdup_printf (message, label);
-	eel_show_error_dialog (message, detail, _("View Failed"), GTK_WINDOW (window));
+	eel_show_error_dialog (message, detail, "", GTK_WINDOW (window));
 	g_free (label);
 }
 
@@ -1322,7 +1322,6 @@
 	char *error_message;
 	char *detail_message;
 	char *scheme_string;
-	char *dialog_title;
 	const char *host_name;
 	GtkDialog *dialog;
 	GnomeVFSURI *vfs_uri;
@@ -1339,8 +1338,6 @@
 		(full_uri_for_display, MAX_URI_IN_DIALOG_LENGTH);
 	g_free (full_uri_for_display);
 	
-	dialog_title = NULL;
-        
 	switch (result_code) {
 	case GNOME_VFS_OK:
 		if (nautilus_file_is_directory (file)) {
@@ -1434,13 +1431,8 @@
 		detail_message = g_strdup (_("Please select another viewer and try again."));
 	}
 	
-	if (dialog_title == NULL) {
-		dialog_title = g_strdup (_("Can't Display Location"));
-	}
-
-	dialog = eel_show_error_dialog (error_message, detail_message, dialog_title, NULL);
+	dialog = eel_show_error_dialog (error_message, detail_message, "", NULL);
 	
-	g_free (dialog_title);
 	g_free (uri_for_display);
 	g_free (error_message);
 	g_free (detail_message);
Index: src/nautilus-window-menus.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-menus.c,v
retrieving revision 1.279
diff -u -r1.279 nautilus-window-menus.c
--- src/nautilus-window-menus.c	24 Jan 2005 09:38:55 -0000	1.279
+++ src/nautilus-window-menus.c	5 Mar 2005 19:17:43 -0000
@@ -479,7 +479,6 @@
 {
 	NautilusWindow *window;
 	GError *error;
-	GtkWidget *dialog;
 
 	error = NULL;
 	window = NAUTILUS_WINDOW (user_data);
@@ -495,18 +494,10 @@
 	}
 
 	if (error) {
-		dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-						 GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("There was an error displaying help: \n%s"),
-						 error->message);
-		g_signal_connect (G_OBJECT (dialog), "response",
-				  G_CALLBACK (gtk_widget_destroy),
-				  NULL);
-
-		gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-		gtk_widget_show (dialog);
+		eel_show_error_dialog (_("Could not display help"),
+		                       error->message,
+		                       "",
+		                       GTK_WINDOW (window));
 		g_error_free (error);
 	}
 }
Index: src/nautilus-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.c,v
retrieving revision 1.443
diff -u -r1.443 nautilus-window.c
--- src/nautilus-window.c	22 Feb 2005 08:46:38 -0000	1.443
+++ src/nautilus-window.c	5 Mar 2005 19:17:44 -0000
@@ -933,11 +933,10 @@
 void
 nautilus_window_display_error (NautilusWindow *window, const char *error_msg)
 {
-	GtkWidget *dialog;
-	
-	dialog = gtk_message_dialog_new (GTK_WINDOW (window), 0, GTK_MESSAGE_ERROR,
-					 GTK_BUTTONS_OK, error_msg, NULL);
-	gtk_widget_show (dialog);
+	eel_show_error_dialog (error_msg,
+	                       NULL,
+	                       "",
+	                       GTK_WINDOW (window));
 }
 
 static char *
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.660
diff -u -r1.660 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	9 Feb 2005 10:51:53 -0000	1.660
+++ src/file-manager/fm-directory-view.c	5 Mar 2005 19:17:50 -0000
@@ -499,7 +499,6 @@
 {
 	GtkDialog *dialog;
 	char *prompt;
-	char *title;
 	char *detail;
 	int response;
 
@@ -507,15 +506,13 @@
 		return TRUE;
 	}
 
-	title = g_strdup_printf (ngettext("Open %d Window?", "Open %d Windows?", count), count);
 	prompt = _("Are you sure you want to open all files?");
 	detail = g_strdup_printf (ngettext("This will open %d separate window.",
 					   "This will open %d separate windows.", count), count);
-	dialog = eel_show_yes_no_dialog (prompt, detail, title, 
+	dialog = eel_show_yes_no_dialog (prompt, detail, "", 
 					 GTK_STOCK_OK, GTK_STOCK_CANCEL,
 					 fm_directory_view_get_containing_window (view));
 	g_free (detail);
-	g_free (title);
 
 	response = gtk_dialog_run (dialog);
 	gtk_object_destroy (GTK_OBJECT (dialog));
@@ -823,7 +820,7 @@
 	dialog = eel_show_yes_no_dialog
 		(prompt,
 		 _("If you delete an item, it is permanently lost."), 
-		 _("Delete?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
+		 "", GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
 		 fm_directory_view_get_containing_window (view));
 
 	g_free (prompt);
@@ -1962,7 +1959,7 @@
 
 	dialog = eel_show_warning_dialog (message,
 					  _("Some files will not be displayed."),
-					  _("Too Many Files"),
+					  "",
 					  fm_directory_view_get_containing_window (view));
 	g_free (message);
 }
@@ -3125,7 +3122,7 @@
 
 	dialog = eel_show_yes_no_dialog
 		(prompt,
-		 detail, _("Delete Immediately?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
+		 detail, "", GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
 		 fm_directory_view_get_containing_window (view));
 	
 	g_free (detail);
@@ -3171,7 +3168,7 @@
 
 	dialog = eel_show_yes_no_dialog (
 		prompt, _("If you delete an item, it will be permanently lost."), 
-		_("Delete From Trash?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
+		"", GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
 		fm_directory_view_get_containing_window (view));
 
 	g_free (prompt);
@@ -3753,7 +3750,7 @@
 
 	dialog = eel_create_question_dialog (prompt,
 					     detail,
-					     _("Run or Display?"),
+					     "",
 					     _("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
      					     _("_Display"), RESPONSE_DISPLAY,
 					     fm_directory_view_get_containing_window (view));
@@ -4169,7 +4166,7 @@
 				       GTK_BUTTONS_NONE,
 				       primary,
 				       secondary,
-				       primary);
+				       "");
 
 	g_free (primary);
 	g_free (secondary);
@@ -5027,7 +5024,7 @@
 		   "Scripts menu."),
 		 _("Choosing a script from the menu will run "
 		   "that script with any selected items as input."), 
-		 _("About Scripts"),
+		 "",
 		 _("All executable files in this folder will appear in the "
 		   "Scripts menu. Choosing a script from the menu will run "
 		   "that script.\n\n"
@@ -5397,7 +5394,7 @@
 {
 	if (!succeeded) {
 		eel_show_error_dialog_with_details (error, NULL,
-						    _("Mount Error"), detailed_error, NULL);
+						    "", detailed_error, NULL);
 	}
 }
 
@@ -5454,7 +5451,7 @@
 {
 	if (!succeeded) {
 		eel_show_error_dialog_with_details (error, NULL, 
-		                                    _("Unmount Error"), detailed_error, NULL);
+		                                    "", detailed_error, NULL);
 	}
 }
 
@@ -5467,7 +5464,7 @@
 {
 	if (!succeeded) {
 		eel_show_error_dialog_with_details (error, NULL, 
-		                                    _("Eject Error"), detailed_error, NULL);
+		                                    "", detailed_error, NULL);
 	}
 }
 
@@ -6578,7 +6575,7 @@
 	}
 
 	dialog = eel_show_yes_no_dialog (prompt,
-					 detail, _("Broken Link"), _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
+					 detail, "", _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
 					 fm_directory_view_get_containing_window (view));
 
 	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_YES);
@@ -6780,7 +6777,7 @@
 			stop_activate (parameters);
 
 			eel_show_error_dialog_with_details (error, NULL,
-							    _("Mount Error"),
+							    "",
 			                                    detailed_error, 
 							    NULL);
 		}
@@ -6905,7 +6902,7 @@
 		(DELAY_UNTIL_CANCEL_MSECS,
 		 cancel_activate_callback,
 		 parameters,
-		 _("Cancel Open?"),
+		 "",
 		 timed_wait_prompt,
 		 fm_directory_view_get_containing_window (view));
 	g_free (timed_wait_prompt);
@@ -7850,7 +7847,7 @@
 				    EEL_VFS_CAPABILITY_IS_REMOTE_AND_SLOW)) {
 		eel_show_warning_dialog (_("Drag and drop is not supported."),
 					 _("Drag and drop is only supported on local file systems."),
-					 _("Drag and Drop Error"),
+					 "",
 					 fm_directory_view_get_containing_window (view));
 		g_free (container_uri);
 		return;
@@ -7872,7 +7869,7 @@
 	    (action != GDK_ACTION_LINK)) {
 		eel_show_warning_dialog (_("Drag and drop is not supported."),
 					 _("An invalid drag type was used."),
-					 _("Drag and Drop Error"),
+					 "",
 					 fm_directory_view_get_containing_window (view));
 		g_free (container_uri);
 		return;
@@ -7986,7 +7983,7 @@
 	    (action != GDK_ACTION_LINK)) {
 		eel_show_warning_dialog (_("Drag and drop is not supported."),
 					 _("An invalid drag type was used."),
-					 _("Drag and Drop Error"),
+					 "",
 					 fm_directory_view_get_containing_window (view));
 		g_free (container_uri);
 		return;
Index: src/file-manager/fm-error-reporting.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-error-reporting.c,v
retrieving revision 1.38
diff -u -r1.38 fm-error-reporting.c
--- src/file-manager/fm-error-reporting.c	11 Dec 2003 10:38:16 -0000	1.38
+++ src/file-manager/fm-error-reporting.c	5 Mar 2005 19:17:50 -0000
@@ -69,7 +69,7 @@
 	}
 
 	eel_show_error_dialog (_("The folder contents could not be displayed."), message, 
-	                       _("Error Displaying Folder"), parent_window);
+	                       "", parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -142,7 +142,7 @@
 	g_free (new_name_truncated);
 
 	eel_show_error_dialog (_("The item could not be renamed."), message, 
-	                       _("Renaming Error"), parent_window);
+	                       "", parent_window);
 	g_free (message);
 }
 
@@ -178,7 +178,7 @@
 		g_free (file_name);
 	}
 
-	eel_show_error_dialog (_("The group could not be changed."), message , _("Error Setting Group"), parent_window);
+	eel_show_error_dialog (_("The group could not be changed."), message , "", parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -210,7 +210,7 @@
 		message = g_strdup_printf (_("Sorry, couldn't change the owner of \"%s\"."), file_name);
 	}
 
-	eel_show_error_dialog (_("The owner could not be changed."), message, _("Error Setting Owner"), parent_window);
+	eel_show_error_dialog (_("The owner could not be changed."), message, "", parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -243,7 +243,7 @@
 	}
 
 	eel_show_error_dialog (_("The permissions could not be changed."), message,
-	                       _("Error Setting Permissions"), parent_window);
+	                       "", parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -314,7 +314,7 @@
 					new_name);
 	g_free (old_name);
 	eel_timed_wait_start (cancel_rename_callback, file,
-				   _("Cancel Rename?"), wait_message,
+				   "", wait_message,
 				   NULL); /* FIXME bugzilla.gnome.org 42395: Parent this? */
 	g_free (wait_message);
 
Index: src/file-manager/fm-properties-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-properties-window.c,v
retrieving revision 1.213
diff -u -r1.213 fm-properties-window.c
--- src/file-manager/fm-properties-window.c	24 Feb 2005 09:13:32 -0000	1.213
+++ src/file-manager/fm-properties-window.c	5 Mar 2005 19:17:52 -0000
@@ -483,7 +483,7 @@
 		eel_show_error_dialog
 			(_("You can't assign more than one custom icon at a time!"),
 			 _("Please drag just one image to set a custom icon."), 
-			 _("More Than One Image"),
+			 "",
 			 window);
 	} else {		
 		if (uri_is_local_image (uris[0])) {			
@@ -494,14 +494,14 @@
 				eel_show_error_dialog
 					(_("The file that you dropped is not local."),
 					 _("You can only use local images as custom icons."), 
-					 _("Local Images Only"),
+					 "",
 					 window);
 				
 			} else {
 				eel_show_error_dialog
 					(_("The file that you dropped is not an image."),
 					 _("You can only use local images as custom icons."),
-					 _("Images Only"),
+					 "",
 					 window);
 			}
 		}		
@@ -1448,7 +1448,7 @@
 	eel_timed_wait_start
 		(cancel_group_change_callback,
 		 pair->file,
-		 _("Cancel Group Change?"),
+		 "",
 		 _("Changing group."),
 		 NULL); /* FIXME bugzilla.gnome.org 42397: Parent this? */
 	nautilus_file_set_group
@@ -1610,7 +1610,7 @@
 	eel_timed_wait_start
 		(cancel_owner_change_callback,
 		 pair->file,
-		 _("Cancel Owner Change?"),
+		 "",
 		 _("Changing owner."),
 		 NULL); /* FIXME bugzilla.gnome.org 42397: Parent this? */
 	nautilus_file_set_owner
@@ -3257,7 +3257,7 @@
 &error);
 
 	if (error) {
-		eel_show_error_dialog (_("There was an error displaying help."), error->message, _("Couldn't Show Help"),
+		eel_show_error_dialog (_("There was an error displaying help."), error->message, "",
 				       GTK_WINDOW (property_window));
 		g_error_free (error);
 	}
@@ -3652,7 +3652,7 @@
 	eel_timed_wait_start
 		(cancel_create_properties_window_callback,
 		 startup_data,
-		 _("Cancel Showing Properties Window?"),
+		 "",
 		 _("Creating Properties window."),
 		 parent_window == NULL ? NULL : GTK_WINDOW (parent_window));
 
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 -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	5 Mar 2005 19:17:53 -0000
@@ -1054,10 +1054,10 @@
 	if (!succeeded) {
 		if (eject) {
 			eel_show_error_dialog_with_details (error, NULL, 
-			                                    _("Eject Error"), detailed_error, NULL);
+			                                    "", detailed_error, NULL);
 		} else {
 			eel_show_error_dialog_with_details (error, NULL, 
-			                                    _("Unmount Error"), detailed_error, NULL);
+			                                    "", detailed_error, NULL);
 		}
 	}
 }
