brasero r1544 - in trunk: . data src src/plugins/libburnia src/plugins/local-track

From: philippr svn gnome org
To: svn-commits-list gnome org
Subject: brasero r1544 - in trunk: . data src src/plugins/libburnia src/plugins/local-track
Date: Tue, 18 Nov 2008 15:06:41 +0000 (UTC)
Author: philippr
Date: Tue Nov 18 15:06:41 2008
New Revision: 1544
URL: http://svn.gnome.org/viewvc/brasero?rev=1544&view=rev

Log:

	Probably (and hopefully) the last patch for string review
	Also fixed a problem with search pane which didn\'t return any result
	when no category was selected
	Small changes (mainly string) in search pane

	* data/brasero-copy-medium.desktop.in.in:
	* data/brasero-open-image.desktop.in.in:
	* data/brasero-open-playlist.desktop.in.in:
	* data/brasero-open-project.desktop.in.in:
	* src/brasero-app.c (brasero_app_add_recent):
	* src/brasero-audio-disc.c (brasero_audio_disc_add_uri_real):
	* src/brasero-data-disc.c (brasero_data_disc_project_oversized_cb):
	* src/brasero-data-tree-model.c
	(brasero_data_tree_model_get_value):
	* src/brasero-disc-message.c (brasero_disc_message_add_button):
	* src/brasero-drive-properties.c
	(brasero_drive_properties_set_tmpdir_info):
	* src/brasero-jacket-edit.c (brasero_jacket_edit_set_audio_tracks):
	* src/brasero-jacket-view.c
	(brasero_jacket_view_populate_popup_cb):
	* src/brasero-metadata.c (brasero_metadata_success),
	(brasero_metadata_create_pipeline):
	* src/brasero-mime-filter.c (brasero_mime_filter_init):
	* src/brasero-multi-song-props.c
	(brasero_multi_song_props_get_properties),
	(brasero_multi_song_props_gap_output_cb),
	(brasero_multi_song_props_gap_input_cb),
	(brasero_multi_song_props_entry_focus_out),
	(brasero_multi_song_props_entry_focus_in),
	(brasero_multi_song_props_init):
	* src/brasero-playlist.c (brasero_playlist_parse_result):
	* src/brasero-plugin-manager-ui.c (brasero_plugin_manager_ui_init):
	* src/brasero-preview.c (brasero_preview_init):
	* src/brasero-rename.c (brasero_rename_init):
	* src/brasero-search-entry.c (brasero_search_entry_get_type),
	(brasero_search_entry_init), (brasero_search_entry_get_query):
	* src/brasero-search-entry.h:
	* src/brasero-song-properties.c (brasero_song_props_init):
	* src/brasero-tray.c:
	* src/burn-medium.c:
	* src/plugins/libburnia/burn-libburn.c
	(brasero_libburn_export_caps):
	* src/plugins/libburnia/burn-libisofs.c
	(brasero_libisofs_export_caps):
	* src/plugins/local-track/burn-local-image.c
	(brasero_local_track_export_caps):


Modified:
   trunk/ChangeLog
   trunk/data/brasero-copy-medium.desktop.in.in
   trunk/data/brasero-open-image.desktop.in.in
   trunk/data/brasero-open-playlist.desktop.in.in
   trunk/data/brasero-open-project.desktop.in.in
   trunk/src/brasero-app.c
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-data-disc.c
   trunk/src/brasero-data-tree-model.c
   trunk/src/brasero-disc-message.c
   trunk/src/brasero-drive-properties.c
   trunk/src/brasero-jacket-edit.c
   trunk/src/brasero-jacket-view.c
   trunk/src/brasero-metadata.c
   trunk/src/brasero-mime-filter.c
   trunk/src/brasero-multi-song-props.c
   trunk/src/brasero-playlist.c
   trunk/src/brasero-plugin-manager-ui.c
   trunk/src/brasero-preview.c
   trunk/src/brasero-rename.c
   trunk/src/brasero-search-entry.c
   trunk/src/brasero-search-entry.h
   trunk/src/brasero-song-properties.c
   trunk/src/brasero-tray.c
   trunk/src/burn-medium.c
   trunk/src/plugins/libburnia/burn-libburn.c
   trunk/src/plugins/libburnia/burn-libisofs.c
   trunk/src/plugins/local-track/burn-local-image.c

Modified: trunk/data/brasero-copy-medium.desktop.in.in
==============================================================================
--- trunk/data/brasero-copy-medium.desktop.in.in	(original)
+++ trunk/data/brasero-copy-medium.desktop.in.in	Tue Nov 18 15:06:41 2008
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Brasero Disc Copier
+_Name=Disc Copier
 _GenericName=Disc Copier
 _Comment=Copy CDs and DVDs
 Categories=GNOME;AudioVideo;DiscBurning;

