Changeset 5225


Ignore:
Timestamp:
Mar 8, 2008, 2:00:47 AM (14 years ago)
Author:
charles
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/details.c

    r5224 r5225  
    673673  const char * namefmt = "%s:";
    674674  GtkTextBuffer * b;
    675   tr_tracker_info * track;
    676675  const tr_info * info = tr_torrentInfo(tor);
    677676
    678677  hig_workarea_add_section_title (t, &row, _("Torrent Information"));
    679 
    680     g_snprintf (name, sizeof(name), namefmt, _("Tracker"));
    681     track = info->trackerList->list;
    682     pch = track->port==80
    683       ? g_strdup_printf( "http://%s%s", track->address, track->announce )
    684       : g_strdup_printf( "http://%s:%d%s", track->address, track->port, track->announce );
    685     l = gtk_label_new( pch );
    686     gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
    687 
    688     hig_workarea_add_row (t, &row, name, l, NULL);
    689     g_free (pch);
    690678
    691679    g_snprintf (name, sizeof(name), namefmt, _("Pieces"));
    692680    tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) );
    693     g_snprintf( buf, sizeof(buf), "%d (%s)", info->pieceCount, sizeStr );
     681    g_snprintf( buf, sizeof( buf ),
     682                /* %1$s is number of pieces; %2$s is how big each piece is */
     683                ngettext( "%1$d Piece @ %2$s",
     684                          "%1$d Pieces @ %2$s",
     685                          info->pieceCount ),
     686                info->pieceCount, sizeStr );
    694687    l = gtk_label_new (buf);
    695688    hig_workarea_add_row (t, &row, name, l, NULL);
     
    10701063    int row = 0;
    10711064    const char * s;
     1065    char * tmp;
    10721066    struct tracker_page * page = g_new0( struct tracker_page, 1 );
     1067    const tr_tracker_info * track;
     1068    char name[128];
     1069    const char * namefmt = "%s:";
     1070    const tr_info * info = tr_torrent_info (gtor);
    10731071
    10741072    page->gtor = gtor;
     
    10941092    hig_workarea_add_section_divider( t, &row );
    10951093    hig_workarea_add_section_title( t, &row, _( "Announce" ) );
     1094
     1095        g_snprintf (name, sizeof(name), namefmt, _("Tracker"));
     1096        track = info->trackerList->list;
     1097        tmp = track->port==80
     1098          ? g_strdup_printf( "http://%s%s", track->address, track->announce )
     1099          : g_strdup_printf( "http://%s:%d%s", track->address, track->port, track->announce );
     1100        l = gtk_label_new( tmp );
     1101        gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
     1102        hig_workarea_add_row (t, &row, name, l, NULL);
     1103        g_free( tmp );
    10961104
    10971105        s = _( "Last announce at:" );
  • trunk/libtransmission/peer-msgs.c

    r5204 r5225  
    973973    {
    974974        const int n = sub->val.s.i / 6 ;
    975         tr_inf( _( "torrent %s got %d peers from uT pex" ), msgs->torrent->info.name, n );
     975        tr_inf( _( "Torrent \"%s\" got %d peers from peer exchange" ), msgs->torrent->info.name, n );
    976976        tr_peerMgrAddPeers( msgs->handle->peerMgr,
    977977                            msgs->torrent->info.hash,
  • trunk/libtransmission/shared.c

    r5224 r5225  
    7070    {
    7171        /* we're in the process of trying to set up port forwarding */
    72         case TR_NAT_TRAVERSAL_MAPPING:   return _( "forwarding" );
     72        case TR_NAT_TRAVERSAL_MAPPING:   return _( "starting" );
    7373        /* we've successfully forwarded the port */
    7474        case TR_NAT_TRAVERSAL_MAPPED:    return _( "forwarded" );
    7575        /* we're cancelling the port forwarding */
    76         case TR_NAT_TRAVERSAL_UNMAPPING: return _( "unforwarding" );
     76        case TR_NAT_TRAVERSAL_UNMAPPING: return _( "stopping" );
    7777        /* the port isn't forwarded */
    7878        case TR_NAT_TRAVERSAL_UNMAPPED:  return _( "not forwarded" );
Note: See TracChangeset for help on using the changeset viewer.