brasero r1600 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Wed Dec  3 16:11:22 2008
New Revision: 1600
URL: http://svn.gnome.org/viewvc/brasero?rev=1600&view=rev

Log:
	Fixed some problems with incorrect strings
	See #549211 â Wrong use of word Delete (last comments)

	* src/brasero-disc.c (brasero_disc_get_use_info_notebook):
	* src/brasero-split-dialog.c
	(brasero_split_dialog_clear_confirm_dialog),
	(brasero_split_dialog_cut_clicked_cb),
	(brasero_split_dialog_reset_clicked_cb):


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

Modified: trunk/src/brasero-disc.c
==============================================================================
--- trunk/src/brasero-disc.c	(original)
+++ trunk/src/brasero-disc.c	Wed Dec  3 16:11:22 2008
@@ -650,8 +650,8 @@
 	 * You simply have to translate messages in the best form
          * for a list of actions. */
 	message_add_header = g_strconcat ("<big>", _("To add files to this project you can:"), "\n</big>", NULL);
-	message_add = g_strconcat ("\t* ", _("click the \"Add\" button to show the selection pane"), "\n",
-				   "\t* ", _("select files in selection pane and click the \"Add\" button"), "\n",
+	message_add = g_strconcat ("\t* ", _("click the \"Add\" button to show a selection dialog"), "\n",
+				   "\t* ", _("select files in the selection pane and click the \"Add\" button"), "\n",
 				   "\t* ", _("drag files in this area from the selection pane or from the file manager"), "\n",
 				   "\t* ", _("double click on files in the selection pane"), "\n",
 

Modified: trunk/src/brasero-split-dialog.c
==============================================================================
--- trunk/src/brasero-split-dialog.c	(original)
+++ trunk/src/brasero-split-dialog.c	Wed Dec  3 16:11:22 2008
@@ -666,7 +666,10 @@
 }
 
 static gboolean
-brasero_split_dialog_clear_confirm_dialog (BraseroSplitDialog *self)
+brasero_split_dialog_clear_confirm_dialog (BraseroSplitDialog *self,
+					   const gchar *primary,
+					   const gchar *cancel_button,
+					   const gchar *ok_button)
 {
 	BraseroSplitDialogPrivate *priv;
 	GtkResponseType answer;
@@ -684,16 +687,16 @@
 					  GTK_DIALOG_MODAL,
 					  GTK_MESSAGE_QUESTION,
 					  GTK_BUTTONS_NONE,
-					  _("Do you really want to carry on with automatic splitting?"));
+					  primary);
 
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
 						  _("This will remove all previous results."));
 
 	gtk_dialog_add_button (GTK_DIALOG (message),
-			       _("_Don't split"),
+			       cancel_button,
 			       GTK_RESPONSE_CANCEL);
 	gtk_dialog_add_button (GTK_DIALOG (message),
-			       _("_Split"),
+			       ok_button,
 			       GTK_RESPONSE_YES);
 
 	answer = gtk_dialog_run (GTK_DIALOG (message));
@@ -726,7 +729,10 @@
 	}
 
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree));
-	if (!brasero_split_dialog_clear_confirm_dialog (self))
+	if (!brasero_split_dialog_clear_confirm_dialog (self,
+							_("Do you really want to carry on with automatic splitting?"),
+							_("_Don't split"),
+							_("_Split")))
 		return;
 
 	if (page == 1) {
@@ -940,7 +946,10 @@
 	GtkTreeModel *model;
 
 	priv = BRASERO_SPLIT_DIALOG_PRIVATE (self);
-	if (!brasero_split_dialog_clear_confirm_dialog (self))
+	if (!brasero_split_dialog_clear_confirm_dialog (self,
+							_("Do you really want to empty the slices preview?"),
+							GTK_STOCK_CANCEL,
+							_("Re_move All")))
 		return;
 
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree));