Index: launcher.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/launcher.c,v
retrieving revision 1.240
diff -u -r1.240 launcher.c
--- launcher.c	26 May 2003 16:44:24 -0000	1.240
+++ launcher.c	9 Jun 2003 18:15:06 -0000
@@ -167,11 +167,17 @@
 		panel_ditem_launch (
 			item, NULL, 0, launcher_get_screen (launcher), &error);
 		if (error) {
+			char *msg;
+			msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+				_("Cannot launch icon"),
+				_("Details"), error->message);
+
 			panel_error_dialog (
 				launcher_get_screen (launcher),
 				"cannot_launch_icon",
-				_("<b>Cannot launch icon</b>\n\n"
-				"Details: %s"), error->message);
+				msg);
+
+			g_free (msg);
 			g_clear_error (&error);
 		}
 	}
@@ -1080,11 +1086,17 @@
 				launcher->ditem, "X-GNOME-DocPath");
 	panel_show_gnome_kde_help (screen, docpath, &error);
 	if (error) {
+		char *msg;
+		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+			_("Cannot display help document"),
+			_("Details"), error->message);
+
 		panel_error_dialog (
 			screen,
 			"cannot_show_gnome_kde_help",
-			_("<b>Cannot display help document</b>\n\nDetails: %s"),
-			error->message);
+			msg);
+
+		g_free (msg);
 		g_error_free (error);
 	}
 }
Index: menu.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu.c,v
retrieving revision 1.662
diff -u -r1.662 menu.c
--- menu.c	26 May 2003 13:41:07 -0000	1.662
+++ menu.c	9 Jun 2003 18:15:10 -0000
@@ -367,12 +367,19 @@
 {
 	GdkScreen *screen = menuitem_to_screen (menuitem);
 
-	if (egg_screen_execute_async (screen, g_get_home_dir (), 1, &program_path) < 0)
+	if (egg_screen_execute_async (screen, g_get_home_dir (), 1, &program_path) < 0) {
+		char *msg;
+		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s %s",
+			_("Can't execute 'About GNOME'"),
+			_("Details"), program_path,
+			_("probably does not exist"));
+
 		panel_error_dialog (screen,
-				    "cannot_exec_about_gnome",
-				    _("<b>Can't execute 'About GNOME'</b>\n\n"
-				    "Details: %s probably does not exist"),
-				    program_path);
+		                    "cannot_exec_about_gnome",
+		                    msg);
+
+		g_free (msg);
+	}
 }
 
 static void
@@ -391,21 +398,34 @@
 		panel_ditem_launch (
 			item, NULL, 0, menuitem_to_screen (menuitem), &error);
 		if (error) {
+			char *msg;
+			msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+				_("Can't launch entry"),
+				_("Details"), error->message);
+
 			panel_error_dialog (
 				menuitem_to_screen (menuitem),
 				"cant_launch_entry",
-				_("<b>Can't launch entry</b>\n\n"
-				  "Details: %s"), error->message);
+				msg);
+
+			g_free (msg);
 			g_clear_error (&error);
 		}
 		gnome_desktop_item_unref (item);
 	} else {
+		char *msg;
 		g_assert (error != NULL);
+
+		msg = g_strdup_printf ("<b>%s</b>%s: %s",
+			_("Can't load entry"),
+			_("Details"), error->message);
+
 		panel_error_dialog (
 			menuitem_to_screen (menuitem),
 			"cant_load_entry",
-			_("<b>Can't load entry</b>\n\n"
-			  "Details: %s"), error->message);
+			msg);
+
+		g_free (msg);
 		g_clear_error (&error);
 	}
 }
@@ -1098,17 +1118,21 @@
 	result = gnome_vfs_unlink (sim->item_loc);
 
 	if (result != GNOME_VFS_OK) {
-		char *esc;
+		char *esc, *msg;
 
 		esc = g_markup_escape_text (sim->item_loc, -1);
+		msg = g_strdup_printf ("<b>%s %s</b>\n\n%s: %s\n",
+			_("Could not remove the menu item"),
+			esc,
+			_("Details"),
+			gnome_vfs_result_to_string (result));
 
 		panel_error_dialog (
 			menuitem_to_screen (sim->menuitem),
 			"cant_remove_menu_item",
-			_("<b>Could not remove the menu item %s</b>\n\n"
-			  "Details: %s\n"), 
-			esc,
-			gnome_vfs_result_to_string (result));
+			msg);
+
+		g_free (msg);
 		g_free (esc);
 		return;
 	}
@@ -1188,21 +1212,35 @@
 
 		if (exec != NULL)
 			panel_run_dialog_present_with_text (menuitem_to_screen (sim->menuitem), exec);
-		else
+		else {
+			char *msg;
+			msg = g_strdup_printf ("<b>%s</b>\n\n%s",
+				_("Can't add to run box"),
+				_("Details: No 'Exec' or 'URL' field in entry"));
+
 			panel_error_dialog (
 				menuitem_to_screen (sim->menuitem),
 				"no_exec_or_url_field",
-				_("<b>Can't add to run box</b>\n\n"
-				  "Details: No 'Exec' or 'URL' field in entry"));
+				msg);
+
+			g_free (msg);
+		}
 
 		gnome_desktop_item_unref (item);
 	} else {
+		char *msg;
 		g_assert (error != NULL);
+
+		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+			_("Can't load entry"),
+			_("Details"), error->message);
+
 		panel_error_dialog (
 			menuitem_to_screen (sim->menuitem),
 			"cant_load_entry",
-			_("<b>Can't load entry</b>\n\n"
-			  "Details: %s"), error->message);
+			msg);
+
+		g_free (msg);
 		g_clear_error (&error);
 	}
 }
