brasero r1597 - in trunk: . src src/plugins/cdrdao src/plugins/checksum src/plugins/libburnia src/plugins/transcode

From: philippr svn gnome org
To: svn-commits-list gnome org
Subject: brasero r1597 - in trunk: . src src/plugins/cdrdao src/plugins/checksum src/plugins/libburnia src/plugins/transcode
Date: Tue, 2 Dec 2008 20:15:04 +0000 (UTC)
Author: philippr
Date: Tue Dec  2 20:15:03 2008
New Revision: 1597
URL: http://svn.gnome.org/viewvc/brasero?rev=1597&view=rev

Log:
	Fix #562915 â Translator comments should be the line just before the string

	* src/brasero-blank-dialog.c (brasero_blank_dialog_activate),
	(brasero_blank_dialog_init):
	* src/brasero-data-disc.c (brasero_data_disc_import_button_new):
	* src/brasero-project.c (brasero_project_update_project_size),
	(brasero_project_empty_cb):
	* src/burn-drive.c (brasero_drive_get_display_name):
	* src/burn-job.c (brasero_job_allow_deactivation):
	* src/burn-mkisofs-base.c (brasero_mkisofs_base_write_graft):
	* src/burn-process.c (brasero_process_finished):
	* src/plugins/cdrdao/burn-cdrdao.c
	(brasero_cdrdao_read_stderr_record):
	* src/plugins/checksum/burn-checksum-image.c
	(brasero_checksum_image_checksum_file_input):
	* src/plugins/libburnia/burn-libburn.c
	(brasero_libburn_start_erase):
	* src/plugins/libburnia/burn-libisofs.c
	(brasero_libisofs_create_volume_thread):
	* src/plugins/transcode/burn-transcode.c
	(brasero_transcode_create_pipeline),
	(brasero_transcode_create_sibling_image),
	(brasero_transcode_pad_real), (brasero_transcode_pad_file):
	* src/plugins/transcode/burn-vob.c (brasero_vob_build_audio_pcm):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-blank-dialog.c
   trunk/src/brasero-data-disc.c
   trunk/src/brasero-project.c
   trunk/src/burn-drive.c
   trunk/src/burn-job.c
   trunk/src/burn-mkisofs-base.c
   trunk/src/burn-process.c
   trunk/src/plugins/cdrdao/burn-cdrdao.c
   trunk/src/plugins/checksum/burn-checksum-image.c
   trunk/src/plugins/libburnia/burn-libburn.c
   trunk/src/plugins/libburnia/burn-libisofs.c
   trunk/src/plugins/transcode/burn-transcode.c
   trunk/src/plugins/transcode/burn-vob.c

Modified: trunk/src/brasero-blank-dialog.c
==============================================================================
--- trunk/src/brasero-blank-dialog.c	(original)
+++ trunk/src/brasero-blank-dialog.c	Tue Dec  2 20:15:03 2008
@@ -203,13 +203,14 @@
 		GtkWidget *message;
 		GtkWidget *button;
 
-		/* Translators: the following string means there was an error
-		 * while blanking. */
 		message =  gtk_message_dialog_new (GTK_WINDOW (self),
 						   GTK_DIALOG_DESTROY_WITH_PARENT|
 						   GTK_DIALOG_MODAL,
 						   GTK_MESSAGE_ERROR,
 						   GTK_BUTTONS_CLOSE,
+						/* Translators: the following string
+						 * means there was an error while
+						 * blanking. */
 						   _("Error while blanking."));
 
 		button = brasero_utils_make_button (_("Blank _Again"),
@@ -350,8 +351,8 @@
 
 	priv = BRASERO_BLANK_DIALOG_PRIVATE (obj);
 
-	/* Translators: This is a verb, an action */
 	brasero_tool_dialog_set_button (BRASERO_TOOL_DIALOG (obj),
+					/* Translators: This is a verb, an action */
 					_("_Blank"),
 					NULL,
 					"media-optical-blank");

Modified: trunk/src/brasero-data-disc.c
==============================================================================
--- trunk/src/brasero-data-disc.c	(original)
+++ trunk/src/brasero-data-disc.c	Tue Dec  2 20:15:03 2008
@@ -1206,8 +1206,8 @@
 			   BRASERO_DATA_DISC_MEDIUM,
 			   medium);
 