Modified: trunk/data/brasero-open-image.desktop.in.in
==============================================================================
--- trunk/data/brasero-open-image.desktop.in.in	(original)
+++ trunk/data/brasero-open-image.desktop.in.in	Tue Nov 18 15:06:41 2008
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Brasero Disc Burner
+_Name=Disc Burner
 _GenericName=Disc Burner
 _Comment=Create CDs and DVDs
 Categories=GNOME;AudioVideo;DiscBurning;

Modified: trunk/data/brasero-open-playlist.desktop.in.in
==============================================================================
--- trunk/data/brasero-open-playlist.desktop.in.in	(original)
+++ trunk/data/brasero-open-playlist.desktop.in.in	Tue Nov 18 15:06:41 2008
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Brasero Disc Burner
+_Name=Disc Burner
 _GenericName=Disc Burner
 _Comment=Create CDs and DVDs
 Categories=GNOME;AudioVideo;DiscBurning;

Modified: trunk/data/brasero-open-project.desktop.in.in
==============================================================================
--- trunk/data/brasero-open-project.desktop.in.in	(original)
+++ trunk/data/brasero-open-project.desktop.in.in	Tue Nov 18 15:06:41 2008
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Brasero Disc Burner
+_Name=Disc Burner
 _GenericName=Disc Burner
 _Comment=Create CDs and DVDs
 Categories=GNOME;AudioVideo;DiscBurning;

Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c	(original)
+++ trunk/src/brasero-app.c	Tue Nov 18 15:06:41 2008
@@ -108,7 +108,7 @@
 	{"Erase", "media-optical-blank", N_("_Erase..."), NULL,
 	 N_("Erase a disc"), G_CALLBACK (on_erase_cb)},
 
-	{"Check", GTK_STOCK_FIND, N_("_Check Integrity..."), NULL,
+	{"Check", NULL, N_("_Check Integrity..."), NULL,
 	 N_("Check data integrity of disc"), G_CALLBACK (on_integrity_check_cb)},
 
 	{"Exit", GTK_STOCK_QUIT, NULL, NULL,
@@ -116,7 +116,7 @@
 
 #ifdef BUILD_GNOME2
 	
-	{"Contents", GTK_STOCK_HELP, N_("_Contents"), "F1", N_("Contents"),
+	{"Contents", GTK_STOCK_HELP, N_("_Contents"), "F1", N_("Display help"),
 	 G_CALLBACK (on_help_cb)}, 
 
 #endif
@@ -666,7 +666,7 @@
 						    recent);
 	filter = gtk_recent_filter_new ();
 
-	gtk_recent_filter_set_name (filter, _("Brasero projects"));
+	gtk_recent_filter_set_name (filter, _("_Recent Projects"));
 	gtk_recent_filter_add_mime_type (filter, "application/x-brasero");
 	gtk_recent_filter_add_mime_type (filter, "application/x-cd-image");
 	gtk_recent_filter_add_mime_type (filter, "application/x-cdrdao-toc");

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Tue Nov 18 15:06:41 2008
@@ -1764,7 +1764,7 @@
 				    ICON_COL, "image-loading",
 				    NAME_COL, info->title? info->title:markup,
 				    TITLE_SET_COL, info->title? TRUE:FALSE,
-				    ARTIST_COL, info->artist? info->artist:_("loading ..."),
+				    ARTIST_COL, info->artist? info->artist:_("(loading ...)"),
 				    ARTIST_SET_COL, info->artist? TRUE:FALSE,
 				    COMPOSER_COL, info->composer? info->composer:NULL,
 				    COMPOSER_SET_COL, info->composer? TRUE:FALSE,

Modified: trunk/src/brasero-data-disc.c
==============================================================================
--- trunk/src/brasero-data-disc.c	(original)
+++ trunk/src/brasero-data-disc.c	Tue Nov 18 15:06:41 2008
@@ -626,7 +626,7 @@
 					   GTK_RESPONSE_OK);
 		brasero_notify_button_add (BRASERO_NOTIFY (priv->message),
 					   BRASERO_DISC_MESSAGE (message),
-					   _("_Cancel"),
+					   GTK_STOCK_CANCEL,
 					   _("Click here not to use overburning"),
 					   GTK_RESPONSE_CANCEL);
 		

Modified: trunk/src/brasero-data-tree-model.c
==============================================================================
--- trunk/src/brasero-data-tree-model.c	(original)
+++ trunk/src/brasero-data-tree-model.c	Tue Nov 18 15:06:41 2008
@@ -434,7 +434,7 @@
 			if (node->is_exploring)
 				g_value_set_string (value, _("(loading ...)"));
 			else
-				g_value_set_string (value, _("empty"));
+				g_value_set_string (value, _("Empty"));
 
 			return;
 
@@ -574,7 +574,7 @@
 
 			nb_items = brasero_file_node_get_n_children (node);
 			if (!nb_items)
-				g_value_set_string (value, _("empty"));
+				g_value_set_string (value, _("Empty"));
 			else if (nb_items == 1)
 				g_value_set_string (value, _("1 item"));
 			else {

Modified: trunk/src/brasero-disc-message.c
==============================================================================
--- trunk/src/brasero-disc-message.c	(original)
+++ trunk/src/brasero-disc-message.c	Tue Nov 18 15:06:41 2008
@@ -289,7 +289,7 @@
 
 	priv = BRASERO_DISC_MESSAGE_PRIVATE (self);
 
-	button = gtk_button_new_with_mnemonic (text);
+	button = gtk_button_new_from_stock (text);
 
 	/* only add buttons to group if the text is not wrapped. Otherwise
 	 * buttons would be too big. */

Modified: trunk/src/brasero-drive-properties.c
==============================================================================
--- trunk/src/brasero-drive-properties.c	(original)
+++ trunk/src/brasero-drive-properties.c	Tue Nov 18 15:06:41 2008
@@ -143,7 +143,7 @@
 	file = g_file_new_for_commandline_arg (path);
 	if (!file) {
 		BRASERO_BURN_LOG ("impossible to retrieve size for %s", path);
-		gtk_label_set_text (GTK_LABEL (priv->tmpdir_size), _("unknown"));
+		gtk_label_set_text (GTK_LABEL (priv->tmpdir_size), _("Unknown"));
 		return FALSE;
 	}
 
@@ -160,7 +160,7 @@
 		BRASERO_BURN_LOG ("impossible to retrieve size for %s (%s)", path, error->message);
 		g_error_free (error);
 
-		gtk_label_set_text (GTK_LABEL (priv->tmpdir_size), _("unknown"));
+		gtk_label_set_text (GTK_LABEL (priv->tmpdir_size), _("Unknown"));
 		return FALSE;
 	}
 

Modified: trunk/src/brasero-jacket-edit.c
==============================================================================
--- trunk/src/brasero-jacket-edit.c	(original)
+++ trunk/src/brasero-jacket-edit.c	Tue Nov 18 15:06:41 2008
@@ -809,7 +809,13 @@
 		BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, "\n", "Subtitle", &start);
 
 		if (info->artist) {
-			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, _("by "), "Artist", &start);
+			/* 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.
+			 * I had to break it because it is in a GtkTextBuffer
+			 * and every word has a different tag. */
+			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, _("by"), "Artist", &start);
+			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, " ", "Artist", &start);
 			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, info->artist, "Artist", &start);
 			BRASERO_JACKET_EDIT_INSERT_TAGGED_TEXT (buffer, " ", "Artist", &start);
 		}

