Index: ./applets/fish/fish.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/fish/fish.c,v
retrieving revision 1.102
diff -u -r1.102 fish.c
--- ./applets/fish/fish.c	27 May 2003 12:32:56 -0000	1.102
+++ ./applets/fish/fish.c	17 Jun 2003 09:40:43 -0000
@@ -191,14 +191,12 @@
 	    !strncmp (text, "tail ", 5)) {
 		char       *message;
 		const char *warning_format =
-				_("Warning:  The command "
-				  "appears to be something actually useful.\n"
-				   "Since this is a useless applet, you "
-				   "may not want to do this.\n"
-				   "We strongly advise you against "
-				   "using %s for anything\n"
-				   "which would make the applet "
-				   "\"practical\" or useful.");
+				_("Warning: The command appears to be "
+				   "something actually useful. Since this is a "
+				   "useless applet, you may not want to do "
+				   "this. We strongly advise you against using "
+				   "%s for anything which would make the "
+				   "applet \"practical\" or useful.");
 
 		message = g_strdup_printf (warning_format, fish->name);
 
@@ -490,7 +488,7 @@
 
 	if (!fish->command) {
 		something_fishy_going_on (
-			fish, _("Unable to get the name of the command to execute"));
+			fish, _("Cannot get the name of the command to execute"));
 		return NULL;
 	}
 
@@ -507,7 +505,7 @@
 
 	if (!retval)
 		something_fishy_going_on (
-			fish, _("Unable to locate the command to execute"));
+			fish, _("Cannot locate the command to execute"));
 
 	return retval;
 }
@@ -660,8 +658,12 @@
 	if (error) {
 		char *message;
 
-		message = g_strdup_printf (_("Unable to execute '%s'\n\nDetails: %s"),
-					   fortune_command, error->message);
+		message = g_strconcat ("<b>",
+				       _("Cannot execute '%s'"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
+		message = g_strdup_printf (message, fortune_command, error->message);
 		something_fishy_going_on (fish, message);
 		g_free (message);
 		g_error_free (error);
@@ -679,12 +681,17 @@
 
 	if (utf8_output)
 		insert_fortune_text (fish, utf8_output);
-	else
-		insert_fortune_text (fish, 
-				     _("You do not have fortune installed "
-				       "or you have not specified a program "
-				       "to run.\n\nPlease refer to fish "
-				       "properties dialog."));
+	else {
+		char *text;
+		text = g_strconcat (_("'fortune' is not installed or you have "
+				      "not specified a program to run."),
+				    "\n\n",
+				    _("Please refer to the fish preferences "
+				      "dialog."),
+				    NULL);
+		insert_fortune_text (fish, text);
+		g_free (text);
+	}
 
 	g_free (output);
 	g_free (utf8_output);
@@ -1279,12 +1286,18 @@
 change_water (FishApplet *fish)
 {
 	GtkWidget *dialog;
+	char *tmp_str;
 
+	tmp_str = g_strconcat (_("The water needs changing!"),
+			       "\n",
+			       _("(Look at today's date)"),
+			       NULL);
 	dialog = gtk_message_dialog_new (
 			NULL, 0, GTK_MESSAGE_INFO,
 			GTK_BUTTONS_OK,
-			_("The water needs changing!\n"
-			  "(Look at today's date)"));
+			tmp_str);
+	g_free (tmp_str);
+
 	gtk_window_set_wmclass (GTK_WINDOW (dialog), "fish", "Fish");
 	gtk_window_set_screen (GTK_WINDOW (dialog),
 			       gtk_widget_get_screen (GTK_WIDGET (fish)));
Index: ./applets/wncklet/showdesktop.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/wncklet/showdesktop.c,v
retrieving revision 1.9
diff -u -r1.9 showdesktop.c
--- ./applets/wncklet/showdesktop.c	13 May 2003 16:20:04 -0000	1.9
+++ ./applets/wncklet/showdesktop.c	17 Jun 2003 09:40:43 -0000
@@ -291,8 +291,13 @@
         }
 
         if (sdd->icon == NULL) {
-                g_printerr (_("Failed to load %s: %s\n"),
-                            file, error ? error->message : _("File not found"));
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Failed to load %s: %s"),
+				       "\n",
+				       NULL);
+		g_printerr (tmp_str, file, error ?
+				error->message : _("File not found"));
+		g_free (tmp_str);
                 if (error)
                         g_error_free (error);
         }
Index: ./applets/wncklet/workspace-switcher.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/wncklet/workspace-switcher.c,v
retrieving revision 1.56
diff -u -r1.56 workspace-switcher.c
--- ./applets/wncklet/workspace-switcher.c	15 May 2003 11:50:54 -0000	1.56
+++ ./applets/wncklet/workspace-switcher.c	17 Jun 2003 09:40:43 -0000
@@ -348,8 +348,13 @@
 	error = NULL;
 	pager->n_rows = panel_applet_gconf_get_int (applet, "num_rows", &error);
 	if (error) {
-                g_printerr (_("Error loading num_rows value for Workspace Switcher: %s\n"),
-                            error->message);
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Error loading %s value for "
+					 "workspace switcher: %s"),
+				       "\n",
+				       NULL);
+		g_printerr (tmp_str, "num_rows", error->message);
+		g_free (tmp_str);
 		g_error_free (error);
                 /* leave current value */
 	}
@@ -359,8 +364,13 @@
 	error = NULL;
 	display_names = panel_applet_gconf_get_bool (applet, "display_workspace_names", &error);
 	if (error) {
-                g_printerr (_("Error loading display_workspace_names value for Workspace Switcher: %s\n"),
-                            error->message);
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Error loading %s value for "
+					 "workspace switcher: %s"),
+					 "\n",
+					 NULL);
+                g_printerr (tmp_str, "display_workspace_names", error->message);
+		g_free (tmp_str);
 		g_error_free (error);
                 /* leave current value */
 	}