-	/* Translators: This is a verb. It's a toolbar button. */
 	g_object_set (action,
+			/* Translators: This is a verb. It's a toolbar button. */
 		      "short-label", _("I_mport"),
 		      NULL);
 

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Tue Dec  2 20:15:03 2008
@@ -605,10 +605,11 @@
 		brasero_medium_get_free_space (medium,
 					       &free_space,
 					       NULL);
+
+		medium_string = g_format_size_for_display (free_space);
 		/* Translators: first %s is the size of the project and the 
 		 * second %s is the remaining free space on the disc that is
 		 * used for multisession */
-		medium_string = g_format_size_for_display (free_space);
 		size = g_strdup_printf (_("Project estimated size: %s/%s"),
 					string,
 					medium_string);
@@ -1524,8 +1525,8 @@
 							    "All the work will be lost. "
 							    "Note that files will not be deleted from their own location, "
 							    "just no longer listed here."));
-		/* Translators: "empty" is a verb here */
 		gtk_dialog_add_button (GTK_DIALOG (dialog),
+					/* Translators: "empty" is a verb here */
 				       _("E_mpty Project"),
 				       GTK_RESPONSE_OK);
 

Modified: trunk/src/burn-drive.c
==============================================================================
--- trunk/src/burn-drive.c	(original)
+++ trunk/src/burn-drive.c	Tue Dec  2 20:15:03 2008
@@ -264,11 +264,12 @@
 
 	priv = BRASERO_DRIVE_PRIVATE (self);
 
-	/* Translators: This is a fake drive, a file, and means that when we're
-	 * writing, we're writing to a file and create an image on the hard 
-	 * drive. */
-	if (!priv->udi)
-		return g_strdup (_("Image File"));;
+	if (!priv->udi) {
+		/* Translators: This is a fake drive, a file, and means that
+		 * when we're writing, we're writing to a file and create an
+		 * image on the hard drive. */
+		return g_strdup (_("Image File"));
+	}
 
 	watch = brasero_hal_watch_get_default ();
 	ctx = brasero_hal_watch_get_ctx (watch);

Modified: trunk/src/burn-job.c
==============================================================================
--- trunk/src/burn-job.c	(original)
+++ trunk/src/burn-job.c	Tue Dec  2 20:15:03 2008
@@ -308,10 +308,10 @@
 
 error:
 
-	/* Translators: %s is the plugin name */
 	g_set_error (error,
 		     BRASERO_BURN_ERR,
 		     BRASERO_BURN_ERROR_PLUGIN_MISBEHAVIOR,
+		     /* Translators: %s is the plugin name */
 		     _("\"%s\" did not behave properly"),
 		     G_OBJECT_TYPE_NAME (self));
 	return BRASERO_BURN_ERR;

Modified: trunk/src/burn-mkisofs-base.c
==============================================================================
--- trunk/src/burn-mkisofs-base.c	(original)
+++ trunk/src/burn-mkisofs-base.c	Tue Dec  2 20:15:03 2008
@@ -287,12 +287,13 @@
 	/* build up graft and write it */
 	graft_point = _build_graft_point (uri, disc_path);
 	if (!graft_point) {
-		/* Translators: Error message saying no graft point is specified
-		 * A graft point is the path (on the disc) where a file from
-		 * any source will be added ("grafted") */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: Error message saying no graft point
+			      * is specified. A graft point is the path (on the
+			      * disc) where a file from any source will be added
+			      * ("grafted") */
 			     _("An internal error occured"));
 		return BRASERO_BURN_ERR;
 	}