Modified: trunk/src/brasero-jacket-view.c
==============================================================================
--- trunk/src/brasero-jacket-view.c	(original)
+++ trunk/src/brasero-jacket-view.c	Tue Nov 18 15:06:41 2008
@@ -734,7 +734,7 @@
 	gtk_widget_show (item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-	item = gtk_menu_item_new_with_mnemonic (_("Set bac_kground properties"));
+	item = gtk_menu_item_new_with_mnemonic (_("Set Bac_kground Properties"));
 	gtk_widget_show (item);
 	g_signal_connect (item,
 			  "activate",

Modified: trunk/src/brasero-metadata.c
==============================================================================
--- trunk/src/brasero-metadata.c	(original)
+++ trunk/src/brasero-metadata.c	Tue Nov 18 15:06:41 2008
@@ -596,9 +596,14 @@
 
 	if (duration == -1) {
 		if (!priv->error) {
+			gchar *name;
+
+			BRASERO_GET_BASENAME_FOR_DISPLAY (priv->info->uri, name);
 			priv->error = g_error_new (BRASERO_ERROR,
 						   BRASERO_ERROR_GENERAL,
-						   _("this format is not supported by gstreamer"));
+						   _("\"%s\" could not be handled by gstreamer."),
+						   name);
+			g_free (name);
 		}
 
 		return brasero_metadata_completed (self);
@@ -1331,7 +1336,8 @@
 	if (priv->decode == NULL) {
 		priv->error = g_error_new (BRASERO_ERROR,
 					   BRASERO_ERROR_GENERAL,
-					   "decode can't be created");
+					   _("%s element could not be created"),
+					   "\"Decodebin\"");
 		return FALSE;
 	}
 	g_signal_connect (G_OBJECT (priv->decode), "new-decoded-pad",
@@ -1345,7 +1351,8 @@
 	if (!priv->convert) {
 		priv->error = g_error_new (BRASERO_ERROR,
 					   BRASERO_ERROR_GENERAL,
-					   "Can't create audioconvert");
+					   _("%s element could not be created"),
+					   "\"Audioconvert\"");
 		return FALSE;
 	}
 
@@ -1353,7 +1360,8 @@
 	if (!priv->level) {
 		priv->error = g_error_new (BRASERO_ERROR,
 					   BRASERO_ERROR_GENERAL,
-					   "Can't create level");
+					   _("%s element could not be created"),
+					   "\"Level\"");
 		return FALSE;
 	}
 	g_object_set (priv->level,
@@ -1365,7 +1373,8 @@
 	if (priv->sink == NULL) {
 		priv->error = g_error_new (BRASERO_ERROR,
 					   BRASERO_ERROR_GENERAL,
-					   "Can't create fake sink");
+					   _("%s element could not be created"),
+					   "\"Fakesink\"");
 		return FALSE;
 	}
 