@@ -374,8 +384,13 @@
 	error = NULL;
 	pager->display_all = panel_applet_gconf_get_bool (applet, "display_all_workspaces", &error);
 	if (error) {
-                g_printerr (_("Error loading display_all_workspaces value for Workspace Switcher: %s\n"),
-                            error->message);
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Error loading %s value for "
+					 "workspace switcher: %s"),
+				       "\n",
+				       NULL);
+                g_printerr (tmp_str, "display_all_workspaces", error->message);
+		g_free (tmp_str);
 		g_error_free (error);
                 /* leave current value */
 	}
Index: ./gnome-panel/applet.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/applet.c,v
retrieving revision 1.207
diff -u -r1.207 applet.c
--- ./gnome-panel/applet.c	5 Jun 2003 12:48:15 -0000	1.207
+++ ./gnome-panel/applet.c	17 Jun 2003 09:40:44 -0000
@@ -1034,7 +1034,7 @@
 				break;
 
 		if (!l) {
-			g_warning (_("Can't find an empty spot"));
+			g_warning (_("Cannot find an empty spot"));
 			panel_profile_delete_object (info);
 			return NULL;
 		}
Index: ./gnome-panel/button-widget.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/button-widget.c,v
retrieving revision 1.117
diff -u -r1.117 button-widget.c
--- ./gnome-panel/button-widget.c	12 May 2003 12:54:54 -0000	1.117
+++ ./gnome-panel/button-widget.c	17 Jun 2003 09:40:44 -0000
@@ -270,12 +270,19 @@
 			button->pixbuf = button_load_pixbuf (
 						button->filename, button->size, &error);
 			if (error) {
+				char *tmp_str;
+				tmp_str = g_strconcat ("<b>",
+						       _("Failed to load "
+							 "image %s"),
+						       "</b>\n\n",
+						       _("Details: %s"),
+						       NULL);
 				panel_error_dialog (gdk_screen_get_default (),
 						    "cannot_load_pixbuf",
-						    _("Failed to load image %s\n\n"
-						    "Details: %s"),
+						    tmp_str,
 						    button->filename,
 						    error);
+				g_free (tmp_str);
 				g_free (error);
 			}
 		}
Index: ./gnome-panel/gnome-panel-preferences.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/gnome-panel-preferences.c,v
retrieving revision 1.113
diff -u -r1.113 gnome-panel-preferences.c
--- ./gnome-panel/gnome-panel-preferences.c	13 May 2003 16:20:05 -0000	1.113
+++ ./gnome-panel/gnome-panel-preferences.c	17 Jun 2003 09:40:44 -0000
@@ -251,13 +251,20 @@
 				"wgoscustlookandfeel.xml", "goscustdesk-10", &error);
 			if (error) {
 				GtkWidget *dialog;
+				char *tmp_str;
 
+				tmp_str = g_strconcat (_("There was an error "
+							 "displaying help"),
+						       "\n\n",
+						       "Details: %s",
+						       NULL);
 				dialog = gtk_message_dialog_new (window,
 								 GTK_DIALOG_DESTROY_WITH_PARENT,
 								 GTK_MESSAGE_ERROR,
 								 GTK_BUTTONS_OK,
-								 _("There was an error displaying help: \n%s"),
+								 tmp_str,
 								 error->message);
+				g_free (tmp_str);
 
 				g_signal_connect (G_OBJECT (dialog), "response",
 						  G_CALLBACK (gtk_widget_destroy),
@@ -304,7 +311,7 @@
 	locked_down = gconf_client_get_bool (
 				client, panel_gconf_global_key ("lock-down"), NULL);
 	if (locked_down)
-		error_dialog (_("The system administrator has disallowed\n"
+		error_dialog (_("The system administrator has disallowed "
 			        "modification of the panel configuration"));
 
 	g_object_unref (client);
Index: ./gnome-panel/gnome-panel-screenshot.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/gnome-panel-screenshot.c,v
retrieving revision 1.55
diff -u -r1.55 gnome-panel-screenshot.c
--- ./gnome-panel/gnome-panel-screenshot.c	26 May 2003 09:00:50 -0000	1.55
+++ ./gnome-panel/gnome-panel-screenshot.c	17 Jun 2003 09:40:45 -0000
@@ -132,24 +132,30 @@
 					   NULL, NULL, NULL);
 
 	if (png_ptr == NULL) {
-		*error = _("Unable to initialize png structure.\n"
-			   "You probably have a bad version of libpng "
-			   "on your system");
+		*error = g_strconcat (_("Unable to initialize png structure."),
+				      "\n",
+				      _("You probably have a bad version of "
+					"libpng on your system"),
+				      NULL);
 		return FALSE;
 	}
 
 	info_ptr = png_create_info_struct (png_ptr);
 	if (info_ptr == NULL) {
-		*error = _("Unable to create png info.\n"
-			   "You probably have a bad version of libpng "
-			   "on your system");
+		*error = g_strconcat (_("Unable to create png info."),
+				      "\n",
+				      _("You probably have a bad version of "
+					"libpng on your system"),
+				      NULL);
 		return FALSE;
 	}
 
 	if (setjmp (png_ptr->jmpbuf)) {
-		*error = _("Unable to set png info.\n"
-			   "You probably have a bad version of libpng "
-			   "on your system");
+		*error = g_strconcat (_("Unable to set png info."),
+				      "\n",
+				      _("You probably have a bad version of "
+					"libpng on your system"),
+				      NULL);
 		return FALSE;
 	}
 
@@ -165,8 +171,12 @@
 	data = malloc (w * p * sizeof (char));
 
 	if (data == NULL) {
-		*error = _("Insufficient memory to save the screenshot.\n"
-			   "Please free up some resources and try again.");
+		*error = g_strconcat (_("Not enough memory to save "
+					"screenshot."),
+				      "\n",
+				      _("Please free up some memory and try "
+					"again."),
+				      NULL);
 		return FALSE;
 	}
 
@@ -233,15 +243,21 @@
 
 	fp = fopen (file, "w");
 	if (fp == NULL) {
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Cannot create file '%s'"),
+				       "\n\n",
+				       _("Details: %s"),
+				       NULL);
 		dialog = gtk_message_dialog_new
 			(GTK_WINDOW (toplevel),
 			 0 /* flags */,
 			 GTK_MESSAGE_ERROR,
 			 GTK_BUTTONS_OK,
-			 _("Unable to create the file:\n"
-			   "\"%s\"\n"
-			   "Please check your permissions of "
-			   "the parent directory"), file ? file : "(null)");
+			 tmp_str,
+			 file ? file : "(null)",
+			 _("Please check your permissions of the parent "
+			 "directory"));
+		g_free (tmp_str);
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
 
@@ -739,17 +755,24 @@
 		outfd = open (filename, O_CREAT|O_TRUNC|O_WRONLY, 0644);
 		if (outfd < 0) {
 			GtkWidget *dialog;
+			char *tmp_str;
+			tmp_str = g_strconcat (_("Cannot create file '%s'"),
+					       "\n\n",
+					       _("Details: %s"),
+					       NULL);
 			dialog = gtk_message_dialog_new
 				(GTK_WINDOW (toplevel),
 				 0 /* flags */,
 				 GTK_MESSAGE_ERROR,
 				 GTK_BUTTONS_OK,
-				 _("Unable to create the file:\n"
-				   "\"%s\"\n"
-				   "Please check your permissions of "
-				   "the parent directory"), filename ? filename : "(null)");
+				 tmp_str,
+				 filename ? filename : "(null)",
+				 _("Please check your permissions of the "
+				   "parent directory"),
+				 NULL);
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
+			g_free (tmp_str);
 			close (infd);
 			return FALSE;
 		}
@@ -765,7 +788,7 @@
 					 0 /* flags */,
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_OK,
-					 _("Not enough room to write file %s"),
+					 _("Not enough free disk space to write file %s"),
 					 filename ? filename : "(null)");
 				gtk_dialog_run (GTK_DIALOG (dialog));
 				gtk_widget_destroy (dialog);