Modified: trunk/src/burn-process.c
==============================================================================
--- trunk/src/burn-process.c	(original)
+++ trunk/src/burn-process.c	Tue Dec  2 20:15:03 2008
@@ -220,10 +220,10 @@
 	/* check if an error went undetected */
 	if (priv->return_status) {
 		if (priv->error) {
-			/* Translators: %s is the name of the brasero element */
 			brasero_job_error (BRASERO_JOB (self),
 					   g_error_new (BRASERO_BURN_ERROR,
 							BRASERO_BURN_ERROR_GENERAL,
+						        /* Translators: %s is the name of the brasero element */
 							_("Process \"%s\" ended with an error code (%i)"),
 							G_OBJECT_TYPE_NAME (self),
 							priv->return_status));

Modified: trunk/src/plugins/cdrdao/burn-cdrdao.c
==============================================================================
--- trunk/src/plugins/cdrdao/burn-cdrdao.c	(original)
+++ trunk/src/plugins/cdrdao/burn-cdrdao.c	Tue Dec  2 20:15:03 2008
@@ -182,10 +182,10 @@
 		name = g_path_get_basename (cuepath);
 		g_free (cuepath);
 
-		/* Translators: %s is a filename */
 		brasero_job_error (BRASERO_JOB (cdrdao),
 				   g_error_new (BRASERO_BURN_ERROR,
 						BRASERO_BURN_ERROR_FILE_NOT_FOUND,
+						/* Translators: %s is a filename */
 						_("\"%s\" could not be found"),
 						name));
 		g_free (name);

Modified: trunk/src/plugins/checksum/burn-checksum-image.c
==============================================================================
--- trunk/src/plugins/checksum/burn-checksum-image.c	(original)
+++ trunk/src/plugins/checksum/burn-checksum-image.c	Tue Dec  2 20:15:03 2008
@@ -290,11 +290,11 @@
 
                 errsv = errno;
 
-		/* Translators: first %s is the filename, second %s is the error
-		 * generated from errno */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: first %s is the filename, second %s
+			      * is the error generated from errno */
 			     _("\"%s\" could not be opened (%s)"),
 			     name,
 			     g_strerror (errsv));

Modified: trunk/src/plugins/libburnia/burn-libburn.c
==============================================================================
--- trunk/src/plugins/libburnia/burn-libburn.c	(original)
+++ trunk/src/plugins/libburnia/burn-libburn.c	Tue Dec  2 20:15:03 2008
@@ -645,11 +645,11 @@
 	if (fd == -1) {
 		int errnum = errno;
 
-		/* Translators: first %s is the filename, second %s is the error
-		 * generated from errno */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: first %s is the filename, second %s is the error
+			      * generated from errno */
 			     _("\"%s\" could not be opened (%s)"),
 			     "/dev/null",
 			     g_strerror (errnum));
@@ -684,10 +684,10 @@
 	if (burn_precheck_write (opts, priv->ctx->disc, reasons, 0) <= 0) {
 		burn_write_opts_free (opts);
 
-		/* Translators: %s is the error returned by libburn */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: %s is the error returned by libburn */
 			     _("An internal error occured (%s)"),
 			     reasons);
 		return BRASERO_BURN_ERR;

Modified: trunk/src/plugins/libburnia/burn-libisofs.c
==============================================================================
--- trunk/src/plugins/libburnia/burn-libisofs.c	(original)
+++ trunk/src/plugins/libburnia/burn-libisofs.c	Tue Dec  2 20:15:03 2008
@@ -621,9 +621,9 @@
 			/* an error has occured, possibly libisofs hasn't been
 			 * able to find a parent for this node */
 			g_free (path_name);
-			/* Translators: %s is the path */
 			priv->error = g_error_new (BRASERO_BURN_ERROR,
 						   BRASERO_BURN_ERROR_GENERAL,
+						   /* Translators: %s is the path */
 						   _("No parent could be found in the tree for the path \"%s\""),
 						   graft->path);
 			goto end;

Modified: trunk/src/plugins/transcode/burn-transcode.c
==============================================================================
--- trunk/src/plugins/transcode/burn-transcode.c	(original)
+++ trunk/src/plugins/transcode/burn-transcode.c	Tue Dec  2 20:15:03 2008
@@ -311,11 +311,11 @@
 	uri = brasero_track_get_audio_source (track, TRUE);
 	source = gst_element_make_from_uri (GST_URI_SRC, uri, NULL);
 	if (source == NULL) {
-		/* Translators: %s is the name of the GstElement that 
-		 * could not be created */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: %s is the name of the GstElement that 
+			      * could not be created */
 			     _("%s element could not be created"),
 			     "\"Source\"");
 		goto error;
@@ -362,8 +362,6 @@
 	}
 
 	if (!sink) {
-		/* Translators: %s is the name of the GstElement that 
-		 * could not be created */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
@@ -380,8 +378,6 @@
 	/* audioconvert */
 	convert = gst_element_factory_make ("audioconvert", NULL);
 	if (convert == NULL) {
-		/* Translators: %s is the name of the GstElement that 
-		 * could not be created */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
@@ -395,8 +391,6 @@
 		/* audioresample */
 		resample = gst_element_factory_make ("audioresample", NULL);
 		if (resample == NULL) {
-			/* Translators: %s is the name of the GstElement that 
-			 * could not be created */
 			g_set_error (error,
 				     BRASERO_BURN_ERROR,
 				     BRASERO_BURN_ERROR_GENERAL,
@@ -409,8 +403,6 @@
 		/* filter */
 		filter = gst_element_factory_make ("capsfilter", NULL);
 		if (!filter) {
-			/* Translators: %s is the name of the GstElement that 
-			 * could not be created */
 			g_set_error (error,
 				     BRASERO_BURN_ERROR,
 				     BRASERO_BURN_ERROR_GENERAL,
@@ -435,8 +427,6 @@
 	/* decode */
 	decode = gst_element_factory_make ("decodebin", NULL);
 	if (decode == NULL) {
-		/* Translators: %s is the name of the GstElement that 
-		 * could not be created */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
@@ -597,10 +587,10 @@
 	if (symlink (path_src, path_dest) == -1) {
                 int errsv = errno;
 
-		/* Translators: the %s is the error message from errno */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: the %s is the error message from errno */
 			     _("An internal error occured (%s)"),
 			     g_strerror (errsv));
 
@@ -856,10 +846,10 @@
 		if (size != b_written) {
                         int errsv = errno;
 
-			/* Translators: %s is the string error from errno */
 			g_set_error (error,
 				     BRASERO_BURN_ERROR,
 				     BRASERO_BURN_ERROR_GENERAL,
+				     /* Translators: %s is the string error from errno */
 				     _("Error while padding file (%s)"),
 				     g_strerror (errsv));
 			return -1;
@@ -1049,10 +1039,10 @@
 	if (fd == -1) {
                 int errsv = errno;
 
-		/* Translators: %s is the string error from errno */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: %s is the string error from errno */
 			     _("Error while padding file (%s)"),
 			     g_strerror (errsv));
 		return FALSE;

Modified: trunk/src/plugins/transcode/burn-vob.c
==============================================================================
--- trunk/src/plugins/transcode/burn-vob.c	(original)
+++ trunk/src/plugins/transcode/burn-vob.c	Tue Dec  2 20:15:03 2008
@@ -241,11 +241,11 @@
 	/* queue */
 	queue = gst_element_factory_make ("queue", NULL);
 	if (queue == NULL) {
-		/* Translators: %s is the name of the GstElement that 
-		 * could not be created */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: %s is the name of the GstElement that 
+			      * could not be created */
 			     _("%s element could not be created"),
 			     "\"Queue\"");
 		goto error;
@@ -260,11 +260,11 @@
 	/* audioresample */
 	resample = gst_element_factory_make ("audioresample", NULL);
 	if (resample == NULL) {
-		/* Translators: %s is the name of the GstElement that 
-		 * could not be created */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: %s is the name of the GstElement that 
+			      * could not be created */
 			     _("%s element could not be created"),
 			     "\"Audioresample\"");
 		goto error;
@@ -274,11 +274,11 @@
 	/* audioconvert */
 	convert = gst_element_factory_make ("audioconvert", NULL);
 	if (convert == NULL) {
-		/* Translators: %s is the name of the GstElement that 
-		 * element could not be created */
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
+			     /* Translators: %s is the name of the GstElement that 
+			      * element could not be created */
 			     _("%s element could not be created"),
 			     "\"Audioconvert\"");
 		goto error;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]