Commit cbe9fd97 authored by Philippe Rouquier's avatar Philippe Rouquier

Fix #596532 - String fixes

Patch by Philip Withnall <bugzilla@tecnocode.co.uk>
Converts Brasero to use proper em-dashes ("—") and ellipses ("…") in its strings
parent 11b44bd8
This diff is collapsed.
......@@ -729,7 +729,7 @@ brasero_status_dialog_uri_has_image (BraseroTrackDataCfg *track,
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Burn as _File"), GTK_RESPONSE_NO);
button = brasero_utils_make_button (_("Burn _Contents..."),
button = brasero_utils_make_button (_("Burn _Contents"),
NULL,
"media-optical-burn",
GTK_ICON_SIZE_BUTTON);
......
......@@ -619,7 +619,7 @@ brasero_track_data_cfg_get_value (GtkTreeModel *model,
case BRASERO_DATA_TREE_MODEL_NAME:
g_value_init (value, G_TYPE_STRING);
if (node->is_exploring)
g_value_set_string (value, _("(loading ...)"));
g_value_set_string (value, _("(loading)"));
else
g_value_set_string (value, _("Empty"));
......@@ -718,7 +718,7 @@ brasero_track_data_cfg_get_value (GtkTreeModel *model,
case BRASERO_DATA_TREE_MODEL_MIME_DESC:
g_value_init (value, G_TYPE_STRING);
if (node->is_loading)
g_value_set_string (value, _("(loading ...)"));
g_value_set_string (value, _("(loading)"));
else if (!node->is_file) {
gchar *description;
......@@ -729,7 +729,7 @@ brasero_track_data_cfg_get_value (GtkTreeModel *model,
else if (node->is_imported)
g_value_set_string (value, _("Disc file"));
else if (!BRASERO_FILE_NODE_MIME (node))
g_value_set_string (value, _("(loading ...)"));
g_value_set_string (value, _("(loading)"));
else {
gchar *description;
......@@ -790,12 +790,12 @@ brasero_track_data_cfg_get_value (GtkTreeModel *model,
case BRASERO_DATA_TREE_MODEL_SIZE:
g_value_init (value, G_TYPE_STRING);
if (node->is_loading)
g_value_set_string (value, _("(loading ...)"));
g_value_set_string (value, _("(loading)"));
else if (!node->is_file) {
guint nb_items;
if (node->is_exploring) {
g_value_set_string (value, _("(loading ...)"));
g_value_set_string (value, _("(loading)"));
return;
}
......
......@@ -479,7 +479,7 @@ nautilus_disc_burn_get_file_items (NautilusMenuProvider *provider,
if (is_iso) {
/* Whether or not this file is local is not a problem */
item = nautilus_menu_item_new ("NautilusDiscBurn::write_iso",
_("_Write to Disc..."),
_("_Write to Disc"),
_("Write disc image to a CD or DVD disc"),
"media-optical-data-new");
g_object_set_data (G_OBJECT (item), "file_info", file_info);
......@@ -548,7 +548,7 @@ nautilus_disc_burn_get_file_items (NautilusMenuProvider *provider,
if (brasero_burn_library_input_supported (type) == BRASERO_BURN_OK) {
/* user may want to copy it ... */
item = nautilus_menu_item_new ("NautilusDiscBurn::copy_disc",
_("_Copy Disc..."),
_("_Copy Disc"),
_("Create a copy of this CD or DVD disc"),
"media-optical-copy");
g_object_set_data (G_OBJECT (item), "file_info", file_info);
......@@ -562,7 +562,7 @@ nautilus_disc_burn_get_file_items (NautilusMenuProvider *provider,
if (brasero_burn_library_get_media_capabilities (media) & BRASERO_MEDIUM_REWRITABLE) {
/* ... or if it's a rewritable medium to blank it ... */
item = nautilus_menu_item_new ("NautilusDiscBurn::blank_disc",
_("_Blank Disc..."),
_("_Blank Disc"),
_("Blank this CD or DVD disc"),
"media-optical-blank");
g_object_set_data (G_OBJECT (item), "file_info", file_info);
......@@ -579,7 +579,7 @@ nautilus_disc_burn_get_file_items (NautilusMenuProvider *provider,
&& (media & BRASERO_MEDIUM_HAS_DATA)) {
/* ... or verify medium. */
item = nautilus_menu_item_new ("NautilusDiscBurn::check_disc",
_("_Check Disc..."),
_("_Check Disc"),
_("Check the data integrity on this CD or DVD disc"),
NULL);
g_object_set_data (G_OBJECT (item), "file_info", file_info);
......@@ -625,7 +625,7 @@ nautilus_disc_burn_get_background_items (NautilusMenuProvider *provider,
NautilusMenuItem *item;
item = nautilus_menu_item_new ("NautilusDiscBurn::write_menu",
_("_Write to Disc..."),
_("_Write to Disc"),
_("Write contents to a CD or DVD disc"),
"brasero");
g_signal_connect (item, "activate",
......
......@@ -130,10 +130,10 @@ static GtkActionEntry entries[] = {
{"Eject", "media-eject", N_("E_ject"), NULL,
N_("Eject a disc"), G_CALLBACK (on_eject_cb)},
{"Blank", "media-optical-blank", N_("_Blank..."), NULL,
{"Blank", "media-optical-blank", N_("_Blank"), NULL,
N_("Blank a disc"), G_CALLBACK (on_erase_cb)},
{"Check", NULL, N_("_Check Integrity..."), NULL,
{"Check", NULL, N_("_Check Integrity"), NULL,
N_("Check data integrity of disc"), G_CALLBACK (on_integrity_check_cb)},
{"Quit", GTK_STOCK_QUIT, NULL, NULL,
......
......@@ -151,7 +151,7 @@ static GtkActionEntry entries[] = {
{"ContextualMenu", NULL, N_("Menu")},
{"OpenSong", GTK_STOCK_OPEN, NULL, NULL, N_("Open the selected files"),
G_CALLBACK (brasero_audio_disc_open_activated_cb)},
{"EditSong", GTK_STOCK_PROPERTIES, N_("_Edit Information..."), NULL, N_("Edit the track information (start, end, author, ...)"),
{"EditSong", GTK_STOCK_PROPERTIES, N_("_Edit Information"), NULL, N_("Edit the track information (start, end, author, ...)"),
G_CALLBACK (brasero_audio_disc_edit_information_cb)},
{"DeleteAudio", GTK_STOCK_REMOVE, NULL, NULL, N_("Remove the selected files from the project"),
G_CALLBACK (brasero_audio_disc_delete_activated_cb)},
......@@ -159,7 +159,7 @@ static GtkActionEntry entries[] = {
G_CALLBACK (brasero_audio_disc_paste_activated_cb)},
{"Pause", "insert-pause", N_("I_nsert a Pause"), NULL, N_("Add a 2 second pause after the track"),
G_CALLBACK (brasero_audio_disc_add_pause_cb)},
{"Split", "transform-crop-and-resize", N_("_Split Track..."), NULL, N_("Split the selected track"),
{"Split", "transform-crop-and-resize", N_("_Split Track"), NULL, N_("Split the selected track"),
G_CALLBACK (brasero_audio_disc_split_cb)}
};
......
......@@ -124,7 +124,7 @@ static GtkActionEntry entries [] = {
{"ContextualMenu", NULL, N_("Menu")},
{"OpenFile", GTK_STOCK_OPEN, NULL, NULL, N_("Open the selected files"),
G_CALLBACK (brasero_data_disc_open_activated_cb)},
{"RenameData", NULL, N_("R_ename..."), NULL, N_("Rename the selected file"),
{"RenameData", NULL, N_("R_ename"), NULL, N_("Rename the selected file"),
G_CALLBACK (brasero_data_disc_rename_activated_cb)},
{"DeleteData", GTK_STOCK_REMOVE, NULL, NULL, N_("Remove the selected files from the project"),
G_CALLBACK (brasero_data_disc_delete_activated_cb)},
......@@ -632,7 +632,7 @@ brasero_data_disc_image_uri_cb (BraseroTrackDataCfg *vfs,
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Burn as _File"), GTK_RESPONSE_NO);
button = brasero_utils_make_button (_("Burn _Contents..."),
button = brasero_utils_make_button (_("Burn _Contents"),
NULL,
"media-optical-burn",
GTK_ICON_SIZE_BUTTON);
......
......@@ -303,7 +303,7 @@ brasero_file_filtered_init (BraseroFileFiltered *object)
gtk_widget_set_sensitive (priv->restore, FALSE);
gtk_widget_set_tooltip_text (priv->restore, _("Restore the selected files"));
button = gtk_button_new_with_mnemonic (_("_Options..."));
button = gtk_button_new_with_mnemonic (_("_Options"));
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
g_signal_connect (button,
......
......@@ -946,7 +946,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);
......
......@@ -113,12 +113,12 @@ static GtkActionEntry entries [] = {
N_("Create a CD/DVD containing any type of data that can only be read on a computer"), G_CALLBACK (brasero_project_manager_new_data_prj_cb)},
{"NewVideo", "media-optical-video-new", N_("New _Video Project"), NULL,
N_("Create a video DVD or a SVCD that are readable on TV readers"), G_CALLBACK (brasero_project_manager_new_video_prj_cb)},
{"NewCopy", "media-optical-copy", N_("Copy _Disc..."), NULL,
{"NewCopy", "media-optical-copy", N_("Copy _Disc"), NULL,
N_("Create a 1:1 copy of an audio CD or a data CD/DVD on your hard disk or on another CD/DVD"), G_CALLBACK (brasero_project_manager_new_copy_prj_cb)},
{"NewIso", "iso-image-burn", N_("_Burn Image..."), NULL,
{"NewIso", "iso-image-burn", N_("_Burn Image"), NULL,
N_("Burn an existing CD/DVD image to disc"), G_CALLBACK (brasero_project_manager_new_iso_prj_cb)},
{"Open", GTK_STOCK_OPEN, N_("_Open..."), NULL,
{"Open", GTK_STOCK_OPEN, N_("_Open"), NULL,
N_("Open a project"), G_CALLBACK (brasero_project_manager_open_cb)},
};
......@@ -554,7 +554,7 @@ brasero_project_manager_switch (BraseroProjectManager *manager,
}
if (toplevel)
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New Audio Disc Project"));
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero New Audio Disc Project"));
}
else if (type == BRASERO_PROJECT_TYPE_DATA) {
brasero_layout_load (BRASERO_LAYOUT (manager->priv->layout), BRASERO_LAYOUT_DATA);
......@@ -568,7 +568,7 @@ brasero_project_manager_switch (BraseroProjectManager *manager,
}
if (toplevel)
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New Data Disc Project"));
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero New Data Disc Project"));
}
else if (type == BRASERO_PROJECT_TYPE_VIDEO) {
brasero_layout_load (BRASERO_LAYOUT (manager->priv->layout), BRASERO_LAYOUT_VIDEO);
......@@ -582,7 +582,7 @@ brasero_project_manager_switch (BraseroProjectManager *manager,
}
if (toplevel)
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New Video Disc Project"));
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero New Video Disc Project"));
}
else if (type == BRASERO_PROJECT_TYPE_ISO) {
brasero_layout_load (BRASERO_LAYOUT (manager->priv->layout), BRASERO_LAYOUT_NONE);
......@@ -592,7 +592,7 @@ brasero_project_manager_switch (BraseroProjectManager *manager,
gtk_action_set_sensitive (action, FALSE);
if (toplevel)
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - New Image File"));
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero New Image File"));
brasero_project_manager_switch (manager,
BRASERO_PROJECT_TYPE_INVALID,
......@@ -609,7 +609,7 @@ brasero_project_manager_switch (BraseroProjectManager *manager,
gtk_action_set_sensitive (action, FALSE);
if (toplevel)
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero - Disc Copy"));
gtk_window_set_title (GTK_WINDOW (toplevel), _("Brasero Disc Copy"));
brasero_project_manager_switch (manager,
BRASERO_PROJECT_TYPE_INVALID,
......
......@@ -192,7 +192,7 @@ struct BraseroProjectPrivate {
static GtkActionEntry entries [] = {
{"Save", GTK_STOCK_SAVE, NULL, NULL,
N_("Save current project"), G_CALLBACK (brasero_project_save_cb)},
{"SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As..."), NULL,
{"SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As"), NULL,
N_("Save current project to a different location"), G_CALLBACK (brasero_project_save_as_cb)},
{"Add", GTK_STOCK_ADD, N_("_Add Files"), NULL,
N_("Add files to the project"), G_CALLBACK (brasero_project_add_uris_cb)},
......@@ -201,7 +201,7 @@ static GtkActionEntry entries [] = {
/* 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,
{"Burn", "media-optical-burn", N_("_Burn"), NULL,
N_("Burn the disc"), G_CALLBACK (brasero_project_burn_cb)},
};
......@@ -1104,7 +1104,7 @@ brasero_project_init (BraseroProject *obj)
size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
/* burn button set insensitive since there are no files in the selection */
obj->priv->burn = brasero_utils_make_button (_("_Burn..."),
obj->priv->burn = brasero_utils_make_button (_("_Burn"),
NULL,
"media-optical-burn",
GTK_ICON_SIZE_BUTTON);
......@@ -2265,13 +2265,13 @@ brasero_project_set_uri (BraseroProject *project,
BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
if (type == BRASERO_PROJECT_TYPE_DATA)
/* Translators: %s is the name of the project */
title = g_strdup_printf (_("Brasero - %s (Data Disc)"), name);
title = g_strdup_printf (_("Brasero %s (Data Disc)"), name);
else if (type == BRASERO_PROJECT_TYPE_AUDIO)
/* Translators: %s is the name of the project */
title = g_strdup_printf (_("Brasero - %s (Audio Disc)"), name);
title = g_strdup_printf (_("Brasero %s (Audio Disc)"), name);
else if (type == BRASERO_PROJECT_TYPE_VIDEO)
/* Translators: %s is the name of the project */
title = g_strdup_printf (_("Brasero - %s (Video Disc)"), name);
title = g_strdup_printf (_("Brasero %s (Video Disc)"), name);
else
title = NULL;
......
......@@ -788,7 +788,7 @@ brasero_search_update_header (BraseroSearch *search)
last = search->priv->first_hit + search->priv->max_results;
last = last <= search->priv->hits_num ? last : search->priv->hits_num;
tmp = g_strdup_printf (_("Results %i - %i (out of %i)"),
tmp = g_strdup_printf (_("Results %i%i (out of %i)"),
search->priv->first_hit + 1,
last,
search->priv->hits_num);
......
......@@ -100,13 +100,13 @@ static GtkActionEntry entries[] = {
{"ContextualMenu", NULL, N_("Menu")},
{"OpenVideo", GTK_STOCK_OPEN, NULL, NULL, N_("Open the selected video"),
G_CALLBACK (brasero_video_disc_open_activated_cb)},
{"EditVideo", GTK_STOCK_PROPERTIES, N_("_Edit Information..."), NULL, N_("Edit the video information (start, end, author, ...)"),
{"EditVideo", GTK_STOCK_PROPERTIES, N_("_Edit Information"), NULL, N_("Edit the video information (start, end, author, ...)"),
G_CALLBACK (brasero_video_disc_edit_information_cb)},
{"DeleteVideo", GTK_STOCK_REMOVE, NULL, NULL, N_("Remove the selected videos from the project"),
G_CALLBACK (brasero_video_disc_delete_activated_cb)},
{"PasteVideo", GTK_STOCK_PASTE, NULL, NULL, N_("Add the files stored in the clipboard"),
G_CALLBACK (brasero_video_disc_paste_activated_cb)},
/* {"Split", "transform-crop-and-resize", N_("_Split Track..."), NULL, N_("Split the selected track"),
/* {"Split", "transform-crop-and-resize", N_("_Split Track"), NULL, N_("Split the selected track"),
G_CALLBACK (brasero_video_disc_split_cb)} */
};
......
......@@ -337,7 +337,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)"));
brasero_status_free (status);
return;
......
......@@ -449,7 +449,7 @@ main (int argc, char **argv)
g_thread_init (NULL);
g_type_init ();
context = g_option_context_new (_("[URI] [URI] ..."));
context = g_option_context_new (_("[URI] [URI] "));
g_option_context_add_main_entries (context,
options,
GETTEXT_PACKAGE);
......
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