@@ -869,7 +892,7 @@
                         GTK_DIALOG_DESTROY_WITH_PARENT,
                         GTK_MESSAGE_ERROR,
                         GTK_BUTTONS_OK,
-                        _("There was an error displaying help: \n%s"),
+			_("There was an error displaying help: %s"),
                         error->message);
 
                 g_signal_connect (G_OBJECT (dialog),
@@ -1246,7 +1269,12 @@
 	}
 
 	if (!get_lock ()) {
-		g_printerr ("gnome-panel-screenshot is already running\n");
+		char *tmp_str;
+		tmp_str = g_strconcat (_("'%s' is already running"),
+				       "\n",
+				       NULL);
+		g_printerr (tmp_str, "gnome-panel-screenshot");
+		g_free (tmp_str);
 		exit (1);
 	}
 	
@@ -1268,16 +1296,23 @@
 	}
 	if (xml == NULL) {
 		GtkWidget *dialog;
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Glade file for the screenshot "
+					 "program is missing."),
+				       "\n",
+				       _("Please check your installation of "
+					 "gnome-panel"),
+				       NULL);
 		release_lock ();
 		dialog = gtk_message_dialog_new
 			(NULL /* parent */,
 			 0 /* flags */,
 			 GTK_MESSAGE_ERROR,
 			 GTK_BUTTONS_OK,
-			 _("Glade file for the screenshot program is missing.\n"
-			   "Please check your installation of gnome-panel"));
+			 tmp_str);
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
+		g_free (tmp_str);
 		exit (1);
 	}
 	glade_xml_signal_autoconnect (xml);
Index: ./gnome-panel/launcher.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/launcher.c,v
retrieving revision 1.241
diff -u -r1.241 launcher.c
--- ./gnome-panel/launcher.c	10 Jun 2003 10:50:35 -0000	1.241
+++ ./gnome-panel/launcher.c	17 Jun 2003 09:40:45 -0000
@@ -98,12 +98,18 @@
 
 	gnome_desktop_item_save (ditem, NULL, TRUE, &error);
 	if (error) {
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot save launcher to disk"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
 		panel_error_dialog (
 			screen,
 			"cannot_save_launcher",
-			_("Cannot save launcher to disk, "
-			  "the following error occured:\n\n%s"),
+			tmp_str,
 			error->message);
+		g_free (tmp_str);
 		g_error_free (error);
 	}
 }
@@ -135,11 +141,18 @@
 
 	egg_url_show_on_screen (url, screen, &error);
 	if (error) {
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot show '%s'"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
 		panel_error_dialog (
 			screen,
 			"cant_show_url_dialog",
-			_("Cannot show %s\n%s"),
+			tmp_str,
 			url, error->message);
+		g_free (tmp_str);
 		g_clear_error (&error);
 	}
 }
@@ -167,17 +180,19 @@
 		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",
-				msg);
+			char *tmp_str;
+			tmp_str = g_strconcat ("<b>",
+					       _("Cannot launch icon"),
+					       "</b>\n\n",
+					       _("Details: %s"),
+					       NULL);
+
+			panel_error_dialog (launcher_get_screen (launcher),
+					    "cannot_launch_icon",
+					    tmp_str,
+					    error->message);
 
-			g_free (msg);
+			g_free (tmp_str);
 			g_clear_error (&error);
 		}
 	}
@@ -218,11 +233,18 @@
 	g_strfreev (envp);
 
 	if (error) {
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot launch icon"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
 		panel_error_dialog (
 			launcher_get_screen (launcher),
 			"cannot_launch_icon",
-			_("Cannot launch icon\n%s"),
+			tmp_str,
 			error->message);
+		g_free (tmp_str);
 		g_clear_error (&error);
 	}
 
@@ -412,7 +434,13 @@
 	GError           *error = NULL;
 
 	if (!location) {
-		g_printerr (_("No URI provided for panel launcher desktop file\n"));
+		char *tmp_str;
+		tmp_str = g_strconcat (_("No URI provided for panel launcher "
+					 "desktop file"),
+				       "\n",
+				       NULL);
+		g_printerr (tmp_str);
+		g_free (tmp_str);
 		return NULL;
 	}
 
