brasero r1887 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Feb  7 20:20:08 2009
New Revision: 1887
URL: http://svn.gnome.org/viewvc/brasero?rev=1887&view=rev

Log:
2009-02-07  Philippe Rouquier  <ykw localhost localdomain>

	Fix #570235 â Possible incorrect translation of a string in multiple languages
	Change the string "by" by "with" and "Substitute" to "_Replace".
	There was a mistake as the English phrase is substitute A _for_ B.
	Moreover it meant that B was changed into A which was the opposite.
	Also added reminders in comments to use multiple context if such a thing
	would happen again;

	* src/brasero-jacket-edit.c (brasero_jacket_edit_set_audio_tracks):
	* src/brasero-rename.c (brasero_rename_init):

Modified:
   trunk/ChangeLog
   trunk/src/brasero-jacket-edit.c
   trunk/src/brasero-rename.c

Modified: trunk/src/brasero-jacket-edit.c
==============================================================================
--- trunk/src/brasero-jacket-edit.c	(original)
+++ trunk/src/brasero-jacket-edit.c	Sat Feb  7 20:20:08 2009
@@ -832,6 +832,9 @@
 			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n", "Subtitle", &start);
 
 			if (info->artist) {
+				/* Reminder: if this string happens to be used
+				 * somewhere else in brasero we'll need a
+				 * context with C_() macro */
 				/* Translators: "by" is followed by the name of an artist.
 				 * This text is the one written on the cover of a disc.
 				 * Before it there is the name of the song.

Modified: trunk/src/brasero-rename.c
==============================================================================
--- trunk/src/brasero-rename.c	(original)
+++ trunk/src/brasero-rename.c	Sat Feb  7 20:20:08 2009
@@ -339,7 +339,7 @@
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox, NULL);
 
 	/* Translators: this is a verb */
-	label = gtk_label_new (_("Substitute"));
+	label = gtk_label_new_with_mnemonic (_("_Replace"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
@@ -348,9 +348,13 @@
 	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
 	priv->substitute_entry = entry;
 
-	/* Translators: this goes with above verb to say "Substitute" [Entry]
-	 * "by" [Entry]. */
-	label = gtk_label_new (_("by"));
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
+
+	/* Reminder: if this string happens to be used somewhere else in brasero
+	 * we'll need a context with C_() macro */
+	/* Translators: this goes with above verb to say "_Replace" [Entry]
+	 * "with" [Entry]. */
+	label = gtk_label_new (_("with"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);