GNOME.org
 

brasero r1461 - in trunk: . data src

Author: philippr
Date: Mon Nov  3 13:15:33 2008
New Revision: 1461
URL: http://svn.gnome.org/viewvc/brasero?rev=1461&view=rev

Log:
	Fix #558852 â translation issues

	* data/brasero.schemas.in:
	* src/brasero-app.c (brasero_app_init):
	* src/brasero-audio-disc.c (brasero_audio_disc_add_uri_real):
	* src/brasero-blank-dialog.c (brasero_blank_dialog_activate),
	(brasero_blank_dialog_init):
	* src/brasero-data-disc.c (brasero_data_disc_import_button_new):
	* src/brasero-mime-filter.c (brasero_mime_filter_add_mime):
	* src/brasero-playlist.c (brasero_playlist_insert):
	* src/brasero-progress.c
	(brasero_burn_progress_display_session_info):
	* src/brasero-project.c (brasero_project_empty_cb):
	* src/brasero-utils.c (brasero_utils_free),
	(brasero_utils_register_string), (brasero_utils_unregister_string),
	(brasero_utils_get_size_string):
	* src/brasero-video-tree-model.c
	(brasero_video_tree_model_get_value):


Modified:
   trunk/ChangeLog
   trunk/data/brasero.schemas.in
   trunk/src/brasero-app.c
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-blank-dialog.c
   trunk/src/brasero-data-disc.c
   trunk/src/brasero-mime-filter.c
   trunk/src/brasero-playlist.c
   trunk/src/brasero-progress.c
   trunk/src/brasero-project.c
   trunk/src/brasero-utils.c
   trunk/src/brasero-video-tree-model.c

Modified: trunk/data/brasero.schemas.in
==============================================================================
--- trunk/data/brasero.schemas.in	(original)
+++ trunk/data/brasero.schemas.in	Mon Nov  3 13:15:33 2008
@@ -78,7 +78,7 @@
 	<default>0</default>
 	<locale name="C">
 	  <short>Used in conjunction with -immed flag with cdrecord</short>
-	  <long>Only used in conjunction with -immed flag with cdrecord. See immed_flag.</long>
+	  <long>Used in conjunction with -immed flag with cdrecord</long>
 	</locale>
        </schema>
 

Modified: trunk/src/brasero-app.c
==============================================================================
--- trunk/src/brasero-app.c	(original)
+++ trunk/src/brasero-app.c	Mon Nov  3 13:15:33 2008
@@ -643,7 +643,7 @@
 
 	/* New window */
 	priv = BRASERO_APP_PRIVATE (object);
-	g_set_application_name (_("Brasero Disc Burning"));
+	g_set_application_name (_("Brasero Disc Burner"));
 
 	gtk_window_set_default_icon_name ("brasero");
 	gtk_window_set_icon_name (GTK_WINDOW (object), "brasero");

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Mon Nov  3 13:15:33 2008
@@ -1741,7 +1741,7 @@
 			    NAME_COL, markup,
 			    ICON_COL, "image-loading",
 			    URI_COL, uri,
-			    ARTIST_COL, _("loading"),
+			    ARTIST_COL, _("(loading ...)"),
 			    SONG_COL, TRUE,
 			    -1);
 	g_free (markup);
@@ -1766,7 +1766,7 @@
 	}
 	else
 		gtk_list_store_set (GTK_LIST_STORE (store), &iter,
-				    SIZE_COL, _("loading"),
+				    SIZE_COL, _("(loading ...)"),
 				    -1);
 
 	if (gap_sectors > 0)

Modified: trunk/src/brasero-blank-dialog.c
==============================================================================
--- trunk/src/brasero-blank-dialog.c	(original)
+++ trunk/src/brasero-blank-dialog.c	Mon Nov  3 13:15:33 2008
@@ -214,6 +214,9 @@
 		GtkWidget *message;
 		GtkWidget *button;
 