@@ -426,10 +454,13 @@
 		ditem = gnome_desktop_item_new_from_uri (location, 0, &error);
 
 	if (!ditem) {
-		g_printerr (_("Unable to open desktop file %s for panel launcher%s%s\n"),
-			    location,
-			    error ? ": " : "",
-			    error ? error->message : "");
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Unable to open desktop file %s for "
+					 "panel launcher"),
+				       error ? ": ", error->message : "",
+				       "\n",
+				       NULL);
+		g_printerr (tmp_str, location);
 		if (error)
 			g_error_free (error);
 
@@ -808,7 +839,13 @@
 	launcher_location = gconf_client_get_string (client, key, NULL);
 
 	if (!launcher_location) {
-		g_printerr (_("Key %s is not set, can't load launcher\n"), key);
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Key %s is not set, cannot load "
+					 "launcher"),
+				       "\n",
+				       NULL);
+		g_printerr (tmp_str, key);
+		g_free (tmp_str);
 		return;
 	}
         
@@ -1086,17 +1123,19 @@
 				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);
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot display help document"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
+
+		panel_error_dialog (screen,
+				    "cannot_show_gnome_kde_help",
+				    tmp_str,
+				    error->message);
 
-		panel_error_dialog (
-			screen,
-			"cannot_show_gnome_kde_help",
-			msg);
-
-		g_free (msg);
+		g_free (tmp_str);
 		g_error_free (error);
 	}
 }
Index: ./gnome-panel/menu-ditem.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu-ditem.c,v
retrieving revision 1.18
diff -u -r1.18 menu-ditem.c
--- ./gnome-panel/menu-ditem.c	10 Jun 2003 10:50:35 -0000	1.18
+++ ./gnome-panel/menu-ditem.c	17 Jun 2003 09:40:45 -0000
@@ -117,17 +117,19 @@
 	saving_error = g_object_get_data (G_OBJECT (dedit), "SavingError");
 
 	if (saving_error) {
-		char *msg;
-		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
-			_("Cannot save changes to launcher"),
-			_("Details"), saving_error);
-
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot save changes to launcher"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
 		panel_error_dialog (
 			gtk_window_get_screen (GTK_WINDOW (dialog)),
 			"cannot_save_entry",
-			msg);
+			tmp_str,
+			saving_error);
 
-		g_free (msg);
+		g_free (tmp_str);
 	}
 }
 
@@ -495,17 +497,19 @@
 				 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 */,
-			msg);
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot save menu item to disk"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
+
+		panel_error_dialog (gtk_window_get_screen (GTK_WINDOW (d)),
+				    "cannot_save_menu_item" /* class */,
+				    tmp_str,
+				    error->message);
 
-		g_free (msg);
+		g_free (tmp_str);
 		g_clear_error (&error);
 	}
 
Index: ./gnome-panel/menu.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu.c,v
retrieving revision 1.663
diff -u -r1.663 menu.c
--- ./gnome-panel/menu.c	10 Jun 2003 10:50:35 -0000	1.663
+++ ./gnome-panel/menu.c	17 Jun 2003 09:40:47 -0000
@@ -111,7 +111,7 @@
         { N_("Log Out"),
 	  N_("Actions"),
 	  "Actions",
-	  N_("Log out of this session to log in as a different user or to shut down the computer"),
+	  N_("Log out of this session"),
 	  NULL,
 	  PANEL_STOCK_LOGOUT,
 	  PANEL_ACTION_LOGOUT,
@@ -121,7 +121,7 @@
 	{ N_("Lock"),
 	  N_("Actions"),
 	  "Actions",
-	  N_("Lock the screen so you can temporarily leave your computer"),
+	  N_("Lock the screen"),
 	  NULL,
 	  PANEL_STOCK_LOCKSCREEN,
 	  PANEL_ACTION_LOCK,
@@ -131,7 +131,7 @@
 	{ N_("Force Quit"),
 	  N_("Actions"),
 	  "Actions",
-	  "Force a misbehaving application to quit",
+	  N_("Force a misbehaving application to quit"),
 	  NULL,
 	  PANEL_STOCK_FORCE_QUIT,
 	  PANEL_ACTION_FORCE_QUIT,
@@ -151,7 +151,7 @@
 	{ N_("Search"),
 	  N_("Actions"),
 	  "Actions",
-	  N_("Find files, folders, and documents on your computer"),
+	  N_("Find files, folders and documents"),
 	  NULL,
 	  PANEL_STOCK_SEARCHTOOL,
 	  PANEL_ACTION_SEARCH,
@@ -320,11 +320,13 @@
 
 	comment = g_string_new (_("This program is responsible for launching "
 				  "other applications, embedding small applets "
-				  "within itself, world peace, and random X crashes."));
+				  "within itself, world peace, and random X "
+				  "crashes."));
 
 	if (commie_mode) {
+		g_string_append (comment, "\n\n");
 		g_string_append (comment,
-				 _("\n\nRunning in \"Lockdown\" mode.  This "
+				 _("Running in \"Lockdown\" mode. This "
 				   "means your system administrator has "
 				   "prohibited any changes to the panel's "
 				   "configuration to take place."));
@@ -368,17 +370,23 @@
 	GdkScreen *screen = menuitem_to_screen (menuitem);
 
 	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"));
+		char *tmp_str, *tmp_det;
+
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot execute '%s'"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
+		tmp_det = g_strdup_printf (_("'%s' probably does not exist"),
+					   program_path);
 
 		panel_error_dialog (screen,
-		                    "cannot_exec_about_gnome",
-		                    msg);
+				    "cannot_exec_about_gnome",
+				    tmp_str,
+				    "About GNOME", tmp_det);
 
-		g_free (msg);
+		g_free (tmp_det);
+		g_free (tmp_str);
 	}
 }
 
@@ -398,34 +406,35 @@
 		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);
-
+			char *tmp_str;
+			tmp_str = g_strconcat ("<b>",
+					       _("Cannot launch entry"),
+					       "</b>\n\n",
+					       _("Details: %s"),
+					       NULL);
 			panel_error_dialog (
 				menuitem_to_screen (menuitem),
 				"cant_launch_entry",
-				msg);
-
-			g_free (msg);
+				tmp_str,
+				error->message);
+			g_free (tmp_str);
 			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",