Modified: trunk/src/brasero-mime-filter.c
==============================================================================
--- trunk/src/brasero-mime-filter.c	(original)
+++ trunk/src/brasero-mime-filter.c	Tue Nov 18 15:06:41 2008
@@ -137,12 +137,6 @@
 
 	gtk_box_pack_end (GTK_BOX (obj), obj->combo, FALSE, FALSE, 0);
 
-	obj->priv->label = gtk_label_new (_("Show"));
-	gtk_label_set_justify (GTK_LABEL (obj->priv->label),
-			       GTK_JUSTIFY_RIGHT);
-	gtk_box_pack_end (GTK_BOX (obj), obj->priv->label, FALSE, FALSE,
-			  0);
-
 	obj->priv->table = g_hash_table_new_full (g_str_hash,
 						  g_str_equal,
 						  (GDestroyNotify) g_free,

Modified: trunk/src/brasero-multi-song-props.c
==============================================================================
--- trunk/src/brasero-multi-song-props.c	(original)
+++ trunk/src/brasero-multi-song-props.c	Tue Nov 18 15:06:41 2008
@@ -82,7 +82,7 @@
 	priv = BRASERO_MULTI_SONG_PROPS_PRIVATE (self);
 	if (artist) {
 		text = gtk_entry_get_text (GTK_ENTRY (priv->artist));
-		if (text && strcmp (text, _("<keep current values>")))
+		if (text && strcmp (text, _("<Keep current values>")))
 			*artist = g_strdup (text);
 		else
 			*artist = NULL;
@@ -90,7 +90,7 @@
 
 	if (composer) {
 		text = gtk_entry_get_text (GTK_ENTRY (priv->composer));
-		if (text && strcmp (text, _("<keep current values>")))
+		if (text && strcmp (text, _("<Keep current values>")))
 			*composer = g_strdup (text);
 		else
 			*composer = NULL;
@@ -98,7 +98,7 @@
 
 	if (isrc) {
 		text = gtk_entry_get_text (GTK_ENTRY (priv->isrc));
-		if (text && strcmp (text, _("<keep current values>")))
+		if (text && strcmp (text, _("<Keep current values>")))
 			*isrc = (gint) g_strtod (text, NULL);
 		else
 			*isrc = -1;
@@ -116,7 +116,7 @@
 		return FALSE;
 
 	if (gtk_spin_button_get_value (spin) == -1.0)
-		gtk_entry_set_text (GTK_ENTRY (spin), _("<keep current values>"));
+		gtk_entry_set_text (GTK_ENTRY (spin), _("<Keep current values>"));
 
 	if (gtk_spin_button_get_value (spin) == 0.0)
 		gtk_entry_set_text (GTK_ENTRY (spin), _("Remove silences"));
@@ -132,7 +132,7 @@
 	const gchar *text;
 
 	text = gtk_entry_get_text (GTK_ENTRY (spin));
-	if (text && !strcmp (text, _("<keep current values>"))) {
+	if (text && !strcmp (text, _("<Keep current values>"))) {
 		*val = -1.0;
 		return TRUE;
 	}
@@ -153,7 +153,7 @@
 
 	text = gtk_entry_get_text (entry);
 	if (!text || text [0] == '\0')
-		gtk_entry_set_text (entry, _("<keep current values>"));
+		gtk_entry_set_text (entry, _("<Keep current values>"));
 
 	return FALSE;
 }
@@ -166,7 +166,7 @@
 	const gchar *text;
 
 	text = gtk_entry_get_text (entry);
-	if (text && !strcmp (text, _("<keep current values>")))
+	if (text && !strcmp (text, _("<Keep current values>")))
 		gtk_entry_set_text (entry, "");
 
 	return FALSE;
@@ -241,7 +241,7 @@
 
 	priv->artist = gtk_entry_new ();
 	gtk_widget_show (priv->artist);
-	gtk_entry_set_text (GTK_ENTRY (priv->artist), _("<keep current values>"));
+	gtk_entry_set_text (GTK_ENTRY (priv->artist), _("<Keep current values>"));
 	gtk_table_attach_defaults (GTK_TABLE (table), priv->artist, 1, 2, 1, 2);
 	gtk_widget_set_tooltip_text (priv->artist,
 				     _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players."));
@@ -255,14 +255,14 @@
 			  G_CALLBACK (brasero_multi_song_props_entry_focus_out),
 			  NULL);
 
-	label = gtk_label_new (_("Composer:\t"));
+	label = gtk_label_new (_("Composer:"));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
 
 	priv->composer = gtk_entry_new ();
 	gtk_widget_show (priv->composer);
-	gtk_entry_set_text (GTK_ENTRY (priv->composer), _("<keep current values>"));
+	gtk_entry_set_text (GTK_ENTRY (priv->composer), _("<Keep current values>"));
 	gtk_table_attach_defaults (GTK_TABLE (table), priv->composer, 1, 2, 2, 3);
 	gtk_widget_set_tooltip_text (priv->composer,
 				     _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players."));
@@ -283,7 +283,7 @@
 
 	priv->isrc = gtk_entry_new ();
 	gtk_widget_show (priv->isrc);
-	gtk_entry_set_text (GTK_ENTRY (priv->isrc), _("<keep current values>"));
+	gtk_entry_set_text (GTK_ENTRY (priv->isrc), _("<Keep current values>"));
 	gtk_table_attach_defaults (GTK_TABLE (table), priv->isrc, 1, 2, 3, 4);
 
 	g_signal_connect (priv->isrc,
@@ -309,7 +309,7 @@
 	gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), frame, FALSE, FALSE, 0);
 
-	label = gtk_label_new (_("Pause length:\t"));
+	label = gtk_label_new (_("Pause length:"));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 

Modified: trunk/src/brasero-playlist.c
==============================================================================
--- trunk/src/brasero-playlist.c	(original)
+++ trunk/src/brasero-playlist.c	Tue Nov 18 15:06:41 2008
@@ -919,7 +919,7 @@
 	num = gtk_tree_model_iter_n_children (model, &parent);
 	if (!num)
 		num_string = g_strdup (_("Empty"));
-	else
+	else	/* Translators: %d is the number of songs */
 		num_string = g_strdup_printf (ngettext ("%d song", "%d songs", num), num);
 
 	/* get total length in time of the playlist */

Modified: trunk/src/brasero-plugin-manager-ui.c
==============================================================================
--- trunk/src/brasero-plugin-manager-ui.c	(original)
+++ trunk/src/brasero-plugin-manager-ui.c	Tue Nov 18 15:06:41 2008
@@ -901,12 +901,10 @@
 static void 
 brasero_plugin_manager_ui_init (BraseroPluginManagerUI *pm)
 {
-	gchar *markup;
 	GtkWidget *vbox;
 	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkWidget *alignment;
 	GtkWidget *viewport;
+	GtkWidget *alignment;
 	GtkWidget *vbuttonbox;
 	BraseroPluginManager *manager;
 	BraseroPluginManagerUIPrivate *priv;
@@ -916,20 +914,10 @@
 	gtk_box_set_spacing (GTK_BOX (pm), 6);
 	gtk_container_set_border_width (GTK_CONTAINER (pm), 12);
 
-	label = gtk_label_new (NULL);
-	markup = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
-					  _("Plugins"));
-	gtk_label_set_markup (GTK_LABEL (label), markup);
-	g_free (markup);
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	
-	gtk_box_pack_start (GTK_BOX (pm), label, FALSE, TRUE, 0);
-
 	alignment = gtk_alignment_new (0., 0., 1., 1.);
 	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
 	gtk_box_pack_start (GTK_BOX (pm), alignment, TRUE, TRUE, 0);
-
+ 	
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (alignment), vbox);

Modified: trunk/src/brasero-preview.c
==============================================================================
--- trunk/src/brasero-preview.c	(original)
+++ trunk/src/brasero-preview.c	Tue Nov 18 15:06:41 2008
@@ -169,7 +169,7 @@
 
 	priv = BRASERO_PREVIEW_PRIVATE (object);
 
-	priv->frame = gtk_frame_new (_(" Preview "));
+	priv->frame = gtk_frame_new (_("Preview"));
 	gtk_container_add (GTK_CONTAINER (object), priv->frame);
 
 	priv->player = brasero_player_new ();

Modified: trunk/src/brasero-rename.c
==============================================================================
--- trunk/src/brasero-rename.c	(original)
+++ trunk/src/brasero-rename.c	Tue Nov 18 15:06:41 2008
@@ -294,6 +294,7 @@
 	gtk_widget_show (hbox);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox, NULL);
 
+	/* Translators: This is a verb. This is completed later */
 	label = gtk_label_new (_("Insert"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -305,8 +306,15 @@
 
 	combo = gtk_combo_box_new_text ();
 	gtk_widget_show (combo);
+
+	/* Translators: This finishes previous action "Insert". It goes like
+	 * this: "Insert" [Entry] "at the beginning". */
 	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("at the begining"));
+
+	/* Translators: This finishes previous action "Insert". It goes like
+	 * this: "Insert" [Entry] "at the end". */
 	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("at the end"));
+
 	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 	gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
 	priv->insert_combo = combo;
@@ -330,6 +338,7 @@
 	gtk_widget_show (hbox);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), hbox, NULL);
 