+		/* FIXME: error in string (capital letter) */
+		/* Translators: the following string means there was an error
+		 * while blanking. */
 		message =  gtk_message_dialog_new (GTK_WINDOW (self),
 						   GTK_DIALOG_DESTROY_WITH_PARENT|
 						   GTK_DIALOG_MODAL,
@@ -363,6 +366,7 @@
 
 	priv = BRASERO_BLANK_DIALOG_PRIVATE (obj);
 
+	/* Translators: This is a verb, an action */
 	brasero_tool_dialog_set_button (BRASERO_TOOL_DIALOG (obj),
 					_("_Blank"),
 					NULL,

Modified: trunk/src/brasero-data-disc.c
==============================================================================
--- trunk/src/brasero-data-disc.c	(original)
+++ trunk/src/brasero-data-disc.c	Mon Nov  3 13:15:33 2008
@@ -1250,6 +1250,7 @@
 			   BRASERO_DATA_DISC_MEDIUM,
 			   medium);
 
+	/* Translators: This is a verb */
 	g_object_set (action,
 		      "short-label", _("Import"), /* for toolbar buttons */
 		      NULL);

Modified: trunk/src/brasero-mime-filter.c
==============================================================================
--- trunk/src/brasero-mime-filter.c	(original)
+++ trunk/src/brasero-mime-filter.c	Mon Nov  3 13:15:33 2008
@@ -241,6 +241,8 @@
 		const gchar *icon_string = BRASERO_DEFAULT_ICON;
 
 		description = g_content_type_get_description (mime);
+
+		/* Translators: the %s is the mime type used to filter files */
 		display = g_strdup_printf (_("%s only"), description);
 
 		icon = g_content_type_get_icon (mime);

Modified: trunk/src/brasero-playlist.c
==============================================================================
--- trunk/src/brasero-playlist.c	(original)
+++ trunk/src/brasero-playlist.c	Mon Nov  3 13:15:33 2008
@@ -979,7 +979,7 @@
 	gtk_tree_store_set (GTK_TREE_STORE (model), &parent,
 			    BRASERO_PLAYLIST_DISPLAY_COL, name,
 			    BRASERO_PLAYLIST_URI_COL, uri,
-			    BRASERO_PLAYLIST_NB_SONGS_COL, _("Loading ..."),
+			    BRASERO_PLAYLIST_NB_SONGS_COL, _("(loading ...)"),
 			    -1);
 	g_free (name);
 

Modified: trunk/src/brasero-progress.c
==============================================================================
--- trunk/src/brasero-progress.c	(original)
+++ trunk/src/brasero-progress.c	Mon Nov  3 13:15:33 2008
@@ -279,15 +279,7 @@
 	gtk_box_pack_start (GTK_BOX (obj), table, TRUE, TRUE, 20);
 	gtk_widget_show_all (table);
 
-	if (written > 1024 * 1024)
-		text = g_strdup_printf (_("%i MiB"), written / 1024 / 1024);
-	else if (written > 1024)
-		text = g_strdup_printf (_("%i KiB"), written / 1024);
-	else if (written > 0)
-		text = g_strdup_printf (_("%i bytes"), written);
-	else
-		return;
-
+	text = g_format_size_for_display (written);
 	gtk_label_set_text (GTK_LABEL (obj->priv->bytes_written), text);
 	gtk_widget_show (obj->priv->bytes_written);
 	g_free (text);

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Mon Nov  3 13:15:33 2008
@@ -207,6 +207,7 @@
 	 N_("Add files to the project"), G_CALLBACK (brasero_project_add_uris_cb)},
 	{"DeleteProject", GTK_STOCK_REMOVE, N_("_Remove Files"), NULL,
 	 N_("Remove the selected files from the project"), G_CALLBACK (brasero_project_remove_selected_uris_cb)},
+	/* Translators: "empty" is a verb here */
 	{"DeleteAll", GTK_STOCK_CLEAR, N_("E_mpty Project"), NULL,
 	 N_("Remove all files from the project"), G_CALLBACK (brasero_project_empty_cb)},
 	{"Burn", "media-optical-burn", N_("_Burn..."), NULL,
@@ -1489,8 +1490,10 @@
 							    "All the work will be lost. "
 							    "Note that files will not be deleted from their own location, "
 							    "just no longer listed here."));
