[nautilus] Clean up error message text



commit 85f08a3dd3b8d1a04f7f9e8d4bf7b2d40406eef4
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Aug 13 15:36:39 2012 -0400

    Clean up error message text
    
     * Don't mention Nautilus in the message

 src/nautilus-application.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index fdd9c9a..494325e 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -237,16 +237,17 @@ check_required_directories (NautilusApplication *application)
 			g_string_append_printf (directories_as_string, ", %s", (const char *)l->data);
 		}
 
+		error_string = _("Oops! Something went wrong.");
 		if (failed_count == 1) {
-			error_string = g_strdup_printf (_("Nautilus could not create the required folder \"%s\"."),
-							directories_as_string->str);
-			detail_string = _("Before running Nautilus, please create the following folder, or "
-					  "set permissions such that Nautilus can create it.");
+			detail_string = g_strdup_printf (_("Unable to create a required folder. "
+							   "Please create the following folder, or "
+							   "set permissions such that it can be created:\n%s"),
+							 directories_as_string->str);
 		} else {
-			error_string = g_strdup_printf (_("Nautilus could not create the following required folders: "
-							  "%s."), directories_as_string->str);
-			detail_string = _("Before running Nautilus, please create these folders, or "
-					  "set permissions such that Nautilus can create them.");
+			detail_string = g_strdup_printf (_("Unable to create required folders. "
+							   "Please create the following folders, or "
+							   "set permissions such that they can be created:\n%s"),
+							 directories_as_string->str);
 		}
 
 		dialog = eel_show_error_dialog (error_string, detail_string, NULL);
@@ -255,7 +256,6 @@ check_required_directories (NautilusApplication *application)
 					    GTK_WINDOW (dialog));
 
 		g_string_free (directories_as_string, TRUE);
-		g_free (error_string);
 	}
 
 	g_slist_free (directories);
@@ -1445,7 +1445,7 @@ nautilus_application_startup (GApplication *app)
 
 	self->priv->bookmark_list = nautilus_bookmark_list_new ();
 
-	/* Check the user's ~/.nautilus directories and post warnings
+	/* Check the user's .nautilus directories and post warnings
 	 * if there are problems.
 	 */
 	check_required_directories (self);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]