+	/* Translators: this is a verb */
 	label = gtk_label_new (_("Substitute"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -339,6 +348,8 @@
 	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_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);

Modified: trunk/src/brasero-search-entry.c
==============================================================================
--- trunk/src/brasero-search-entry.c	(original)
+++ trunk/src/brasero-search-entry.c	Tue Nov 18 15:06:41 2008
@@ -120,7 +120,7 @@
 			(GInstanceInitFunc) brasero_search_entry_init,
 		};
 
-		type = g_type_register_static (GTK_TYPE_VBOX,
+		type = g_type_register_static (GTK_TYPE_TABLE,
 					       "BraseroSearchEntry",
 					       &our_info,
 					       0);
@@ -173,7 +173,6 @@
 brasero_search_entry_init (BraseroSearchEntry *obj)
 {
 	gchar *string;
-	GtkWidget *box;
 	GtkWidget *table;
 	GtkWidget *label;
 	GtkWidget *entry;
@@ -182,23 +181,33 @@
 	GtkCellRenderer *renderer;
 	GtkEntryCompletion *completion;
 
-	gtk_box_set_spacing (GTK_BOX (obj), 6);
+	gtk_table_set_row_spacings (GTK_TABLE (obj), 6);
+	gtk_table_set_col_spacings (GTK_TABLE (obj), 6);
+	gtk_table_resize (GTK_TABLE (obj), 2, 3);
 	obj->priv = g_new0 (BraseroSearchEntryPrivate, 1);
 
-	box = gtk_hbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (obj), box, FALSE, FALSE, 0);
-
-	/* Translators: This string is followed later by "only in\t" */
-	string = g_strdup_printf ("<b>%s</b>", _("Search:\t"));
+	string = g_strdup_printf ("<b>%s</b>", _("Search:"));
 	label = gtk_label_new (string);
 	g_free (string);
 
 	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-	gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+	gtk_table_attach (GTK_TABLE (obj),
+			  label,
+			  0, 1,
+			  0, 1,
+			  GTK_FILL,
+			  GTK_FILL,
+			  2, 2);
 
 	obj->priv->button = gtk_button_new_from_stock (GTK_STOCK_FIND);
-	/* gtk_widget_set_sensitive (obj->priv->button, FALSE); */
-	gtk_box_pack_end (GTK_BOX (box), obj->priv->button, FALSE, FALSE, 0);
+	gtk_table_attach (GTK_TABLE (obj),
+			  obj->priv->button,
+			  2, 3,
+			  0, 1,
+			  GTK_FILL,
+			  GTK_FILL,
+			  0, 0);
+
 	g_signal_connect (G_OBJECT (obj->priv->button),
 			  "clicked",
 			  G_CALLBACK (brasero_search_entry_button_clicked_cb),
@@ -240,36 +249,28 @@
 	gtk_entry_completion_set_text_column (completion, BRASERO_SEARCH_ENTRY_DISPLAY_COL);
 	gtk_entry_set_completion (GTK_ENTRY (entry), completion);
 
-	gtk_box_pack_start (GTK_BOX (box),
-			    obj->priv->combo,
-			    TRUE,
-			    TRUE,
-			    0);
-
-	/* table */
-	table = gtk_table_new (2, 3, FALSE);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-
-	gtk_box_pack_end (GTK_BOX (obj), table, FALSE, FALSE, 0);
+	gtk_table_attach (GTK_TABLE (obj),
+			  obj->priv->combo,
+			  1, 2,
+			  0, 1,
+			  GTK_FILL|GTK_EXPAND,
+			  GTK_FILL,
+			  0, 0);
 
-	/* Translators: This is the end of the previous sentence  "Search:\t" */
-	string = g_strdup_printf ("<b>%s</b>", _("only in\t"));
-	label = gtk_label_new (string);
-	g_free (string);
+	/* Table with filtering options */
+	table = gtk_table_new (2, 2, FALSE);
+	gtk_table_set_col_spacings (GTK_TABLE (table), 10);
+	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
 
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
-	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-	gtk_table_attach (GTK_TABLE (table),
-			  label,
-			  0, 1,
-			  0, 1,
-			  0,
-			  0,
-			  0,
-			  0);
+	gtk_table_attach (GTK_TABLE (obj),
+			  table,
+			  1, 2,
+			  1, 2,
+			  GTK_FILL,
+			  GTK_FILL,
+			  0, 0);
 
-	obj->priv->documents = gtk_check_button_new_with_mnemonic (_("_Text documents"));
+	obj->priv->documents = gtk_check_button_new_with_mnemonic (_("In _text documents"));
 	gtk_button_set_alignment (GTK_BUTTON (obj->priv->documents), 0.0, 0.0);
 	gtk_table_attach (GTK_TABLE (table),
 			  obj->priv->documents,
@@ -284,7 +285,7 @@
 			  G_CALLBACK (brasero_search_entry_category_clicked_cb),
 			  obj);
 
-	obj->priv->pictures = gtk_check_button_new_with_mnemonic (_("_Pictures"));
+	obj->priv->pictures = gtk_check_button_new_with_mnemonic (_("In _pictures"));
 	gtk_button_set_alignment (GTK_BUTTON (obj->priv->pictures), 0.0, 0.0);
 	gtk_table_attach (GTK_TABLE (table),
 			  obj->priv->pictures,
@@ -299,7 +300,7 @@
 			  G_CALLBACK (brasero_search_entry_category_clicked_cb),
 			  obj);
 
-	obj->priv->music = gtk_check_button_new_with_mnemonic (_("_Music"));
+	obj->priv->music = gtk_check_button_new_with_mnemonic (_("In _music"));
 	gtk_button_set_alignment (GTK_BUTTON (obj->priv->music), 0.0, 0.0);
 	gtk_table_attach (GTK_TABLE (table),
 			  obj->priv->music,
@@ -314,7 +315,7 @@
 			  G_CALLBACK (brasero_search_entry_category_clicked_cb),
 			  obj);
 
-	obj->priv->video = gtk_check_button_new_with_mnemonic (_("_Video"));
+	obj->priv->video = gtk_check_button_new_with_mnemonic (_("In _videos"));
 	gtk_button_set_alignment (GTK_BUTTON (obj->priv->video), 0.0, 0.0);
 	gtk_table_attach (GTK_TABLE (table),
 			  obj->priv->video,
@@ -681,8 +682,8 @@
 brasero_search_entry_get_query (BraseroSearchEntry *entry)
 {
 	BeagleQuery *query;
-	BeagleQueryPartOr *or_part;
 	BeagleQueryPartHuman *text;
+	BeagleQueryPartOr *or_part = NULL;
 
 	/* Not sure about all this */
 	query = beagle_query_new ();
@@ -702,11 +703,12 @@
 	beagle_query_part_human_set_string (text, "type:File");
 	beagle_query_add_part (query, BEAGLE_QUERY_PART (text));
 
-	or_part = beagle_query_part_or_new ();
-	
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (entry->priv->documents))) {
 		BeagleQueryPartProperty *filetype;
 
+		if (!or_part)
+			or_part = beagle_query_part_or_new ();
+
 		filetype = beagle_query_part_property_new ();
 		beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
 		beagle_query_part_property_set_key (filetype, "beagle:FileType");
@@ -717,6 +719,9 @@
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (entry->priv->pictures))) {
 		BeagleQueryPartProperty *filetype;
 
+		if (!or_part)
+			or_part = beagle_query_part_or_new ();
+
 		filetype = beagle_query_part_property_new ();
 		beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
 		beagle_query_part_property_set_key (filetype, "beagle:FileType");
@@ -727,6 +732,9 @@
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (entry->priv->music))) {
 		BeagleQueryPartProperty *filetype;
 
+		if (!or_part)
+			or_part = beagle_query_part_or_new ();
+
 		filetype = beagle_query_part_property_new ();
 		beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
 		beagle_query_part_property_set_key (filetype, "beagle:FileType");
@@ -737,6 +745,9 @@
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (entry->priv->video))) {
 		BeagleQueryPartProperty *filetype;
 
+		if (!or_part)
+			or_part = beagle_query_part_or_new ();
+
 		filetype = beagle_query_part_property_new ();
 		beagle_query_part_property_set_property_type (filetype, BEAGLE_PROPERTY_TYPE_KEYWORD);
 		beagle_query_part_property_set_key (filetype, "beagle:FileType");
@@ -744,8 +755,10 @@
 		beagle_query_part_or_add_subpart (or_part, BEAGLE_QUERY_PART (filetype));
 	}
 