-			msg);
-
-		g_free (msg);
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot load entry"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
+
+		panel_error_dialog (menuitem_to_screen (menuitem),
+				    "cant_load_entry",
+				    tmp_str,
+				    error->message);
+		
+		g_free (tmp_str);
 		g_clear_error (&error);
 	}
 }
@@ -1118,35 +1127,36 @@
 	result = gnome_vfs_unlink (sim->item_loc);
 
 	if (result != GNOME_VFS_OK) {
-		char *esc, *msg;
+		char *esc, *tmp_str;
 
 		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));
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot remove the menu item %s"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
+
+		panel_error_dialog (menuitem_to_screen (sim->menuitem),
+				    "cant_remove_menu_item",
+				    tmp_str,
+				    esc,
+				    gnome_vfs_result_to_string (result));
 
-		panel_error_dialog (
-			menuitem_to_screen (sim->menuitem),
-			"cant_remove_menu_item",
-			msg);
-
-		g_free (msg);
+		g_free (tmp_str);
 		g_free (esc);
 		return;
 	}
 
 	file = g_path_get_basename (sim->item_loc);
 	if (file == NULL) {
-		g_warning (_("Could not get file name from path: %s"),
+		g_warning (_("Cannot get file name from path: %s"),
 			  sim->item_loc);
 		return;
 	}
 
 	dir = g_path_get_dirname (sim->item_loc);
 	if (dir == NULL) {
-		g_warning (_("Could not get directory name from path: %s"),
+		g_warning (_("Cannot not get directory name from path: %s"),
 			  sim->item_loc);
 		g_free (file);
 		return;
@@ -1213,34 +1223,39 @@
 		if (exec != NULL)
 			panel_run_dialog_present_with_text (menuitem_to_screen (sim->menuitem), exec);
 		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"));
+			char *tmp_str;
+			tmp_str = g_strconcat ("<b>",
+					       _("Cannot add to run box"),
+					       "</b>\n\n",
+					       _("Details: %s"),
+					       NULL);
+
+			panel_error_dialog (menuitem_to_screen (sim->menuitem),
+					    "no_exec_or_url_field",
+					    tmp_str,
+					    _("No 'Exec' or 'URL' field in "
+					      "entry"));
 
-			panel_error_dialog (
-				menuitem_to_screen (sim->menuitem),
-				"no_exec_or_url_field",
-				msg);
-
-			g_free (msg);
+			g_free (tmp_str);
 		}
 
 		gnome_desktop_item_unref (item);
 	} else {
-		char *msg;
+		char *tmp_str;
 		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",
-			msg);
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot load entry"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
+
+		panel_error_dialog (menuitem_to_screen (sim->menuitem),
+				    "cant_load_entry",
+				    tmp_str,
+				    error->message);
 
-		g_free (msg);
+		g_free (tmp_str);
 		g_clear_error (&error);
 	}
 }
@@ -1262,35 +1277,41 @@
 		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);
+			char *tmp_str;
+			tmp_str = g_strconcat ("<b>",
+					       _("Cannot display help "
+						 "document"),
+					       "</b>\n\n",
+					       _("Details: %s"),
+					       NULL);
+
+			panel_error_dialog (screen,
+					    "cannot_show_gnome_kde_help",
+					    tmp_str,
+					    error->message);
 
-			panel_error_dialog (
-				screen,
-				"cannot_show_gnome_kde_help",
-				msg);
-
-			g_free (msg);
+			g_free (tmp_str);
 			g_clear_error (&error);
 		}
 
 		gnome_desktop_item_unref (item);
 	} else {
-		char *msg;
+		char *tmp_str;
+
 		g_assert (error != NULL);
 
-		msg = g_strdup_printf ("<b>%s</b>\n\n%s: %s",
-			_("Can't load entry"),
-			_("Details"), error->message);
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot load entry"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
 
-		panel_error_dialog (
-			screen,
-			"cant_load_entry",
-			msg);
+		panel_error_dialog (screen,
+				    "cant_load_entry",
+				    tmp_str,
+				    error->message);
 
-		g_free (msg);
+		g_free (tmp_str);
 		g_clear_error (&error);
 	}
 }
@@ -2589,8 +2610,16 @@
 					       applet_sort_criteria,
 					       &env);
 	if (BONOBO_EX (&env)) {
-		g_warning (_("query returned exception %s\n"), BONOBO_EX_REPOID (&env));
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Query returned exception %s"),
+				       "\n",
+				       NULL);
+
+		g_warning (tmp_str, BONOBO_EX_REPOID (&env));
+
+		g_free (tmp_str);
 		CORBA_exception_free (&env);
+
 		return TRUE;
 	}
 
@@ -2644,9 +2673,13 @@
 					 applet_sort_criteria,
 					 &env);
 	if (BONOBO_EX (&env)) {
-		g_warning (_("query returned exception %s\n"), BONOBO_EX_REPOID (&env));
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Query returned exception %s"), "\n");
+
+		g_warning (tmp_str, BONOBO_EX_REPOID (&env));
 
 		CORBA_exception_free (&env);
+		g_free (tmp_str);
 		g_free (reload_data);
 
 		return NULL;
@@ -2935,8 +2968,8 @@
 	if (panel_toplevel_is_last_unattached (toplevel)) {
 		panel_error_dialog (
 			menuitem_to_screen (menuitem),
-			"cannot_remove_last_panel",
-			_("You cannot remove your last panel."));
+			"cannot_delete_last_panel",
+			_("You cannot delete your last panel."));
 		return;
 	}
 
@@ -3211,7 +3244,7 @@
 		setup_internal_applet_drag(menuitem, "ACTION:lock:NEW");
 		gtk_tooltips_set_tip (panel_tooltips, menuitem,
 				      _("Lock the screen so that you can "
-					"temporarily leave your computer"), NULL);
+					"temporarily leave the computer"), NULL);
 	}
 
 	menuitem = gtk_image_menu_item_new ();