@@ -1224,22 +1262,35 @@
 		const char *docpath = gnome_desktop_item_get_string
 			(item, "X-GNOME-DocPath");
 		if ( ! panel_show_gnome_kde_help (screen, docpath, &error)) {
+			char *msg;
+			msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+				_("Cannot display help document"),
+				_("Details"), error->message);
+
 			panel_error_dialog (
 				screen,
 				"cannot_show_gnome_kde_help",
-				_("<b>Cannot display help document</b>\n\n"
-				  "Details: %s"), error->message);
+				msg);
+
+			g_free (msg);
 			g_clear_error (&error);
 		}
 
 		gnome_desktop_item_unref (item);
 	} else {
+		char *msg;
 		g_assert (error != NULL);
+
+		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+			_("Can't load entry"),
+			_("Details"), error->message);
+
 		panel_error_dialog (
 			screen,
 			"cant_load_entry",
-			_("<b>Can't load entry</b>\n\n"
-			  "Details: %s"), error->message);
+			msg);
+
+		g_free (msg);
 		g_clear_error (&error);
 	}
 }
Index: menu-ditem.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu-ditem.c,v
retrieving revision 1.17
diff -u -r1.17 menu-ditem.c
--- menu-ditem.c	26 May 2003 13:41:07 -0000	1.17
+++ menu-ditem.c	9 Jun 2003 18:15:10 -0000
@@ -116,12 +116,19 @@
 
 	saving_error = g_object_get_data (G_OBJECT (dedit), "SavingError");
 
-	if (saving_error)
+	if (saving_error) {
+		char *msg;
+		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+			_("Cannot save changes to launcher"),
+			_("Details"), saving_error);
+
 		panel_error_dialog (
 			gtk_window_get_screen (GTK_WINDOW (dialog)),
 			"cannot_save_entry",
-			_("<b>Cannot save changes to launcher</b>\n\n"
-			  "Details: %s"), saving_error);
+			msg);
+
+		g_free (msg);
+	}
 }
 
 static gboolean
@@ -488,12 +495,17 @@
 				 TRUE /* force */,
 				 &error);
 	if (error) {
+		char *msg;
+		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+			_("Cannot save menu item to disk"),
+			_("Details"), error->message);
+
 		panel_error_dialog (
 			gtk_window_get_screen (GTK_WINDOW (d)),
 			"cannot_save_menu_item" /* class */,
-			_("<b>Cannot save menu item to disk</b>\n\n"
-			  "Details: %s"),
-			error->message);
+			msg);
+
+		g_free (msg);
 		g_clear_error (&error);
 	}
 
Index: panel-util.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.c,v
retrieving revision 1.129
diff -u -r1.129 panel-util.c
--- panel-util.c	26 May 2003 13:41:07 -0000	1.129
+++ panel-util.c	9 Jun 2003 18:15:12 -0000
@@ -70,12 +70,17 @@
 	GError *error = NULL;
 
 	if (!egg_help_display_desktop_on_screen (NULL, "user-guide", doc_name, linkid, screen, &error)) {
+		char *msg;
+		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
+			_("Cannot display help document"),
+			_("Details"), error != NULL ? error->message : "");
+
 		panel_error_dialog (
 			screen,
 			"cannot_show_help",
-			_("<b>Cannot display help document</b>\n\n"
-			  "Details: %s"),
-			error != NULL ? error->message : "");
+			msg);
+
+		g_free (msg);
 		g_clear_error (&error);
 	}
 }
@@ -922,11 +927,18 @@
 	if (!screen)
 		screen = gdk_screen_get_default ();
 
-	if (egg_screen_execute_async (screen, g_get_home_dir (), 2, argv) < 0)
+	if (egg_screen_execute_async (screen, g_get_home_dir (), 2, argv) < 0) {
+		char *msg;
+		msg = g_strdup_printf ("<b>%s</b>\n\n%s",
+			_("Cannot execute xscreensaver"),
+			_("Details: xscreensaver-command not found"));
+
 		panel_error_dialog (screen,
-				    "cannot_exec_xscreensaver",
-				    _("<b>Cannot execute xscreensaver</b>\n\n"
-				    "Details: xscreensaver-command not found"));
+			"cannot_exec_xscreensaver",
+			msg);
+
+		g_free (msg);
+	}
 }
 
 
Index: panel-run-dialog.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-run-dialog.c,v
retrieving revision 1.2
diff -u -r1.2 panel-run-dialog.c
--- panel-run-dialog.c	22 May 2003 15:45:19 -0000	1.2
+++ panel-run-dialog.c	9 Jun 2003 18:15:14 -0000
@@ -272,9 +272,14 @@
 				&error);
 			
 	if (!result) {
-		panel_error_dialog (screen, "error_spawning_command",
-				    _("<b>Error launching command: '%s'</b>\n\nDetails: %s"),
-				    escaped, error->message);	    
+		char *msg;
+		msg = g_strdup_printf ("<b>%s: '%s'</b>\n\n%s: %s",
+			_("Error launching command"), escaped,
+			_("Details"), error->message);
+
+		panel_error_dialog (screen, "error_spawning_command", msg);
+
+		g_free (msg);
 		g_error_free (error);
 	}
 				
@@ -301,9 +306,14 @@
 	g_strfreev (envp);
 
 	if (error) {
-		panel_error_dialog (screen, "error_showing_url",
-				_("<b>Error displaying location: '%s'</b>\n\nDetails: %s"),
-				escaped, error->message);
+		char *msg;
+		msg = g_strdup_printf ("<b>%s: '%s'</b>\n\n%s: %s",
+			_("Error displaying location"), escaped,
+			_("Details"), error->message);
+
+		panel_error_dialog (screen, "error_showing_url", msg);
+
+		g_free (msg);
 		g_error_free (error);
 		return FALSE;
 	}
