mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-07 23:14:41 +00:00
Code Issues Releases Wiki Activity

string consistency. (gtk) move `announce url' from info tab to tracker tab.

Browse source
This commit is contained in:
Charles Kerr 2008-03-08 02:00:47 +00:00
parent 909cb89b43
commit bcff72c3ad
3 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gtk/details.c
View file

@ -672,25 +672,18 @@ info_page_new (tr_torrent * tor)
char name[128];
const char * namefmt = "%s:";
GtkTextBuffer * b;
tr_tracker_info * track;
const tr_info * info = tr_torrentInfo(tor);
hig_workarea_add_section_title (t, &row, _("Torrent Information"));
g_snprintf (name, sizeof(name), namefmt, _("Tracker"));
track = info->trackerList->list;
pch = track->port==80
? g_strdup_printf( "http://%s%s", track->address, track->announce )
: g_strdup_printf( "http://%s:%d%s", track->address, track->port, track->announce );
l = gtk_label_new( pch );
gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
hig_workarea_add_row (t, &row, name, l, NULL);
g_free (pch);
g_snprintf (name, sizeof(name), namefmt, _("Pieces"));
tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) );
g_snprintf( buf, sizeof(buf), "%d (%s)", info->pieceCount, sizeStr );
g_snprintf( buf, sizeof( buf ),
/* %1$s is number of pieces; %2$s is how big each piece is */
ngettext( "%1$d Piece @ %2$s",
"%1$d Pieces @ %2$s",
info->pieceCount ),
info->pieceCount, sizeStr );
l = gtk_label_new (buf);
hig_workarea_add_row (t, &row, name, l, NULL);
@ -1069,7 +1062,12 @@ tracker_page_new( TrTorrent * gtor )
GtkWidget * l;
int row = 0;
const char * s;
char * tmp;
struct tracker_page * page = g_new0( struct tracker_page, 1 );
const tr_tracker_info * track;
char name[128];
const char * namefmt = "%s:";
const tr_info * info = tr_torrent_info (gtor);
page->gtor = gtor;
@ -1094,6 +1092,16 @@ tracker_page_new( TrTorrent * gtor )
hig_workarea_add_section_divider( t, &row );
hig_workarea_add_section_title( t, &row, _( "Announce" ) );
g_snprintf (name, sizeof(name), namefmt, _("Tracker"));
track = info->trackerList->list;
tmp = track->port==80
? g_strdup_printf( "http://%s%s", track->address, track->announce )
: g_strdup_printf( "http://%s:%d%s", track->address, track->port, track->announce );
l = gtk_label_new( tmp );
gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
hig_workarea_add_row (t, &row, name, l, NULL);
g_free( tmp );
s = _( "Last announce at:" );
l = gtk_label_new( NULL );
page->last_announce_time_lb = l;

2
libtransmission/peer-msgs.c
View file

@ -972,7 +972,7 @@ parseUtPex( tr_peermsgs * msgs, int msglen, struct evbuffer * inbuf )
&& (( sub = tr_bencDictFindType( &val, "added", TYPE_STR ))))
{
const int n = sub->val.s.i / 6 ;
tr_inf( _( "torrent %s got %d peers from uT pex" ), msgs->torrent->info.name, n );
tr_inf( _( "Torrent \"%s\" got %d peers from peer exchange" ), msgs->torrent->info.name, n );
tr_peerMgrAddPeers( msgs->handle->peerMgr,
msgs->torrent->info.hash,
TR_PEER_FROM_PEX,

4
libtransmission/shared.c
View file

@ -69,11 +69,11 @@ getNatStateStr( int state )
switch( state )
{
/* we're in the process of trying to set up port forwarding */
case TR_NAT_TRAVERSAL_MAPPING: return _( "forwarding" );
case TR_NAT_TRAVERSAL_MAPPING: return _( "starting" );
/* we've successfully forwarded the port */
case TR_NAT_TRAVERSAL_MAPPED: return _( "forwarded" );
/* we're cancelling the port forwarding */
case TR_NAT_TRAVERSAL_UNMAPPING: return _( "unforwarding" );
case TR_NAT_TRAVERSAL_UNMAPPING: return _( "stopping" );
/* the port isn't forwarded */
case TR_NAT_TRAVERSAL_UNMAPPED: return _( "not forwarded" );
case TR_NAT_TRAVERSAL_ERROR: return "???";