Commit 0b04cb7f authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Update error dialogs to be HIGy, and use the new eel message dialog api.

2003-12-11  Alexander Larsson  <alexl@redhat.com>

	* components/emblem/nautilus-emblem-view.c:
	* components/music/nautilus-music-view.c:
	* components/news/nautilus-news.c:
	* libnautilus-private/nautilus-desktop-link-monitor.c:
	* libnautilus-private/nautilus-emblem-utils.c:
	* libnautilus-private/nautilus-file-operations.c:
	* libnautilus-private/nautilus-icon-dnd.c:
	* libnautilus-private/nautilus-program-chooser.c:
	* libnautilus-private/nautilus-program-choosing.c:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/fm-error-reporting.c:
	* src/file-manager/fm-icon-view.c:
	* src/file-manager/fm-properties-window.c:
	* src/file-manager/fm-search-list-view.c:
	* src/file-manager/nautilus-indexing-info.c:
	* src/nautilus-application.c:
	* src/nautilus-connect-server-dialog.c:
	* src/nautilus-information-panel.c:
	* src/nautilus-location-bar.c:
	* src/nautilus-navigation-window-menus.c:
	* src/nautilus-navigation-window.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-window-manage-views.c:
	* src/nautilus-window.c:
	Update error dialogs to be HIGy, and use the new
	eel message dialog api.
	Based on patch from dennis_cranston@yahoo.com
parent 2088def1
2003-12-11 Alexander Larsson <alexl@redhat.com>
* components/emblem/nautilus-emblem-view.c:
* components/music/nautilus-music-view.c:
* components/news/nautilus-news.c:
* libnautilus-private/nautilus-desktop-link-monitor.c:
* libnautilus-private/nautilus-emblem-utils.c:
* libnautilus-private/nautilus-file-operations.c:
* libnautilus-private/nautilus-icon-dnd.c:
* libnautilus-private/nautilus-program-chooser.c:
* libnautilus-private/nautilus-program-choosing.c:
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-error-reporting.c:
* src/file-manager/fm-icon-view.c:
* src/file-manager/fm-properties-window.c:
* src/file-manager/fm-search-list-view.c:
* src/file-manager/nautilus-indexing-info.c:
* src/nautilus-application.c:
* src/nautilus-connect-server-dialog.c:
* src/nautilus-information-panel.c:
* src/nautilus-location-bar.c:
* src/nautilus-navigation-window-menus.c:
* src/nautilus-navigation-window.c:
* src/nautilus-property-browser.c:
* src/nautilus-window-manage-views.c:
* src/nautilus-window.c:
Update error dialogs to be HIGy, and use the new
eel message dialog api.
Based on patch from dennis_cranston@yahoo.com
2003-12-10 Federico Mena Quintero <federico@ximian.com>
* src/nautilus-connect-server-dialog.c (response_callback): Use
......
......@@ -200,8 +200,9 @@ nautilus_emblem_view_delete_cb (GtkWidget *menu_item,
if (nautilus_emblem_remove_emblem (emblem_view->details->popup_emblem_keyword)) {
nautilus_emblem_view_refresh (emblem_view);
} else {
error = g_strdup_printf (_("Couldn't remove emblem with name '%s'. This is probably because the emblem is a permanent one, and not one you added yourself."), emblem_view->details->popup_emblem_display_name);
eel_show_error_dialog (error, _("Couldn't remove emblem"),
error = g_strdup_printf (_("Couldn't remove emblem with name '%s'."), emblem_view->details->popup_emblem_display_name);
eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one you added yourself."),
_("Couldn't Remove Emblem"),
NULL);
g_free (error);
}
......@@ -235,8 +236,9 @@ rename_dialog_response_cb (GtkWidget *dialog, int response,
if (nautilus_emblem_rename_emblem (keyword, name)) {
nautilus_emblem_view_refresh (emblem_view);
} else {
error = g_strdup_printf (_("Couldn't rename emblem with name '%s'. This is probably because the emblem is a permanent one, and not one that you added yourself."), name);
eel_show_error_dialog (error, _("Couldn't rename emblem"),
error = g_strdup_printf (_("Couldn't rename emblem with name '%s'."), name);
eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
_("Couldn't Rename Emblem"),
NULL);
g_free (error);
}
......@@ -737,9 +739,9 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
nautilus_icon_dnd_uri_list_free_strings (uris);
if (had_failure && emblems != NULL) {
eel_show_error_dialog (_("Some of the files could not be added as emblems because they did not appear to be valid images."), _("Couldn't add emblems"), NULL);
eel_show_error_dialog (_("Some of the files could not be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
} else if (had_failure && emblems == NULL) {
eel_show_error_dialog (_("None of the files could be added as emblems because they did not appear to be valid images."), _("Couldn't add emblems"), NULL);
eel_show_error_dialog (_("None of the files could be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
}
......@@ -760,7 +762,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
uri = g_strndup (data->data, data->length);
if (!eel_is_valid_uri (uri)) {
eel_show_error_dialog (_("The dragged text was not a valid file location."), _("Couldn't add emblem"), NULL);
eel_show_error_dialog (_("The emblem cannot be added."), _("The dragged text was not a valid file location."), _("Couldn't Add Emblem"), NULL);
break;
}
......@@ -785,7 +787,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
} else {
error = g_strdup (_("The dragged file does not appear to be a valid image."));
}
eel_show_error_dialog (error, _("Couldn't add emblem"),
eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
NULL);
g_free (error);
g_free (uri_utf8);
......@@ -835,7 +837,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
g_warning ("Tried to load '%s', but failed.\n",
uri);
error = g_strdup_printf (_("The file '%s' does not appear to be a valid image."), uri);
eel_show_error_dialog (error, _("Couldn't add emblem"),
eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
NULL);
g_free (error);
}
......
......@@ -742,7 +742,8 @@ set_album_cover (GtkWidget *widget, gpointer *data)
char *message = g_strdup_printf
(_("Sorry, but '%s' is not a usable image file."),
path_name);
eel_show_error_dialog (message, _("Not an Image"), NULL);
eel_show_error_dialog (message, _("Please select an image file and try again."),
_("Not an Image"), NULL);
g_free (message);
g_free (path_uri);
......@@ -1213,8 +1214,8 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
g_object_unref (client);
if (!enable_esd) {
eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
"This is because the Enable sound server startup setting "
eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now."),
_("This is because the Enable sound server startup setting "
"in the Sound section of the Control Center is turned off."),
_("Unable to Play File"),
//GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (&music_view->details->event_box->parent))));
......@@ -1224,8 +1225,8 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
}
if (!esdout_can_play ()) {
eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
"Either another program is using or blocking the sound card, "
eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now."),
_("Either another program is using or blocking the sound card, "
"or your sound card is not configured properly. Try quitting any "
"applications that may be blocking use of the sound card."),
_("Unable to Play File"),
......@@ -1253,6 +1254,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
if (song_filename == NULL) {
eel_show_error_dialog
( _("Sorry, but the music view can't play non-local files yet."),
_("Remote files are not supported."),
_("Can't Play Remote Files"),
NULL);
return;
......@@ -1765,7 +1767,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
if (result != GNOME_VFS_OK) {
path = gnome_vfs_get_local_path_from_uri (uri);
message = g_strdup_printf (_("Sorry, but there was an error reading %s."), path);
eel_show_error_dialog (message, _("Can't Read Folder"),
eel_show_error_dialog (message, _("The folder cannot be read."), _("Can't Read Folder"),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (music_view->details->event_box))));
g_free (path);
g_free (message);
......
......@@ -1755,11 +1755,13 @@ add_site_from_fields (GtkWidget *widget, News *news)
/* make sure there's something in the fields */
if (site_name == NULL || strlen (site_name) == 0) {
eel_show_error_dialog (_("Sorry, but you have not specified a name for the site!"), _("Missing Site Name Error"), NULL);
eel_show_error_dialog (_("Sorry, but you have not specified a name for the site."),
_("Please specify a name and try again."), _("Missing Site Name Error"), NULL);
return;
}
if (site_location == NULL || strlen (site_location) == 0) {
eel_show_error_dialog (_("Sorry, but you have not specified a URL for the site!"), _("Missing URL Error"), NULL);
eel_show_error_dialog (_("Sorry, but you have not specified a URL for the site."),
_("Please specify a URL and try again."), _("Missing URL Error"), NULL);
return;
}
......@@ -1776,7 +1778,8 @@ add_site_from_fields (GtkWidget *widget, News *news)
g_free (buffer);
if (!got_xml_file) {
g_free (site_uri);
eel_show_error_dialog (_("Sorry, but the specified url doesn't seem to be a valid RSS file!"), _("Invalid RSS URL"), NULL);
eel_show_error_dialog (_("Sorry, but the specified url doesn't seem to be a valid RSS file."),
_("Please check the spelling of the url."), _("Invalid RSS URL"), NULL);
return;
}
......
......@@ -107,10 +107,11 @@ nautilus_desktop_link_monitor_delete_link (NautilusDesktopLinkMonitor *monitor,
eel_run_simple_dialog
(parent_view,
FALSE,
_("You cannot delete a volume icon. If you want to eject "
"the volume, please use Eject in the right-click menu of "
"the volume."),
_("Can't delete volume"),
GTK_MESSAGE_ERROR,
_("You cannot delete a volume icon."),
_("If you want to eject the volume, please use Eject in the "
"right-click menu of the volume."),
_("Can't Delete Volume"),
GTK_STOCK_OK, NULL);
break;
}
......
......@@ -194,12 +194,14 @@ nautilus_emblem_verify_keyword (GtkWindow *parent_window,
const char *display_name)
{
if (keyword == NULL || strlen (keyword) == 0) {
eel_show_error_dialog (_("Sorry, but you must specify a non-blank keyword for the new emblem."),
_("Couldn't install emblem"), GTK_WINDOW (parent_window));
eel_show_error_dialog (_("The emblem cannot be installed."),
_("Sorry, but you must specify a non-blank keyword for the new emblem."),
_("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
return FALSE;
} else if (!emblem_keyword_valid (keyword)) {
eel_show_error_dialog (_("Sorry, but emblem keywords can only contain letters, spaces and numbers."),
_("Couldn't install emblem"), GTK_WINDOW (parent_window));
eel_show_error_dialog (_("The emblem cannot be installed."),
_("Sorry, but emblem keywords can only contain letters, spaces and numbers."),
_("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
return FALSE;
} else if (is_reserved_keyword (keyword)) {
char *error_string;
......@@ -208,8 +210,8 @@ nautilus_emblem_verify_keyword (GtkWindow *parent_window,
* what a keyword is, and people should be passing a unique
* keyword to us anyway
*/
error_string = g_strdup_printf (_("Sorry, but there is already an emblem named \"%s\". Please choose a different name for it."), display_name);
eel_show_error_dialog (error_string,
error_string = g_strdup_printf (_("Sorry, but there is already an emblem named \"%s\"."), display_name);
eel_show_error_dialog (_("Please choose a different emblem name."), error_string,
_("Couldn't install emblem"), GTK_WINDOW (parent_window));
g_free (error_string);
return FALSE;
......@@ -252,8 +254,10 @@ nautilus_emblem_install_custom_emblem (GdkPixbuf *pixbuf,
/* save the image */
if (eel_gdk_pixbuf_save_to_file (pixbuf, path) != TRUE) {
eel_show_error_dialog (_("Sorry, unable to save custom emblem."),
_("Couldn't install emblem"), GTK_WINDOW (parent_window));
eel_show_error_dialog (_("The emblem cannot be installed."),
_("Sorry, unable to save custom emblem."),
_("Couldn't Install Emblem"),
GTK_WINDOW (parent_window));
g_free (dir);
g_free (stat_dir);
g_free (path);
......@@ -267,8 +271,9 @@ nautilus_emblem_install_custom_emblem (GdkPixbuf *pixbuf,
file = fopen (path, "w+");
if (file == NULL) {
eel_show_error_dialog (_("Sorry, unable to save custom emblem name."),
_("Couldn't install emblem"), GTK_WINDOW (parent_window));
eel_show_error_dialog (_("The emblem cannot be installed."),
_("Sorry, unable to save custom emblem name."),
_("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
g_free (stat_dir);
g_free (dir);
return;
......
......@@ -718,6 +718,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
{
#if 0
const char *message;
const char *detail;
GtkDialog *dialog;
int response;
......@@ -728,25 +729,26 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
*/
if (nautilus_icon_container_has_stored_icon_positions (container)) {
if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
message = _("This folder uses automatic layout. "
"Do you want to switch to manual layout and leave this item where you dropped it? "
message = _("Do you want to switch to manual layout and leave this item where you dropped it? "
"This will clobber the stored manual layout.");
detail = _("This folder uses automatic layout.");
} else {
message = _("This folder uses automatic layout. "
"Do you want to switch to manual layout and leave these items where you dropped them? "
message = _("Do you want to switch to manual layout and leave these items where you dropped them? "
"This will clobber the stored manual layout.");
detail = _("This folder uses automatic layout.");
}
} else {
if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
message = _("This folder uses automatic layout. "
"Do you want to switch to manual layout and leave this item where you dropped it?");
message = _("Do you want to switch to manual layout and leave this item where you dropped it?");
detail = _("This folder uses automatic layout.");
} else {
message = _("This folder uses automatic layout. "
"Do you want to switch to manual layout and leave these items where you dropped them?");
message = _("Do you want to switch to manual layout and leave these items where you dropped them?");
detail = _("This folder uses automatic layout.");
}
}
dialog = eel_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
dialog = eel_show_yes_no_dialog (message, detail, _("Switch to Manual Layout?"),
_("Switch"), GTK_STOCK_CANCEL,
GTK_WINDOW (gtk_widget_get_toplevel(GTK_WIDGET(container))));
......
......@@ -982,17 +982,6 @@ launch_mime_capplet (NautilusFile *file,
g_free (mime_type);
}
static void
launch_mime_capplet_on_ok (GtkDialog *dialog, int response, gpointer callback_data)
{
g_assert (GTK_IS_DIALOG (dialog));
if (response == GTK_RESPONSE_YES) {
launch_mime_capplet (callback_data, dialog);
}
gtk_object_destroy (GTK_OBJECT (dialog));
}
static void
launch_mime_capplet_and_close_dialog (GtkButton *button, gpointer callback_data)
{
......@@ -1594,6 +1583,7 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
char *file_name;
char *dialog_title;
GtkDialog *dialog;
int response;
file_name = get_file_name_for_display (file);
......@@ -1612,22 +1602,22 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
* user can't add components to the complete list even from the capplet.
* (They can add applications though.)
*/
prompt = g_strdup_printf (_("%s\n\n"
"You can configure GNOME to associate applications "
"with file types. Do you want to associate an "
"application with this file type now?"),
unavailable_message);
dialog = eel_show_yes_no_dialog
(prompt, dialog_title, _("Associate Application"), GTK_STOCK_CANCEL, parent_window);
prompt = _("You can configure GNOME to associate applications "
"with file types. Do you want to associate an "
"application with this file type now?");
dialog = eel_show_yes_no_dialog (unavailable_message, prompt, dialog_title,
_("_Associate Application"), GTK_STOCK_CANCEL, parent_window);
response = gtk_dialog_run (dialog);
gtk_object_destroy (GTK_OBJECT (dialog));
g_signal_connect_object (dialog, "response",
G_CALLBACK (launch_mime_capplet_on_ok),
file, 0);
if (response == GTK_RESPONSE_YES) {
launch_mime_capplet (file, dialog);
}
g_free (unavailable_message);
g_free (file_name);
g_free (prompt);
g_free (dialog_title);
}
......@@ -1641,6 +1631,7 @@ nautilus_program_chooser_show_invalid_message (GnomeVFSMimeActionType action_ty
char *file_name;
char *dialog_title;
GtkDialog *dialog;
int response;
file_name = get_file_name_for_display (file);
......@@ -1655,21 +1646,21 @@ nautilus_program_chooser_show_invalid_message (GnomeVFSMimeActionType action_ty
dialog_title = g_strdup (_("Invalid Action Associated"));
}
prompt = g_strdup_printf (_("%s\n\n"
"You can configure GNOME to associate a different application "
"or viewer with this file type. Do you want to associate an "
"application or viewer with this file type now?"),
unavailable_message);
prompt = _("You can configure GNOME to associate a different application "
"or viewer with this file type. Do you want to associate an "
"application or viewer with this file type now?");
dialog = eel_show_yes_no_dialog
(prompt, dialog_title, _("Associate Action"), GTK_STOCK_CANCEL, parent_window);
dialog = eel_show_yes_no_dialog (unavailable_message, prompt, dialog_title,
_("_Associate Action"), GTK_STOCK_CANCEL, parent_window);
g_signal_connect_object (dialog, "response",
G_CALLBACK (launch_mime_capplet_on_ok),
file, 0);
response = gtk_dialog_run (dialog);
gtk_object_destroy (GTK_OBJECT (dialog));
if (response == GTK_RESPONSE_YES) {
launch_mime_capplet (file, dialog);
}
g_free (unavailable_message);
g_free (file_name);
g_free (prompt);
g_free (dialog_title);
}
......@@ -493,6 +493,7 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
{
GtkDialog *message_dialog;
LaunchParameters *launch_parameters;
char *prompt;
char *message;
char *file_name;
int response;
......@@ -501,17 +502,20 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
if (nautilus_mime_has_any_applications_for_file (file)) {
if (application != NULL) {
prompt = _("Open Failed, would you like to choose another application?");
message = g_strdup_printf (_("\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
"locations. Would you like to choose another application?"),
"locations."),
application->name, file_name,
application->name, uri_scheme);
} else {
prompt = _("Open Failed, would you like to choose another action?");
message = g_strdup_printf (_("The default action can't open \"%s\" because it can't access files at \"%s\" "
"locations. Would you like to choose another action?"),
"locations."),
file_name, uri_scheme);
}
message_dialog = eel_show_yes_no_dialog (message,
message_dialog = eel_show_yes_no_dialog (prompt,
message,
_("Can't Open Location"),
GTK_STOCK_OK,
GTK_STOCK_CANCEL,
......@@ -528,26 +532,28 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
launch_parameters);
}
g_free (message);
} else {
if (application != NULL) {
message = g_strdup_printf (_("\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
"locations. No other applications are available to view this file. "
"If you copy this file onto your computer, you may be able to open "
"it."), application->name, file_name,
application->name, uri_scheme);
prompt = g_strdup_printf (_("\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
"locations."), application->name, file_name,
application->name, uri_scheme);
message = _("No other applications are available to view this file. "
"If you copy this file onto your computer, you may be able to open "
"it.");
} else {
message = g_strdup_printf (_("The default action can't open \"%s\" because it can't access files at \"%s\" "
"locations. No other actions are available to view this file. "
"If you copy this file onto your computer, you may be able to open "
"it."), file_name, uri_scheme);
prompt = g_strdup_printf (_("The default action can't open \"%s\" because it can't access files at \"%s\"."
"locations."), file_name, uri_scheme);
message = _("No other actions are available to view this file. "
"If you copy this file onto your computer, you may be able to open "
"it.");
}
eel_show_info_dialog (message, _("Can't Open Location"), parent_window);
eel_show_info_dialog (prompt, message, _("Can't Open Location"), parent_window);
g_free (prompt);
}
g_free (file_name);
g_free (message);
}
#ifdef HAVE_STARTUP_NOTIFICATION
......@@ -1159,8 +1165,9 @@ nautilus_launch_desktop_file (GdkScreen *screen,
EEL_VFS_CAPABILITY_SAFE_TO_EXECUTE)) {
eel_show_error_dialog
(_("Sorry, but you can't execute commands from "
"a remote site due to security considerations."),
_("Can't execute remote links"),
"a remote site."),
_("This is disabled due to security considerations."),
_("Can't Execute Remote Links"),
parent_window);
return;
......@@ -1170,11 +1177,11 @@ nautilus_launch_desktop_file (GdkScreen *screen,
ditem = gnome_desktop_item_new_from_uri (desktop_file_uri, 0,
&error);
if (error != NULL) {
message = g_strconcat (_("There was an error launching the application.\n\n"
"Details: "), error->message, NULL);
message = g_strconcat (_("Details: "), error->message, NULL);
eel_show_error_dialog
(message,
_("Error launching application"),
(_("There was an error launching the application."),
message,
_("Error Launching Application"),
parent_window);
g_error_free (error);
......@@ -1202,10 +1209,10 @@ nautilus_launch_desktop_file (GdkScreen *screen,
if (count == 0) {
/* all files are non-local */
eel_show_error_dialog
(_("This drop target only supports local files.\n\n"
"To open non-local files copy them to a local folder and then"
(_("This drop target only supports local files."),
_("To open non-local files copy them to a local folder and then"
" drop them again."),
_("Drop target only supports local files"),
_("Drop Target Only Supports Local Files"),
parent_window);
gnome_desktop_item_unref (ditem);
......@@ -1214,10 +1221,10 @@ nautilus_launch_desktop_file (GdkScreen *screen,
} else if (count != total) {
/* some files were non-local */
eel_show_warning_dialog
(_("This drop target only supports local files.\n\n"
"To open non-local files copy them to a local folder and then"
(_("This drop target only supports local files."),
_("To open non-local files copy them to a local folder and then"
" drop them again. The local files you dropped have already been opened."),
_("Drop target only supports local files"),
_("Drop Target Only Supports Local Files"),
parent_window);
}
}
......@@ -1236,11 +1243,11 @@ nautilus_launch_desktop_file (GdkScreen *screen,
flags, envp,
&error);
if (error != NULL) {
message = g_strconcat (_("There was an error launching the application.\n\n"
"Details: "), error->message, NULL);
message = g_strconcat (_("Details: "), error->message, NULL);
eel_show_error_dialog
(message,
_("Error launching application"),
(_("There was an error launching the application."),
message,
_("Error Launching Application"),
parent_window);
g_error_free (error);
......
......@@ -488,19 +488,20 @@ fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count)
GtkDialog *dialog;
char *prompt;
char *title;
char *detail;
int response;
if (count <= SILENT_WINDOW_OPEN_LIMIT) {
return TRUE;
}
prompt = g_strdup_printf (_("This will open %d separate windows. "
"Are you sure you want to do this?"), count);
title = g_strdup_printf (_("Open %d Windows?"), count);
dialog = eel_show_yes_no_dialog (prompt, title,
prompt = _("Are you sure you want to open all files?");
detail = g_strdup_printf (_("This will open %d separate windows."), count);
dialog = eel_show_yes_no_dialog (prompt, detail, title,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
fm_directory_view_get_containing_window (view));
g_free (prompt);
g_free (detail);
g_free (title);
response = gtk_dialog_run (dialog);
......@@ -843,6 +844,7 @@ confirm_delete_directly (FMDirectoryView *view,
dialog = eel_show_yes_no_dialog
(prompt,
_("If you delete an item, it is permanently lost."),
_("Delete?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
fm_directory_view_get_containing_window (view));
......@@ -1804,14 +1806,14 @@ real_file_limit_reached (FMDirectoryView *view)
* no more than the constant limit are displayed.
*/
message = g_strdup_printf (_("The folder \"%s\" contains more files than "
"Nautilus can handle. Some files will not be "
"displayed."),
"Nautilus can handle."),
directory_name);
g_free (directory_name);
dialog = eel_show_warning_dialog (message,
_("Too Many Files"),
fm_directory_view_get_containing_window (view));
_("Some files will not be displayed."),
_("Too Many Files"),
fm_directory_view_get_containing_window (view));
g_free (message);
}
......@@ -3043,6 +3045,7 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean
{
GtkDialog *dialog;
char *prompt;
char *detail;
int uri_count;
char *file_name;
int response;
......@@ -3054,28 +3057,25 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean
if (uri_count == 1) {
file_name = file_name_from_uri ((char *) uris->data);
prompt = g_strdup_printf (_("\"%s\" cannot be moved to the Trash. Do "
"you want to delete it immediately?"), file_name);
prompt = _("Cannot move file to trash, do you want to delete immediately?");
detail = g_strdup_printf (_("The file \"%s\" cannot be moved to the trash."), file_name);
g_free (file_name);
} else {
if (all) {</