@@ -3223,7 +3256,7 @@
 	setup_internal_applet_drag(menuitem, "ACTION:logout:NEW");
 	gtk_tooltips_set_tip (panel_tooltips, menuitem,
 			      _("Log out of this session to log in as "
-				"a different user or to shut down your "
+				"a different user or to shut down the "
 				"computer"),
 			      NULL);
 
@@ -3399,7 +3432,7 @@
 		gtk_menu_shell_append (GTK_MENU_SHELL (root_menu), menuitem);
 		gtk_tooltips_set_tip (panel_tooltips, menuitem,
 				      _("Find files, folders, and documents "
-					"on your computer"),
+					"on the computer"),
 				      NULL);
 		g_signal_connect (menuitem, "activate",
 				  G_CALLBACK (panel_action_search), NULL);
Index: ./gnome-panel/panel-action-button.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-action-button.c,v
retrieving revision 1.11
diff -u -r1.11 panel-action-button.c
--- ./gnome-panel/panel-action-button.c	26 May 2003 13:41:07 -0000	1.11
+++ ./gnome-panel/panel-action-button.c	17 Jun 2003 09:40:47 -0000
@@ -154,7 +154,8 @@
 	if (egg_screen_execute_async (screen, g_get_home_dir (), 1, argv) < 0)
 		panel_error_dialog (screen,
 				    "cannot_exec_gnome-search-tool",
-				    _("Cannot execute gnome-search-tool"));
+				    _("Cannot execute '%s'"),
+				    "gnome-search-tool");
 }
 
 /* Take Screenshot
@@ -170,7 +171,8 @@
 	if (egg_screen_execute_async (screen, g_get_home_dir (), 1, argv) < 0)
 		panel_error_dialog (screen,
 				    "cannot_exec_gnome-panel-screenshot",
-				    _("Cannot execute gnome-panel-screenshot"));
+				    _("Cannot execute '%s'"),
+				    "gnome-panel-screenshot");
 }
 
 /* Force Quit
Index: ./gnome-panel/panel-applet-frame.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-applet-frame.c,v
retrieving revision 1.92
diff -u -r1.92 panel-applet-frame.c
--- ./gnome-panel/panel-applet-frame.c	26 May 2003 13:41:07 -0000	1.92
+++ ./gnome-panel/panel-applet-frame.c	17 Jun 2003 09:40:48 -0000
@@ -657,8 +657,15 @@
 					frame->priv->applet_shell,
 					event->button,
 					event->time, &env);
-			if (BONOBO_EX (&env))
-				g_warning (_("Exception from popup_menu '%s'\n"), env._id);
+			if (BONOBO_EX (&env)) {
+				char *tmp_str;
+				tmp_str = g_strconcat (_("Exception from "
+							 "popup_menu '%s'"),
+							 "\n",
+							 NULL);
+				g_warning (tmp_str, env._id);
+				g_free (tmp_str);
+			}
 
 			CORBA_exception_free (&env);
 
@@ -768,14 +775,17 @@
 	if (frame->priv->iid)
 		applet_name = panel_applet_frame_get_name (frame->priv->iid);
 
-	txt = g_strdup_printf (
-			_("The %s applet appears to have died "
-			  "unexpectedly\n\n"
-			  "Reload this applet?\n\n"
-			  "(If you choose not to reload it at this time"
-			  " you can always add it by right clicking on "
-			  "the panel and clicking on the \"Add to Panel\""
-			  " submenu)"), applet_name ? applet_name : "");
+	txt = g_strconcat (_("The %s applet appears to have died unexpectedly"),
+			   "\n\n",
+			   _("Reload this applet?"),
+			   "\n",
+			   _("(If you choose not to reload it at this time "
+			     "you can always add it by right clicking on "
+			     "the panel and clicking on the \"Add to Panel\" "
+			     "submenu)"),
+			   NULL);
+
+	txt = g_strdup_printf (txt, applet_name ? applet_name : "");
 
 	dialog = gtk_message_dialog_new (
 				NULL,
@@ -829,20 +839,29 @@
 				   GtkWindow         *panel)
 {
 	GtkWidget *dialog;
+	char	  *tmp_str;
 	char      *error;
 	int        response;
 
 	error = bonobo_exception_get_text (ev);
 
+	tmp_str = g_strconcat (_("The panel encountered a problem while "
+				 "loading \"%s\""),
+			       "\n\n",
+			       _("Details: %s"),
+			       "\n\n",
+			       _("Do you want to delete the applet from your "
+				 "configuration?"),
+			       NULL);
+
 	dialog = gtk_message_dialog_new (
 				NULL, 0,
 				GTK_MESSAGE_QUESTION,
 				GTK_BUTTONS_NONE,
-				_("The panel encountered a problem while loading \"%s\"\n"
-				  "Details: %s\n\n"
-				  "Do you want to delete the applet from your configuration?"),
+				tmp_str,
 				iid, error);
 
+	g_free (tmp_str);
 	g_free (error);
 
 	register_stock_item ();
@@ -936,7 +955,13 @@
 						"IDL:GNOME/Vertigo/PanelAppletShell:1.0",
 						&env);
 	if (BONOBO_EX (&env)) {
-		g_warning (_("Unable to obtain AppletShell interface from control\n"));
+		char *tmp_str;
+		tmp_str = g_strconcat (_("Unable to obtain AppletShell "
+					 "interface from control"),
+					 "\n",
+					 NULL);
+		g_warning (tmp_str);
+		g_free (tmp_str);
 
 		retval = CORBA_OBJECT_NIL;
 	}
Index: ./gnome-panel/panel-bindings.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-bindings.c,v
retrieving revision 1.3
diff -u -r1.3 panel-bindings.c
--- ./gnome-panel/panel-bindings.c	21 May 2003 10:05:03 -0000	1.3
+++ ./gnome-panel/panel-bindings.c	17 Jun 2003 09:40:48 -0000
@@ -164,7 +164,7 @@
 				(GConfClientNotifyFunc) panel_binding_changed,
 				binding, NULL, &error);
 	if (error) {
-		g_warning (_("Error watching gconf key '%s': %s"), key, error->message);
+		g_warning (_("Error watching GConf key '%s': %s"), key, error->message);
 		g_error_free (error);
 	}
 }
@@ -182,7 +182,7 @@
 	gconf_client_add_dir (client, BINDINGS_PREFIX,
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
 	if (error) {
-		g_warning (_("Error loading gconf directory '%s': %s"),
+		g_warning (_("Error loading GConf directory '%s': %s"),
 			   BINDINGS_PREFIX, error->message),
 		g_error_free (error);
 	}
Index: ./gnome-panel/panel-shell.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-shell.c,v
retrieving revision 1.12
diff -u -r1.12 panel-shell.c
--- ./gnome-panel/panel-shell.c	5 Mar 2003 01:11:34 -0000	1.12
+++ ./gnome-panel/panel-shell.c	17 Jun 2003 09:40:48 -0000
@@ -64,14 +64,23 @@
 		case Bonobo_ACTIVATION_REG_SUCCESS:
 			break;
 		case Bonobo_ACTIVATION_REG_ALREADY_ACTIVE:
-			message = _("I've detected a panel already running,\n"
-				    "and will now exit.");
+			message = g_strconcat (_("A running panel has been "
+						 "detected."),
+					       "\n",
+					       _("This panel will now exit."),
+					       NULL);
 			break;
 		default:
-			message = g_strdup_printf (_("There was a problem registering the panel "
-						     "with the bonobo-activation server.\n"
-						     "The error code is: %d\n"
-						     "The panel will now exit."), reg_res);
+			message = g_strconcat (_("There was a problem "
+						 "registering the panel with "
+						 "the bonobo-activation "
+						 "server."),
+					       "\n",
+					       _("The error code is: %d"),
+					       "\n",
+					       _("This panel will now exit."),
+					       NULL);
+			message = g_strdup_printf (message, reg_res);
 			break;
 		}
 
Index: ./gnome-panel/panel-stock-icons.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-stock-icons.c,v
retrieving revision 1.11
diff -u -r1.11 panel-stock-icons.c
--- ./gnome-panel/panel-stock-icons.c	5 Jun 2003 17:50:13 -0000	1.11
+++ ./gnome-panel/panel-stock-icons.c	17 Jun 2003 09:40:48 -0000
@@ -115,7 +115,12 @@
 		filename = gnome_desktop_item_find_icon (
 				panel_icon_theme, stock_icons [i].icon, icon_height, 0);
 		if (!filename) {
-			g_warning (_("Unable to load panel stock icon '%s'\n"), stock_icons [i].icon);
+			char *tmp_str;
+			tmp_str = g_strconcat (_("Unable to load panel stock "
+						 "icon '%s'"),
+					       "\n",
+					       NULL);
+			g_warning (tmp_str, stock_icons [i].icon);
 
 			/* FIXME: does this take into account the theme? */
 			set = gtk_icon_factory_lookup_default (GTK_STOCK_MISSING_IMAGE);
