Commit 3ec3db5c authored by Philippe Rouquier's avatar Philippe Rouquier

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):

svn path=/trunk/; revision=1461
parent 568ea1ad
2008-11-03 Philippe Rouquier <ykw@localhost.localdomain>
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):
2008-11-03 Philippe Rouquier <ykw@localhost.localdomain>
If we're asked to open a new empty data project on the command line,
......
......@@ -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>
......
......@@ -643,7 +643,7 @@ brasero_app_init (BraseroApp *object)
/* 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");
......
......@@ -1741,7 +1741,7 @@ brasero_audio_disc_add_uri_real (BraseroAudioDisc *disc,
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 @@ brasero_audio_disc_add_uri_real (BraseroAudioDisc *disc,
}
else
gtk_list_store_set (GTK_LIST_STORE (store), &iter,
SIZE_COL, _("loading"),
SIZE_COL, _("(loading ...)"),
-1);
if (gap_sectors > 0)
......
......@@ -214,6 +214,9 @@ brasero_blank_dialog_activate (BraseroToolDialog *dialog,
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 @@ brasero_blank_dialog_init (BraseroBlankDialog *obj)
priv = BRASERO_BLANK_DIALOG_PRIVATE (obj);
/* Translators: This is a verb, an action */
brasero_tool_dialog_set_button (BRASERO_TOOL_DIALOG (obj),
_("_Blank"),
NULL,
......
......@@ -1250,6 +1250,7 @@ brasero_data_disc_import_button_new (BraseroDataDisc *self,
BRASERO_DATA_DISC_MEDIUM,
medium);
/* Translators: This is a verb */
g_object_set (action,
"short-label", _("Import"), /* for toolbar buttons */
NULL);
......
......@@ -241,6 +241,8 @@ brasero_mime_filter_add_mime (BraseroMimeFilter *filter, const gchar *mime)
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);
......
......@@ -979,7 +979,7 @@ brasero_playlist_insert (BraseroPlaylist *playlist, const gchar *uri)
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);
......
......@@ -279,15 +279,7 @@ brasero_burn_progress_display_session_info (BraseroBurnProgress *obj,
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);
......
......@@ -207,6 +207,7 @@ static GtkActionEntry entries [] = {
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 @@ brasero_project_empty_cb (GtkAction *action, BraseroProject *project)
"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);
......
......@@ -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 @@ static void
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 @@ brasero_utils_register_string (const gchar *string)
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 @@ brasero_utils_register_string (const gchar *string)
g_hash_table_insert (stringsH,
key,
GINT_TO_POINTER (1));
G_UNLOCK (strings_mutex);
G_UNLOCK (stringsH);
return key;
}
......@@ -137,7 +137,7 @@ brasero_utils_register_string (const gchar *string)
key,
GINT_TO_POINTER (ref));
G_UNLOCK (strings_mutex);
G_UNLOCK (stringsH);
return key;
}
......@@ -153,10 +153,10 @@ brasero_utils_unregister_string (const gchar *string)
return;
}
G_LOCK (strings_mutex);
G_LOCK (stringsH);
if (!stringsH) {
G_UNLOCK (strings_mutex);
G_UNLOCK (stringsH);
return;
}
......@@ -165,7 +165,7 @@ brasero_utils_unregister_string (const gchar *string)
&key,
&reftmp);
if (!success) {
G_UNLOCK (strings_mutex);
G_UNLOCK (stringsH);
return;
}
......@@ -178,7 +178,7 @@ brasero_utils_unregister_string (const gchar *string)
g_free (key);
}
G_UNLOCK (strings_mutex);
G_UNLOCK (stringsH);
}
gchar *
......@@ -261,7 +261,9 @@ brasero_utils_get_size_string (gint64 dsize,
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 @@ brasero_utils_get_size_string (gint64 dsize,
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);
......
......@@ -195,7 +195,7 @@ brasero_video_tree_model_get_value (GtkTreeModel *model,
g_free (text);
}
else
g_value_set_string (value, _("loading"));
g_value_set_string (value, _("(loading ...)"));
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment