[brasero] Fix #573801 – Bad error message when burning empty burn:///



commit a86eacb6c9281f03961fdd3e36639094e4060e3d
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sat Jul 11 19:02:37 2009 +0200

    Fix #573801 â?? Bad error message when burning empty burn:///
    Changed all strings that could appear and be used outside of brasero itself so they won't contain the word project

 libbrasero-burn/brasero-burn-options.c   |   37 ++++++++++++++---------------
 libbrasero-burn/brasero-status-dialog.c  |    8 +++---
 libbrasero-burn/brasero-track-data-cfg.c |    4 +-
 libbrasero-burn/brasero-track-data.c     |    2 +-
 libbrasero-burn/brasero-track-stream.c   |    2 +-
 nautilus/nautilus-burn-extension.c       |    2 +-
 src/brasero-data-disc.c                  |   22 +++++++++---------
 src/brasero-project.c                    |    4 +-
 8 files changed, 40 insertions(+), 41 deletions(-)
---
diff --git a/libbrasero-burn/brasero-burn-options.c b/libbrasero-burn/brasero-burn-options.c
index 54dbaa4..5193fc1 100644
--- a/libbrasero-burn/brasero-burn-options.c
+++ b/libbrasero-burn/brasero-burn-options.c
@@ -317,7 +317,7 @@ brasero_burn_options_update_valid (BraseroBurnOptions *self)
 
 			message = brasero_notify_message_add (BRASERO_NOTIFY (priv->message_output),
 							      _("Would you like to burn the selection of files across several media?"),
-							      _("The size of the project is too large for the disc even with the overburn option."),
+							      _("The data size is too large for the disc even with the overburn option."),
 							      -1,
 							      BRASERO_NOTIFY_CONTEXT_SIZE);
 			brasero_notify_button_add (BRASERO_NOTIFY (priv->message_output),
@@ -334,7 +334,7 @@ brasero_burn_options_update_valid (BraseroBurnOptions *self)
 		else
 			brasero_notify_message_add (BRASERO_NOTIFY (priv->message_output),
 						    _("Please choose another CD or DVD or insert a new one."),
-						    _("The size of the project is too large for the disc even with the overburn option."),
+						    _("The data size is too large for the disc even with the overburn option."),
 						    -1,
 						    BRASERO_NOTIFY_CONTEXT_SIZE);
 	}
@@ -361,19 +361,19 @@ brasero_burn_options_update_valid (BraseroBurnOptions *self)
 		if (brasero_track_type_get_has_data (type))
 			brasero_notify_message_add (BRASERO_NOTIFY (priv->message_output),
 						    _("Please add files."),
-						    _("The project is empty"),
+						    _("There are no files to write to disc"),
 						    -1,
 						    BRASERO_NOTIFY_CONTEXT_SIZE);
 		else if (!BRASERO_STREAM_FORMAT_HAS_VIDEO (brasero_track_type_get_stream_format (type)))
 			brasero_notify_message_add (BRASERO_NOTIFY (priv->message_output),
 						    _("Please add songs."),
-						    _("The project is empty"),
+						    _("There are no songs to write to disc"),
 						    -1,
 						    BRASERO_NOTIFY_CONTEXT_SIZE);
 		else
 			brasero_notify_message_add (BRASERO_NOTIFY (priv->message_output),
 						     _("Please add videos."),
-						    _("The project is empty"),
+						    _("There are no videos to write to disc"),
 						    -1,
 						    BRASERO_NOTIFY_CONTEXT_SIZE);
 		brasero_track_type_free (type);