Index: ./gnome-panel/panel-util.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.c,v
retrieving revision 1.130
diff -u -r1.130 panel-util.c
--- ./gnome-panel/panel-util.c	10 Jun 2003 10:50:35 -0000	1.130
+++ ./gnome-panel/panel-util.c	17 Jun 2003 09:40:48 -0000
@@ -70,18 +70,22 @@
 	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",
-			msg);
+		char *tmp_str;
+
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot display help document"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
+
+		panel_error_dialog (screen,
+				    "cannot_show_help",
+				    tmp_str,
+				    error != NULL ? error->message : _("Not "
+					"available"));
 
-		g_free (msg);
 		g_clear_error (&error);
+		g_free (tmp_str);
 	}
 }
 
@@ -928,16 +932,19 @@
 		screen = gdk_screen_get_default ();
 
 	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"));
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot execute '%s'"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
 
 		panel_error_dialog (screen,
-			"cannot_exec_xscreensaver",
-			msg);
+				    "cannot_exec_xscreensaver",
+				    tmp_str,
+				    "xscreensaver", "Command not found");
 
-		g_free (msg);
+		g_free (tmp_str);
 	}
 }
 
Index: ./gnome-panel/panel.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel.c,v
retrieving revision 1.517
diff -u -r1.517 panel.c
--- ./gnome-panel/panel.c	26 May 2003 17:24:43 -0000	1.517
+++ ./gnome-panel/panel.c	17 Jun 2003 09:40:49 -0000
@@ -1156,6 +1156,7 @@
 panel_delete_query (PanelToplevel *toplevel)
 {
 	GtkWidget *dialog;
+	gchar *tmp_str;
 
 	dialog = g_object_get_data (G_OBJECT (toplevel), "panel-delete-dialog");
 
@@ -1164,14 +1165,21 @@
 		return;
 	}
 
+	tmp_str = g_strconcat (_("When you delete a panel, the settings for "
+				 "this panel are also deleted."),
+			       "\n\n",
+			       _("Delete this panel?"),
+			       NULL);
+
 	dialog = gtk_message_dialog_new (
 			GTK_WINDOW (toplevel), 
 			GTK_DIALOG_MODAL,
 			GTK_MESSAGE_QUESTION,
 			GTK_BUTTONS_NONE,
-			_("When a panel is deleted, the panel "
-			"and its\n settings are lost. "
-			"Delete this panel?"));
+			tmp_str);
+
+	g_free (tmp_str);
+
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_DELETE, GTK_RESPONSE_OK,
Index: ./gnome-panel/panel-run-dialog.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-run-dialog.c,v
retrieving revision 1.3
diff -u -r1.3 panel-run-dialog.c
--- ./gnome-panel/panel-run-dialog.c	10 Jun 2003 10:50:35 -0000	1.3
+++ ./gnome-panel/panel-run-dialog.c	17 Jun 2003 09:40:50 -0000
@@ -272,14 +272,17 @@
 				&error);
 			
 	if (!result) {
-		char *msg;
-		msg = g_strdup_printf ("<b>%s: '%s'</b>\n\n%s: %s",
-			_("Error launching command"), escaped,
-			_("Details"), error->message);
+		char *tmp_str;
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot launch command '%s'"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
 
-		panel_error_dialog (screen, "error_spawning_command", msg);
+		panel_error_dialog (screen, "error_spawning_command", tmp_str,
+				    escaped, error->message);
 
-		g_free (msg);
+		g_free (tmp_str);
 		g_error_free (error);
 	}
 				
