diff --git a/gtk/actions.c b/gtk/actions.c index b2b7532e5..47c242a63 100644 --- a/gtk/actions.c +++ b/gtk/actions.c @@ -71,7 +71,7 @@ static GtkActionEntry entries[] = N_("_Start"), "S", NULL, G_CALLBACK(action_cb) }, { "recheck-torrent", GTK_STOCK_REFRESH, N_("Re_check"), NULL, NULL, G_CALLBACK(action_cb) }, - { "stop-torrent", GTK_STOCK_MEDIA_PAUSE, + { "pause-torrent", GTK_STOCK_MEDIA_PAUSE, N_("_Pause"), "P", NULL, G_CALLBACK(action_cb) }, { "remove-torrent", GTK_STOCK_REMOVE, N_("_Remove"), "R", NULL, G_CALLBACK(action_cb) }, diff --git a/gtk/main.c b/gtk/main.c index 448d3c994..ead5a0c41 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -198,7 +198,7 @@ refreshTorrentActions( GtkTreeSelection * s ) { int status = 0; gtk_tree_selection_selected_foreach( s, accumulateStatusForeach, &status ); - action_sensitize( "stop-torrent", (status & TR_STATUS_ACTIVE) != 0); + action_sensitize( "pause-torrent", (status & TR_STATUS_ACTIVE) != 0); action_sensitize( "start-torrent", (status & TR_STATUS_INACTIVE) != 0); action_sensitize( "remove-torrent", status != 0); action_sensitize( "recheck-torrent", status != 0); @@ -987,7 +987,7 @@ doAction ( const char * action_name, gpointer user_data ) gtk_tree_selection_selected_foreach( s, startTorrentForeach, NULL ); changed |= gtk_tree_selection_count_selected_rows( s ) != 0; } - else if (!strcmp (action_name, "stop-torrent")) + else if (!strcmp (action_name, "pause-torrent")) { GtkTreeSelection * s = tr_window_get_selection(data->wind); gtk_tree_selection_selected_foreach( s, stopTorrentForeach, NULL ); diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c index 315f284d1..778eb48f1 100644 --- a/gtk/makemeta-ui.c +++ b/gtk/makemeta-ui.c @@ -225,7 +225,7 @@ make_meta_ui( GtkWindow * parent, tr_handle * handle ) MakeMetaUI * ui = g_new0 ( MakeMetaUI, 1 ); ui->handle = handle; - d = gtk_dialog_new_with_buttons( _("Make a New Torrent"), + d = gtk_dialog_new_with_buttons( _("Create New Torrent"), parent, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, diff --git a/gtk/torrent-inspector.c b/gtk/torrent-inspector.c index ec5d7ab27..3a699d53d 100644 --- a/gtk/torrent-inspector.c +++ b/gtk/torrent-inspector.c @@ -1597,16 +1597,13 @@ torrent_inspector_new ( GtkWindow * parent, TrTorrent * gtor ) const tr_info * info = tr_torrent_info (gtor); /* create the dialog */ - pch = g_strdup_printf ("%s: %s", - g_get_application_name(), - _("Torrent Inspector")); + pch = _( "Torrent Info" ); d = gtk_dialog_new_with_buttons (pch, parent, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); gtk_window_set_role (GTK_WINDOW(d), "tr-info" ); g_signal_connect (d, "response", G_CALLBACK (response_cb), gtor); g_object_weak_ref (G_OBJECT(gtor), torrent_destroyed, d); - g_free (pch); /* add label with file name and size */ diff --git a/gtk/tr_prefs.c b/gtk/tr_prefs.c index 6c1637457..a5e39d2f4 100644 --- a/gtk/tr_prefs.c +++ b/gtk/tr_prefs.c @@ -197,7 +197,7 @@ tr_prefs_dialog_new( GObject * core, GtkWindow * parent ) GtkWidget * l; GtkWidget * d; - d = gtk_dialog_new_with_buttons( _("Transmission: Preferences"), parent, + d = gtk_dialog_new_with_buttons( _("Preferences"), parent, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL ); diff --git a/gtk/ui.h b/gtk/ui.h index 1f218f9ff..fb2164ef9 100644 --- a/gtk/ui.h +++ b/gtk/ui.h @@ -5,7 +5,7 @@ const char * fallback_ui_file = " \n" " \n" " \n" -" \n" +" \n" " \n" " \n" " \n" @@ -31,7 +31,7 @@ const char * fallback_ui_file = " \n" " \n" " \n" -" \n" +" \n" " \n" " \n" " \n" @@ -41,7 +41,7 @@ const char * fallback_ui_file = " \n" " \n" " \n" -" \n" +" \n" " \n" " \n" " \n"