@@ -441,7 +441,7 @@ brasero_burn_options_update_valid (BraseroBurnOptions *self)
 
 		message = brasero_notify_message_add (BRASERO_NOTIFY (priv->message_output),
 						      _("Would you like to burn beyond the disc reported capacity?"),
-						      _("The size of the project is too large for the disc and you must remove files from the project otherwise."
+						      _("The data size is too large for the disc and you must remove files from the selection otherwise."
 							"\nYou may want to use this option if you're using 90 or 100 min CD-R(W) which cannot be properly recognised and therefore need overburn option."
 							"\nNOTE: This option might cause failure."),
 						      -1,
@@ -683,29 +683,28 @@ brasero_status_dialog_uri_has_image (BraseroTrackDataCfg *track,
 	BraseroBurnOptionsPrivate *priv;
 
 	priv = BRASERO_BURN_OPTIONS_PRIVATE (self);
-
-	name = brasero_utils_get_uri_name (uri);
-	string = g_strdup_printf (_("Do you want to burn \"%s\" to a disc or add it in to the data project?"), name);
 	dialog = gtk_message_dialog_new (GTK_WINDOW (self),
 					 GTK_DIALOG_MODAL |
 					 GTK_DIALOG_DESTROY_WITH_PARENT,
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_NONE,
 					 "%s",
-					 string);
+					 _("Do you want to create a disc from the contents of the image or with the image file inside?"));
+	gtk_window_set_title (GTK_WINDOW (dialog), "");
+
+	name = brasero_utils_get_uri_name (uri);
+	/* Translators: %s is the name of the image */
+	string = g_strdup_printf (_("There is only one selected file (\"%s\"). It is the image of a disc and its contents can be burnt."), name);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), string);
 	g_free (string);
 	g_free (name);
 
-	gtk_window_set_title (GTK_WINDOW (dialog), "");
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("This file is the image of a disc and can therefore be burnt to disc without having to add it to a data project first."));
-
-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add to Project"), GTK_RESPONSE_NO);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("Burn as _File"), GTK_RESPONSE_NO);
 
-	button = brasero_utils_make_button (_("_Burn..."),
-					    NULL,
-					    "media-optical-burn",
-					    GTK_ICON_SIZE_BUTTON);
+	button = brasero_utils_make_button (_("Burn _Contents..."),
+	                                    NULL,
+	                                    "media-optical-burn",
+	                                    GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show (button);
 	gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
 				      button,
diff --git a/libbrasero-burn/brasero-status-dialog.c b/libbrasero-burn/brasero-status-dialog.c
index 792f786..aeb4e9c 100644
--- a/libbrasero-burn/brasero-status-dialog.c
+++ b/libbrasero-burn/brasero-status-dialog.c
@@ -121,7 +121,7 @@ brasero_status_dialog_update (BraseroStatusDialog *self,
 
 	brasero_track_type_free (type);
 
-	string = g_strdup_printf (_("Project estimated size: %s"), size_str);
+	string = g_strdup_printf (_("Estimated size: %s"), size_str);
 	g_free (size_str);
 
 	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progress), string);
@@ -456,9 +456,9 @@ brasero_status_dialog_new (BraseroBurnSession *session,
 			     "session", session,
 			     "transient-for", parent,
 			     "modal", TRUE,
-			     "title",  _("Project Size Estimation"),
+			     "title",  _("Size Estimation"),
 			     "message-type", GTK_MESSAGE_OTHER,
-			     "text", _("Please wait until the estimation of the project size is completed."),
-			     "secondary-text", _("All files from the project need to be analysed to complete this operation."),
+			     "text", _("Please wait until the estimation of the size is completed."),
+			     "secondary-text", _("All files need to be analysed to complete this operation."),
 			     NULL);
 }
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index 4284815..d44941e 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -2281,8 +2281,8 @@ brasero_track_data_cfg_get_status (BraseroTrack *track,
 		if (status)
 			brasero_status_set_error (status,
 						  g_error_new (BRASERO_BURN_ERROR,
-							       BRASERO_BURN_ERROR_EMPTY,
-							       _("The project is empty")));
+						               BRASERO_BURN_ERROR_EMPTY,
+						               _("There are no files to write to disc")));
 		return BRASERO_BURN_ERR;
 	}
 