+		/* Translators: "empty" is a verb here */
 		gtk_dialog_add_button (GTK_DIALOG (dialog),
-				       _("_Empty Project"), GTK_RESPONSE_OK);
+				       _("E_mpty Project"),
+				       GTK_RESPONSE_OK);
 
 		answer = gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);

Modified: trunk/src/brasero-utils.c
==============================================================================
--- trunk/src/brasero-utils.c	(original)
+++ trunk/src/brasero-utils.c	Mon Nov  3 13:15:33 2008
@@ -46,7 +46,7 @@
 #define BRASERO_ERROR brasero_error_quark()
 
 static GHashTable *stringsH = NULL;
-G_LOCK_DEFINE (strings_mutex);
+G_LOCK_DEFINE_STATIC (stringsH);
 
 static gboolean
 brasero_utils_clear_strings_cb (gchar *string,
@@ -61,13 +61,13 @@
 brasero_utils_free (void)
 {
 	if (stringsH) {
-		G_LOCK (strings_mutex);
+		G_LOCK (stringsH);
 		g_hash_table_foreach_remove (stringsH,
 					     (GHRFunc) brasero_utils_clear_strings_cb,
 					     NULL);
 		g_hash_table_destroy (stringsH);
 		stringsH = NULL;
-		G_UNLOCK (strings_mutex);
+		G_UNLOCK (stringsH);
 	}
 }
 
@@ -111,7 +111,7 @@
 		return NULL;
 	}
 
-	G_LOCK (strings_mutex);
+	G_LOCK (stringsH);
 
 	if (!stringsH) {
 		stringsH = g_hash_table_new (g_str_hash, g_str_equal);
@@ -128,7 +128,7 @@
 		g_hash_table_insert (stringsH,
 				     key,
 				     GINT_TO_POINTER (1));
-		G_UNLOCK (strings_mutex);
+		G_UNLOCK (stringsH);
 		return key;
 	}
 
@@ -137,7 +137,7 @@
 			     key,
 			     GINT_TO_POINTER (ref));
 
-	G_UNLOCK (strings_mutex);
+	G_UNLOCK (stringsH);
 	return key;
 }
 
@@ -153,10 +153,10 @@
 		return;
 	}
 
-	G_LOCK (strings_mutex);
+	G_LOCK (stringsH);
 
 	if (!stringsH) {
-		G_UNLOCK (strings_mutex);
+		G_UNLOCK (stringsH);
 		return;
 	}
 
@@ -165,7 +165,7 @@
 						&key,
 						&reftmp);
 	if (!success) {
-		G_UNLOCK (strings_mutex);
+		G_UNLOCK (stringsH);
 		return;
 	}
 
@@ -178,7 +178,7 @@
 		g_free (key);
 	}
 
-	G_UNLOCK (strings_mutex);
+	G_UNLOCK (stringsH);
 }
 
 gchar *
@@ -261,7 +261,9 @@
 	int unit;
 	int size;
 	int remain = 0;
-	const char *units[] = { "", N_("KiB"), N_("MiB"), N_("GiB") };
+
+	if (with_unit)
+		return g_format_size_for_display (dsize);
 
 	if (dsize < 1024) {
 		unit = BRASERO_UTILS_NO_UNIT;
@@ -294,18 +296,7 @@
 		size -= remains;
 	}
 
-	if (with_unit == TRUE && unit != BRASERO_UTILS_NO_UNIT) {
-		if (remain)
-			return g_strdup_printf ("%i.%i %s",
-						size,
-						remain,
-						_(units[unit]));
-		else
-			return g_strdup_printf ("%i %s",
-						size,
-						_(units[unit]));
-	}
-	else if (remain)
+	if (remain)
 		return g_strdup_printf ("%i.%i",
 					size,
 					remain);

Modified: trunk/src/brasero-video-tree-model.c
==============================================================================
--- trunk/src/brasero-video-tree-model.c	(original)
+++ trunk/src/brasero-video-tree-model.c	Mon Nov  3 13:15:33 2008
@@ -195,7 +195,7 @@
 			g_free (text);
 		}
 		else
-			g_value_set_string (value, _("loading"));
+			g_value_set_string (value, _("(loading ...)"));
 
 		return;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]