@@ -306,15 +309,20 @@
 	g_strfreev (envp);
 
 	if (error) {
-		char *msg;
-		msg = g_strdup_printf ("<b>%s: '%s'</b>\n\n%s: %s",
-			_("Error displaying location"), escaped,
-			_("Details"), error->message);
+		char *tmp_str;
 
-		panel_error_dialog (screen, "error_showing_url", msg);
+		tmp_str = g_strconcat ("<b>",
+				       _("Cannot display location '%s'"),
+				       "</b>\n\n",
+				       _("Details: %s"),
+				       NULL);
 
-		g_free (msg);
+		panel_error_dialog (screen, "error_showing_url",
+				    escaped, error->message);
+
+		g_free (tmp_str);
 		g_error_free (error);
+
 		return FALSE;
 	}
 	
@@ -1042,7 +1050,7 @@
 	char *home;
 
 	dialog->file_sel = GTK_FILE_SELECTION (gtk_file_selection_new (
-						       _("Choose a file to append to the command...")));
+						       _("Choose a file to append to the command")));
 	
 	home = g_strconcat (g_get_home_dir (), "/", NULL);
 	gtk_file_selection_set_filename (dialog->file_sel, home);
Index: ./gnome-panel/panel-force-quit.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-force-quit.c,v
retrieving revision 1.1
diff -u -r1.1 panel-force-quit.c
--- ./gnome-panel/panel-force-quit.c	13 May 2003 15:11:55 -0000	1.1
+++ ./gnome-panel/panel-force-quit.c	17 Jun 2003 09:40:50 -0000
@@ -177,26 +177,31 @@
 kill_window_question (void)
 {
 	GtkWidget *dialog;
+	char *tmp_str;
 	gboolean   retval;
  
+	tmp_str = g_strconcat (_("Force this application to exit?"),
+			       "\n",
+			       _("(Any open documents will be lost.)"),
+			       NULL);
+
 	dialog = gtk_message_dialog_new (NULL, 0,
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_NONE,
-					 _("Force this application to exit?\n"
-					   "(Any open documents will be lost.)"));
- 
+					 tmp_str);
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 				GTK_STOCK_CANCEL,
 				GTK_RESPONSE_REJECT,
 				PANEL_STOCK_FORCE_QUIT,
 				GTK_RESPONSE_ACCEPT,
 				NULL);
- 
-	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog),
+					 GTK_RESPONSE_REJECT);
 
 	retval = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT;
 
 	gtk_widget_destroy (dialog);
+	g_free (tmp_str);
 
 	return retval;
 }
Index: ./libpanel-applet/panel-test-applets.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/libpanel-applet/panel-test-applets.c,v
retrieving revision 1.4
diff -u -r1.4 panel-test-applets.c
--- ./libpanel-applet/panel-test-applets.c	12 Jan 2003 05:24:23 -0000	1.4
+++ ./libpanel-applet/panel-test-applets.c	17 Jun 2003 09:40:50 -0000
@@ -31,7 +31,7 @@
 
 static const struct poptOption options [] = {
 	{ "iid", '\0', POPT_ARG_STRING, &cli_iid, 0, N_("Specify an applet IID to load"), NULL},
-	{ "prefs-dir", '\0', POPT_ARG_STRING, &cli_prefs_dir, 0, N_("Specify a gconf location in which the applet preferences should be stored"), NULL},
+	{ "prefs-dir", '\0', POPT_ARG_STRING, &cli_prefs_dir, 0, N_("Specify a GConf location in which the applet preferences should be stored"), NULL},
 	{ "size", '\0', POPT_ARG_STRING, &cli_size, 0, N_("Specify the initial size of the applet (xx-small, medium, large etc.)"), NULL},
 	POPT_AUTOHELP
 	{ "orient", '\0', POPT_ARG_STRING, &cli_orient, 0, N_("Specify the initial orientation of the applet (top, bottom, left or right)"), NULL},
Index: ./libpanel-applet/panel-applet-gconf.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/libpanel-applet/panel-applet-gconf.c,v
retrieving revision 1.5
diff -u -r1.5 panel-applet-gconf.c
--- ./libpanel-applet/panel-applet-gconf.c	20 May 2003 11:06:18 -0000	1.5
+++ ./libpanel-applet/panel-applet-gconf.c	17 Jun 2003 09:40:50 -0000
@@ -86,7 +86,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 }
@@ -118,7 +118,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 }
@@ -150,7 +150,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 }
@@ -182,7 +182,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 }
@@ -215,7 +215,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 }
@@ -247,7 +247,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 }
@@ -279,7 +279,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 
@@ -313,7 +313,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 
@@ -347,7 +347,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 
@@ -381,7 +381,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 
@@ -415,7 +415,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 
@@ -450,7 +450,7 @@
 	g_free (full_key);
 
 	if (!opt_error && our_error) {
-		g_warning (G_STRLOC ": gconf error : '%s'", our_error->message);
+		g_warning (G_STRLOC ": GConf error : '%s'", our_error->message);
 		g_error_free (our_error);
 	}
 
Index: ./libpanel-applet/panel-applet.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/libpanel-applet/panel-applet.c,v
retrieving revision 1.76
diff -u -r1.76 panel-applet.c
--- ./libpanel-applet/panel-applet.c	20 May 2003 11:06:18 -0000	1.76
+++ ./libpanel-applet/panel-applet.c	17 Jun 2003 09:40:51 -0000
@@ -126,7 +126,7 @@
 
 		if (strchr (tmp, '-'))
 			g_warning ("Applet key '%s' contains a hyphen. Please "
-				   "use underscores in gconf keys\n", tmp);
+				   "use underscores in GConf keys\n", tmp);
 
 		key = g_strdup_printf ("%s/%s", prefs_key, tmp);
 
