[nautilus] Use more specific text for unmount/eject error messages
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Use more specific text for unmount/eject error messages
- Date: Wed, 22 Aug 2012 13:01:21 +0000 (UTC)
commit e864875cc0a861a4096a588aae8ee2ff7d2a3fac
Author: William Jon McCann <jmccann redhat com>
Date: Tue Aug 21 10:37:37 2012 -0400
Use more specific text for unmount/eject error messages
https://bugzilla.gnome.org/show_bug.cgi?id=590513
src/nautilus-mime-actions.c | 5 ++---
src/nautilus-view.c | 40 ++++++++++++++++++++++++++++++++--------
2 files changed, 34 insertions(+), 11 deletions(-)
---
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 2bfb4c2..72ca36f 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -1851,8 +1851,7 @@ activation_mount_not_mounted_callback (GObject *source_object,
(error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_FAILED_HANDLED &&
error->code != G_IO_ERROR_ALREADY_MOUNTED)) {
- eel_show_error_dialog (_("Unable to mount location"),
- error->message, parameters->parent_window);
+ eel_show_error_dialog (_("Unable to access location"), error->message, parameters->parent_window);
}
if (error->domain != G_IO_ERROR ||
@@ -2125,7 +2124,7 @@ activation_mountable_mounted (NautilusFile *file,
(error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_FAILED_HANDLED &&
error->code != G_IO_ERROR_ALREADY_MOUNTED)) {
- eel_show_error_dialog (_("Unable to mount location"),
+ eel_show_error_dialog (_("Unable to access location"),
error->message, parameters->parent_window);
}
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 4b4b98a..9d36315 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -6631,8 +6631,14 @@ file_mount_callback (NautilusFile *file,
(error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_FAILED_HANDLED &&
error->code != G_IO_ERROR_ALREADY_MOUNTED))) {
- eel_show_error_dialog (_("Unable to mount location"),
- error->message, NULL);
+ char *text;
+ char *name;
+ name = nautilus_file_get_display_name (file);
+ /* Translators: %s is a file name formatted for display */
+ text = g_strdup_printf (_("Unable to access â%sâ"), name);
+ eel_show_error_dialog (text, error->message, NULL);
+ g_free (text);
+ g_free (name);
}
}
@@ -6651,8 +6657,14 @@ file_unmount_callback (NautilusFile *file,
(error->domain != G_IO_ERROR ||
(error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_FAILED_HANDLED))) {
- eel_show_error_dialog (_("Unable to unmount location"),
- error->message, NULL);
+ char *text;
+ char *name;
+ name = nautilus_file_get_display_name (file);
+ /* Translators: %s is a file name formatted for display */
+ text = g_strdup_printf (_("Unable to remove â%sâ"), name);
+ eel_show_error_dialog (text, error->message, NULL);
+ g_free (text);
+ g_free (name);
}
}
@@ -6671,8 +6683,14 @@ file_eject_callback (NautilusFile *file,
(error->domain != G_IO_ERROR ||
(error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_FAILED_HANDLED))) {
- eel_show_error_dialog (_("Unable to eject location"),
- error->message, NULL);
+ char *text;
+ char *name;
+ name = nautilus_file_get_display_name (file);
+ /* Translators: %s is a file name formatted for display */
+ text = g_strdup_printf (_("Unable to eject â%sâ"), name);
+ eel_show_error_dialog (text, error->message, NULL);
+ g_free (text);
+ g_free (name);
}
}
@@ -6778,8 +6796,14 @@ file_start_callback (NautilusFile *file,
(error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_FAILED_HANDLED &&
error->code != G_IO_ERROR_ALREADY_MOUNTED))) {
- eel_show_error_dialog (_("Unable to start location"),
- error->message, NULL);
+ char *text;
+ char *name;
+ name = nautilus_file_get_display_name (file);
+ /* Translators: %s is a file name formatted for display */
+ text = g_strdup_printf (_("Unable to start â%sâ"), name);
+ eel_show_error_dialog (text, error->message, NULL);
+ g_free (text);
+ g_free (name);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]