brasero r1739 - in trunk: . src src/plugins/cdrkit src/plugins/cdrtools src/plugins/local-track

[lmedinas svn gnome org]

Author: lmedinas
Date: Sun Jan 11 21:56:56 2009
New Revision: 1739
URL: http://svn.gnome.org/viewvc/brasero?rev=1739&view=rev

Log:
Squashed commit of the following:

commit 757c71992ad84576dfa52b53084b606cccfbdaf3
Author: lmedinas <lmedinas gnome org>
Date:   Sun Jan 11 21:54:01 2009 +0000

    2009-01-11  Luis Medinas  <lmedinas gnome org>

            * src/brasero-app.c (on_about_cb):
            * src/brasero-audio-disc.c
            (brasero_audio_disc_file_type_error_dialog):
            * src/brasero-data-disc.c (brasero_data_disc_project_loaded_cb),
            (brasero_data_disc_deep_directory_cb),
            (brasero_data_disc_load_track):
            * src/brasero-jacket-edit.c (brasero_jacket_edit_init):
            * src/brasero-metadata.c (brasero_metadata_success):
            * src/brasero-search-beagle.c (brasero_search_beagle_error_dialog):
            * src/brasero-split-dialog.c (brasero_split_dialog_init):
            * src/plugins/cdrkit/burn-readom.c (brasero_readom_export_caps):
            * src/plugins/cdrtools/burn-readcd.c (brasero_readcd_export_caps):
            * src/plugins/local-track/burn-uri.c
            (brasero_burn_uri_export_caps):

            Fix String problems on bgo #564258. Thanks to Gabor Kelemen for
            the pointing.

Modified:
   trunk/ChangeLog
   trunk/src/brasero-app.c
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-data-disc.c
   trunk/src/brasero-jacket-edit.c
   trunk/src/brasero-metadata.c
   trunk/src/brasero-search-beagle.c
   trunk/src/brasero-split-dialog.c
   trunk/src/plugins/cdrkit/burn-readom.c
   trunk/src/plugins/cdrtools/burn-readcd.c
   trunk/src/plugins/local-track/burn-uri.c

Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c	(original)
+++ trunk/src/brasero-app.c	Sun Jan 11 21:56:56 2009
@@ -984,8 +984,8 @@
 	};
 
 	const gchar *documenters[] = {
-		"Phil Bull <philbull gmail com>"
-		"Milo Casagrande <milo_casagrande yahoo it>"
+		"Phil Bull <philbull gmail com>\n"
+		"Milo Casagrande <milo_casagrande yahoo it>\n"
 		"Andrew Stabeno <stabeno gmail com>",
 		NULL
 	};

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Sun Jan 11 21:56:56 2009
@@ -1353,7 +1353,7 @@
 	gchar *name;
 
     	BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
-	primary = g_strdup_printf (_("\"%s\" could not be handled by gstreamer."), name);
+	primary = g_strdup_printf (_("\"%s\" could not be handled by Gstreamer."), name);
 	brasero_app_alert (brasero_app_get_default (),
 			   primary,
 			   _("Make sure the appropriate codec is installed"),

Modified: trunk/src/brasero-data-disc.c
==============================================================================
--- trunk/src/brasero-data-disc.c	(original)
+++ trunk/src/brasero-data-disc.c	Sun Jan 11 21:56:56 2009
@@ -665,19 +665,19 @@
 		brasero_disc_message_set_primary (BRASERO_DISC_MESSAGE (message),
 						  _("The contents of the project changed since it was saved."));
 		brasero_disc_message_set_secondary (BRASERO_DISC_MESSAGE (message),
-						    _("Do you want to continue or discard the old project layout?"));
+						    _("Discard the current modified project"));
 
 		brasero_disc_message_set_image (BRASERO_DISC_MESSAGE (message),GTK_STOCK_DIALOG_WARNING);
 		brasero_disc_message_set_progress_active (BRASERO_DISC_MESSAGE (message), FALSE);
 		brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
 					   BRASERO_DISC_MESSAGE (message),
 					   _("_Discard"),
-					   _("Press if you want to discard the current modified project"),
+					   _("Discard the current modified project"),
 					   GTK_RESPONSE_CANCEL);
 		brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
 					   BRASERO_DISC_MESSAGE (message),
 					   _("_Continue"),
