brasero r1514 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Mon Nov 10 21:32:07 2008
New Revision: 1514
URL: http://svn.gnome.org/viewvc/brasero?rev=1514&view=rev

Log:
	Fix button order in alert dialog
	Improve coherence of strings

	* src/brasero-burn-dialog.c (brasero_burn_dialog_loss_warnings_cb),
	(brasero_burn_dialog_disable_joliet_cb):
	* src/brasero-disc-option-dialog.c
	(brasero_disc_option_dialog_joliet_toggled_cb):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-burn-dialog.c
   trunk/src/brasero-disc-option-dialog.c

Modified: trunk/src/brasero-burn-dialog.c
==============================================================================
--- trunk/src/brasero-burn-dialog.c	(original)
+++ trunk/src/brasero-burn-dialog.c	Mon Nov 10 21:32:07 2008
@@ -661,10 +661,6 @@
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
 						 "%s", secondary_message);
 
-	gtk_dialog_add_buttons (GTK_DIALOG (message),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				NULL);
-
 	button = brasero_utils_make_button (_("_Replace Disc"),
 					    GTK_STOCK_REFRESH,
 					    NULL,
@@ -673,6 +669,10 @@
 	gtk_dialog_add_action_widget (GTK_DIALOG (message),
 				      button, GTK_RESPONSE_ACCEPT);
 
+	gtk_dialog_add_buttons (GTK_DIALOG (message),
+				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				NULL);
+
 	button = brasero_utils_make_button (button_text,
 					    NULL,
 					    button_icon,
@@ -795,7 +795,7 @@
 					  _("Do you want to continue with Windows compatibility disabled?"));
 
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-						  _("Some files don't have a suitable name for a Windows-compatible CD."));
+						  _("Some files don't have a suitable name for a fully Windows-compatible CD."));
 
 	gtk_dialog_add_buttons (GTK_DIALOG (message),
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,

Modified: trunk/src/brasero-disc-option-dialog.c
==============================================================================
--- trunk/src/brasero-disc-option-dialog.c	(original)
+++ trunk/src/brasero-disc-option-dialog.c	Mon Nov 10 21:32:07 2008
@@ -331,6 +331,7 @@
 	BraseroDiscOptionDialogPrivate *priv;
 	GtkResponseType answer;
 	GtkWidget *message;
+	gchar *secondary;
 	gboolean hide;
 
 	priv = BRASERO_DISC_OPTION_DIALOG_PRIVATE (dialog);
@@ -354,8 +355,11 @@
 					  GTK_BUTTONS_NONE,
 					  _("Should files be renamed to be fully Windows-compatible?"));
 
-	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-						  _("Some files don't have a suitable name for a fully Windows-compatible CD. Those names should be changed and truncated to 64 characters."));
+	secondary = g_strdup_printf ("%s\n%s",
+				     _("Some files don't have a suitable name for a fully Windows-compatible CD."),
+				     _("Those names should be changed and truncated to 64 characters."));
+	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), secondary);
+	g_free (secondary);
 
 	gtk_dialog_add_button (GTK_DIALOG (message),
 			       _("_Disable Full Windows Compatibility"),