diff --git a/libbrasero-burn/brasero-track-data.c b/libbrasero-burn/brasero-track-data.c
index 4cfb0c3..9b619ff 100644
--- a/libbrasero-burn/brasero-track-data.c
+++ b/libbrasero-burn/brasero-track-data.c
@@ -399,7 +399,7 @@ brasero_track_data_get_status (BraseroTrack *track,
 			brasero_status_set_error (status,
 						  g_error_new (BRASERO_BURN_ERROR,
 							       BRASERO_BURN_ERROR_EMPTY,
-							       _("The project is empty")));
+							       _("There are no files to write to disc")));
 		return BRASERO_BURN_ERR;
 	}
 
diff --git a/libbrasero-burn/brasero-track-stream.c b/libbrasero-burn/brasero-track-stream.c
index cc1e900..3d323e3 100644
--- a/libbrasero-burn/brasero-track-stream.c
+++ b/libbrasero-burn/brasero-track-stream.c
@@ -286,7 +286,7 @@ brasero_track_stream_get_status (BraseroTrack *track,
 			brasero_status_set_error (status,
 						  g_error_new (BRASERO_BURN_ERROR,
 							       BRASERO_BURN_ERROR_EMPTY,
-							       _("The project is empty")));
+							       _("There are no files to write to disc")));
 
 		return BRASERO_BURN_ERR;
 	}
diff --git a/nautilus/nautilus-burn-extension.c b/nautilus/nautilus-burn-extension.c
index a1fb74c..7ca63a8 100644
--- a/nautilus/nautilus-burn-extension.c
+++ b/nautilus/nautilus-burn-extension.c
@@ -185,7 +185,7 @@ nautilus_disc_burn_is_empty (GtkWindow *toplevel)
 
 		brasero_utils_message_dialog (GTK_WIDGET (toplevel),
 					      _("Please add files."),
-					      _("The project is empty"),
+					      _("There are no files to write to disc"),
 					      GTK_MESSAGE_ERROR);
 		return TRUE;
 	}
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 9917c87..644d12d 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -603,22 +603,22 @@ brasero_data_disc_image_uri_cb (BraseroTrackDataCfg *vfs,
 
 	priv = BRASERO_DATA_DISC_PRIVATE (self);
 
-	name = brasero_utils_get_uri_name (uri);
-	string = g_strdup_printf (_("Do you want to burn \"%s\" to a disc or add it in to the data project?"), name);
 	dialog = brasero_app_dialog (brasero_app_get_default (),
-				     string,
-				     GTK_BUTTONS_NONE,
-				     GTK_MESSAGE_QUESTION);
+	                             _("Do you want to create a disc from the contents of the image or with the image file inside?"),
+	                             GTK_BUTTONS_NONE,
+	                             GTK_MESSAGE_QUESTION);
+
+	name = brasero_utils_get_uri_name (uri);
+	/* Translators: %s is the name of the image */
+	string = g_strdup_printf (_("There is only one selected file (\"%s\"). It is the image of a disc and its contents can be burnt."), name);
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), string);
 	g_free (string);
 	g_free (name);
 
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("This file is the image of a disc and can therefore be burnt to disc without having to add it to a data project first."));
-
-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add to Project"), GTK_RESPONSE_NO);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("Burn as _File"), GTK_RESPONSE_NO);
 
-	button = brasero_utils_make_button (_("_Burn..."),
-					    NULL,
+	button = brasero_utils_make_button (_("Burn _Contents..."),
+	                                    NULL,
 					    "media-optical-burn",
 					    GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show (button);
diff --git a/src/brasero-project.c b/src/brasero-project.c
index 0fbf237..3036307 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -1268,7 +1268,7 @@ brasero_project_no_song_dialog (BraseroProject *project)
 {
 	brasero_app_alert (brasero_app_get_default (),
 			   _("Please add songs to the project."),
-			   _("The project is empty"),
+			   _("There are no songs to write to disc"),
 			   GTK_MESSAGE_WARNING);
 }
 
@@ -1277,7 +1277,7 @@ brasero_project_no_file_dialog (BraseroProject *project)
 {
 	brasero_app_alert (brasero_app_get_default (),
 			   _("Please add files to the project."),
-			   _("The project is empty"),
+			   _("There are no files to write to disc"),
 			   GTK_MESSAGE_WARNING);
 }
 



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