-	beagle_query_add_part (query, BEAGLE_QUERY_PART (or_part));
+	if (!or_part)
+		return query;
 
+	beagle_query_add_part (query, BEAGLE_QUERY_PART (or_part));
 	return query;
 }
 

Modified: trunk/src/brasero-search-entry.h
==============================================================================
--- trunk/src/brasero-search-entry.h	(original)
+++ trunk/src/brasero-search-entry.h	Tue Nov 18 15:06:41 2008
@@ -52,12 +52,12 @@
 typedef struct BraseroSearchEntryPrivate BraseroSearchEntryPrivate;
 
 typedef struct {
-	GtkHBox parent;
+	GtkTable parent;
 	BraseroSearchEntryPrivate *priv;
 } BraseroSearchEntry;
 
 typedef struct {
-	GtkHBoxClass parent_class;
+	GtkTableClass parent_class;
 
 	void	(*activated)	(BraseroSearchEntry *entry);
 

Modified: trunk/src/brasero-song-properties.c
==============================================================================
--- trunk/src/brasero-song-properties.c	(original)
+++ trunk/src/brasero-song-properties.c	Tue Nov 18 15:06:41 2008
@@ -199,7 +199,7 @@
 	gtk_widget_set_tooltip_text (obj->priv->artist,
 				     _("This information will be written to the disc using CD-TEXT technology. It can be read and displayed by some audio CD players."));
 
-	label = gtk_label_new (_("Composer:\t"));
+	label = gtk_label_new (_("Composer:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	obj->priv->composer = gtk_entry_new ();
 	g_signal_connect (obj->priv->composer,
@@ -233,19 +233,19 @@
 	gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (obj)->vbox), frame, FALSE, FALSE, 0);
 
-	label = gtk_label_new (_("Song start:\t"));
+	label = gtk_label_new (_("Song start:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	obj->priv->start = brasero_time_button_new ();
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_table_attach (GTK_TABLE (table), obj->priv->start, 1, 2, 0, 1, 0, 0, 0, 0);
 
-	label = gtk_label_new (_("Song end:\t"));
+	label = gtk_label_new (_("Song end:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	obj->priv->end = brasero_time_button_new ();
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_table_attach (GTK_TABLE (table), obj->priv->end, 1, 2, 1, 2, 0, 0, 0, 0);
 
-	label = gtk_label_new (_("Pause length:\t"));
+	label = gtk_label_new (_("Pause length:"));
 	obj->priv->gap_label = label;
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	obj->priv->gap = gtk_spin_button_new_with_range (0.0, 100.0, 1.0);
@@ -256,7 +256,7 @@
 	gtk_widget_set_tooltip_text (obj->priv->gap,
 				     _("Gives the length of the pause that should follow the track"));
 
-	label = gtk_label_new (_("Track length:\t"));
+	label = gtk_label_new (_("Track length:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
 	obj->priv->length = gtk_label_new (NULL);

Modified: trunk/src/brasero-tray.c
==============================================================================
--- trunk/src/brasero-tray.c	(original)
+++ trunk/src/brasero-tray.c	Tue Nov 18 15:06:41 2008
@@ -79,12 +79,12 @@
 
 static GtkActionEntry entries[] = {
 	{"ContextualMenu", NULL, N_("Menu")},
-	{"Cancel", GTK_STOCK_CANCEL, N_("Cancel"), NULL, N_("Cancel ongoing burning"),
+	{"Cancel", GTK_STOCK_CANCEL, NULL, NULL, N_("Cancel ongoing burning"),
 	 G_CALLBACK (brasero_tray_icon_cancel_cb)},
 };
 
 static GtkToggleActionEntry toggle_entries[] = {
-	{"Show", NULL, N_("Show dialog"), NULL, N_("Show dialog"),
+	{"Show", NULL, N_("Show _Dialog"), NULL, N_("Show dialog"),
 	 G_CALLBACK (brasero_tray_icon_show_cb), TRUE,},
 };
 

Modified: trunk/src/burn-medium.c
==============================================================================
--- trunk/src/burn-medium.c	(original)
+++ trunk/src/burn-medium.c	Tue Nov 18 15:06:41 2008
@@ -62,7 +62,7 @@
 				"media-optical",
 				"media-optical",
 				NULL };
-const gchar *types [] = {	N_("file"),
+const gchar *types [] = {	N_("File"),
 				N_("CDROM"),
 				N_("CD-R"),
 				N_("CD-RW"),

Modified: trunk/src/plugins/libburnia/burn-libburn.c
==============================================================================
--- trunk/src/plugins/libburnia/burn-libburn.c	(original)
+++ trunk/src/plugins/libburnia/burn-libburn.c	Tue Nov 18 15:06:41 2008
@@ -888,7 +888,7 @@
 
 	brasero_plugin_define (plugin,
 			       "libburn",
-			       _("libburn burns CD(RW), DVD+/-(RW)"),
+			       _("Libburn burns CD(RW), DVD+/-(RW)"),
 			       "Philippe Rouquier",
 			       15);
 

Modified: trunk/src/plugins/libburnia/burn-libisofs.c
==============================================================================
--- trunk/src/plugins/libburnia/burn-libisofs.c	(original)
+++ trunk/src/plugins/libburnia/burn-libisofs.c	Tue Nov 18 15:06:41 2008
@@ -961,7 +961,7 @@
 
 	brasero_plugin_define (plugin,
 			       "libisofs",
-			       _("libisofs creates disc images from files"),
+			       _("Libisofs creates disc images from files"),
 			       "Philippe Rouquier",
 			       0);
 

Modified: trunk/src/plugins/local-track/burn-local-image.c
==============================================================================
--- trunk/src/plugins/local-track/burn-local-image.c	(original)
+++ trunk/src/plugins/local-track/burn-local-image.c	Tue Nov 18 15:06:41 2008
@@ -1066,7 +1066,7 @@
 
 	brasero_plugin_define (plugin,
 			       "local-track",
-			       _("local-track allows to burn files not stored locally"),
+			       _("Local-track allows to burn files not stored locally"),
 			       "Philippe Rouquier",
 			       10);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]