[nautilus] Improve wording of autorun prompt

[William Jon McCann <mccann src gnome org>]

commit 4fb1af4f235a8bd41b64094a9d451e3e3ca2c172
Author: William Jon McCann <jmccann redhat com>
Date:   Tue Aug 14 13:21:33 2012 -0400

    Improve wording of autorun prompt

 src/nautilus-autorun-software.c |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c
index 4378bf6..8e3dd1e 100644
--- a/src/nautilus-autorun-software.c
+++ b/src/nautilus-autorun-software.c
@@ -140,19 +140,19 @@ autorun (GMount *mount)
         if (path_to_spawn != NULL && cwd_for_program != NULL) {
                 if (chdir (cwd_for_program) == 0)  {
                         execl (path_to_spawn, path_to_spawn, program_parameter, NULL);
-			error_string = g_strdup_printf (_("Error starting autorun program: %s"), strerror (errno));
+			error_string = g_strdup_printf (_("Unable to start the program:\n%s"), strerror (errno));
 			goto out;
                 }
-                error_string = g_strdup_printf (_("Error starting autorun program: %s"), strerror (errno));
+                error_string = g_strdup_printf (_("Unable to start the program:\n%s"), strerror (errno));
 		goto out;
         }
-	error_string = g_strdup_printf (_("Cannot find the autorun program"));
+	error_string = g_strdup_printf (_("Unable to locate the program"));
 
 out:
         if (program_to_spawn != NULL) {
                 g_object_unref (program_to_spawn);
 	}
-        if(program_parameter_file != NULL) {
+        if (program_parameter_file != NULL) {
                 g_object_unref (program_parameter_file);
         }
 	if (root != NULL) {
@@ -168,7 +168,7 @@ out:
 							     0,
 							     GTK_MESSAGE_ERROR,
 							     GTK_BUTTONS_OK,
-							     _("<big><b>Error autorunning software</b></big>"));
+							     _("Oops! There was a problem running this software."));
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error_string);
 		/* This is required because we don't show dialogs in the
 		   window picker and if the window pops under another window
@@ -195,17 +195,15 @@ present_autorun_for_software_dialog (GMount *mount)
 
 	mount_name = g_mount_get_name (mount);
 
-	dialog = gtk_message_dialog_new_with_markup (NULL, /* TODO: parent window? */
-						     0,
-						     GTK_MESSAGE_OTHER,
-						     GTK_BUTTONS_CANCEL,
-						     _("<big><b>This medium contains software intended to be automatically started. Would you like to run it?</b></big>"));
+	dialog = gtk_message_dialog_new (NULL, /* TODO: parent window? */
+					 0,
+					 GTK_MESSAGE_OTHER,
+					 GTK_BUTTONS_CANCEL,
+					 _("â%sâ contains software intended to be automatically started. Would you like to run it?"),
+					 mount_name);
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("The software will run directly from the medium â%sâ. "
-						    "You should never run software that you don't trust.\n"
-						    "\n"
-						    "If in doubt, press Cancel."),
-                                                  mount_name);
+						  "%s",
+						  _("If you don't trust this location or aren't sure, press Cancel."));
 
 	/* This is required because we don't show dialogs in the
 	   window picker and if the window pops under another window
@@ -227,7 +225,6 @@ present_autorun_for_software_dialog (GMount *mount)
 
 	gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
 
-	gtk_window_set_title (GTK_WINDOW (dialog), mount_name);
 	gtk_window_set_icon (GTK_WINDOW (dialog), pixbuf);
 
 	data = g_new0 (AutorunSoftwareDialogData, 1);