-					   _("Press if you want to continue with the current modified project"),
+					   _("Continue with the current modified project"),
 					   GTK_RESPONSE_OK);
 
 		brasero_disc_message_add_errors (BRASERO_DISC_MESSAGE (message),
@@ -1056,7 +1056,7 @@
 	g_free (string);
 
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("The children of this directory will have 6 parent directories. This is a violation of the ISO9660 standard which only allows 6."
+						  _("The children of this directory will have 7 parent directories."
 						    "\nBrasero can create an image of such a file hierarchy and burn it; but the disc may not be readable on all operating systems."
 						    "\nNOTE: Such a file hierarchy is known to work on linux."));
 
@@ -1693,7 +1693,7 @@
 	brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
 				   BRASERO_DISC_MESSAGE (message),
 				   _("_Cancel Loading"),
-				   _("Press if you want to cancel current project loading"),
+				   _("Cancel loading current project"),
 				   GTK_RESPONSE_CANCEL);
 	g_signal_connect (message,
 			  "response",

Modified: trunk/src/brasero-jacket-edit.c
==============================================================================
--- trunk/src/brasero-jacket-edit.c	(original)
+++ trunk/src/brasero-jacket-edit.c	Sun Jan 11 21:56:56 2009
@@ -649,7 +649,7 @@
 
 	priv->colours = brasero_tool_color_picker_new ();
 	brasero_tool_color_picker_set_text (BRASERO_TOOL_COLOR_PICKER (priv->colours),
-					    _("_Text Colour"));
+					    _("_Text Color"));
 	gtk_widget_show (priv->colours);
 	g_signal_connect (priv->colours,
 			  "color-set",

Modified: trunk/src/brasero-metadata.c
==============================================================================
--- trunk/src/brasero-metadata.c	(original)
+++ trunk/src/brasero-metadata.c	Sun Jan 11 21:56:56 2009
@@ -595,7 +595,7 @@
 			BRASERO_GET_BASENAME_FOR_DISPLAY (priv->info->uri, name);
 			priv->error = g_error_new (BRASERO_ERROR,
 						   BRASERO_ERROR_GENERAL,
-						   _("\"%s\" could not be handled by gstreamer."),
+						   _("\"%s\" could not be handled by Gstreamer."),
 						   name);
 			g_free (name);
 		}

Modified: trunk/src/brasero-search-beagle.c
==============================================================================
--- trunk/src/brasero-search-beagle.c	(original)
+++ trunk/src/brasero-search-beagle.c	Sun Jan 11 21:56:56 2009
@@ -1027,7 +1027,7 @@
 brasero_search_beagle_error_dialog (BraseroSearch *search, GError *error)
 {
 	brasero_app_alert (brasero_app_get_default (),
-			   _("Error querying beagle."),
+			   _("Error querying Beagle."),
 			   error->message,
 			   GTK_MESSAGE_ERROR);
 }

Modified: trunk/src/brasero-split-dialog.c
==============================================================================
--- trunk/src/brasero-split-dialog.c	(original)
+++ trunk/src/brasero-split-dialog.c	Sun Jan 11 21:56:56 2009
@@ -1083,7 +1083,7 @@
 			  "clicked",
 			  G_CALLBACK (brasero_split_dialog_cut_clicked_cb),
 			  object);
-	gtk_widget_set_tooltip_text (button, _("Press to add a splitting point"));
+	gtk_widget_set_tooltip_text (button, _("Add a splitting point"));
 	priv->cut = button;
 
 	priv->notebook = gtk_notebook_new ();

Modified: trunk/src/plugins/cdrkit/burn-readom.c
==============================================================================
--- trunk/src/plugins/cdrkit/burn-readom.c	(original)
+++ trunk/src/plugins/cdrkit/burn-readom.c	Sun Jan 11 21:56:56 2009
@@ -398,7 +398,7 @@
 
 	brasero_plugin_define (plugin,
 			       "readom",
-			       _("Use readom to image CDs and DVDs"),
+			       _("Use readom to create disc images"),
 			       "Philippe Rouquier",
 			       1);
 

Modified: trunk/src/plugins/cdrtools/burn-readcd.c
==============================================================================
--- trunk/src/plugins/cdrtools/burn-readcd.c	(original)
+++ trunk/src/plugins/cdrtools/burn-readcd.c	Sun Jan 11 21:56:56 2009
@@ -408,7 +408,7 @@
 
 	brasero_plugin_define (plugin,
 			       "readcd",
-			       _("Use readcd to image CDs and DVDs"),
+			       _("Use readcd to create disc images"),
 			       "Philippe Rouquier",
 			       0);
 

Modified: trunk/src/plugins/local-track/burn-uri.c
==============================================================================
--- trunk/src/plugins/local-track/burn-uri.c	(original)
+++ trunk/src/plugins/local-track/burn-uri.c	Sun Jan 11 21:56:56 2009
@@ -559,7 +559,7 @@
 				* which will be translated only when it needs
 				* displaying. */
 			       N_("CD/DVD Creator Folder"),
-			       _("Allows to burn files added to \"CD/DVD Creator Folder\" in nautilus"),
+			       _("Allows to burn files added to \"CD/DVD Creator Folder\" in Nautilus"),
 			       "Philippe Rouquier",
 			       11);