Changeset 5313


Ignore:
Timestamp:
Mar 19, 2008, 8:07:27 PM (14 years ago)
Author:
charles
Message:

more string work before the freeze. (1) use %'d to get thousands' grouping in end-user strings (2) follow HiG capitalization, quotation guidelines (3) fold a few more strings

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/details.c

    r5298 r5313  
    669669  const tr_info * info = tr_torrentInfo(tor);
    670670
    671   hig_workarea_add_section_title (t, &row, _("Torrent Information"));
     671  hig_workarea_add_section_title (t, &row, _("Details"));
    672672
    673673    tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) );
    674674    g_snprintf( buf, sizeof( buf ),
    675                 /* %1$s is number of pieces; %2$s is how big each piece is */
    676                 ngettext( "%1$d Piece @ %2$s",
    677                           "%1$d Pieces @ %2$s",
     675                /* %1$'d is number of pieces
     676                   %2$s is how big each piece is */
     677                ngettext( "%1$'d Piece @ %2$s",
     678                          "%1$'d Pieces @ %2$s",
    678679                          info->pieceCount ),
    679680                info->pieceCount, sizeStr );
     
    12251226  /* create the dialog */
    12261227  tr_strlsize( sizeStr, info->totalSize, sizeof(sizeStr) );
    1227   /* %1$s is torrent name; %2$s its file size */
     1228  /* %1$s is torrent name
     1229     %2$s its file size */
    12281230  g_snprintf( title, sizeof(title), _( "Details for %1$s (%2$s)" ), info->name, sizeStr );
    12291231  d = gtk_dialog_new_with_buttons (title, parent, 0,
  • trunk/gtk/makemeta-ui.c

    r5310 r5313  
    187187    filename = gtk_file_chooser_get_filename( chooser );
    188188    if( !filename )
    189         *buf = '\0';
     189        g_snprintf( buf, sizeof( buf ), _( "No files selected" ) );
    190190    else {
    191191        ui->builder = tr_metaInfoBuilderCreate( ui->handle, filename );
     
    205205        tr_strlsize( sizeStr, totalSize, sizeof(sizeStr) );
    206206        g_snprintf( buf, sizeof( buf ),
    207                     /* %1$s is the torrent size, %2$s is its number of files */
    208                     ngettext( "<i>%1$s; %2$d File</i>",
    209                               "<i>%1$s; %2$d Files</i>", fileCount ),
     207                    /* %1$s is the torrent size
     208                       %2$'d is its number of files */
     209                    ngettext( "<i>%1$s; %2$'d File</i>",
     210                              "<i>%1$s; %2$'d Files</i>", fileCount ),
    210211                    sizeStr, fileCount );
    211212    }
     
    217218        tr_strlsize( sizeStr, pieceSize, sizeof(sizeStr) );
    218219        g_snprintf( buf, sizeof( buf ),
    219                     /* %1$s is number of pieces; %2$s is how big each piece is */
    220                     ngettext( "<i>%1$d Piece @ %2$s</i>",
    221                               "<i>%1$d Pieces @ %2$s</i>",
     220                    /* %1$'s is number of pieces;
     221                       %2$s is how big each piece is */
     222                    ngettext( "<i>%1$'d Piece @ %2$s</i>",
     223                              "<i>%1$'d Pieces @ %2$s</i>",
    222224                              pieceCount ),
    223225                    pieceCount, sizeStr );
  • trunk/gtk/stats.c

    r5307 r5313  
    109109    hig_workarea_add_section_divider( t, &row );
    110110    hig_workarea_add_section_title( t, &row, _("Total") );
    111         l = ui->all_sessions_lb = gtk_label_new( _("Program started %d times") );
     111        l = ui->all_sessions_lb = gtk_label_new( _("Started %'d time") );
    112112        hig_workarea_add_label_w( t, row++, l );
    113113        l = ui->all_up_lb = gtk_label_new( NULL );
  • trunk/gtk/torrent-cell-renderer.c

    r5262 r5313  
    196196        case TR_STATUS_DOWNLOAD:
    197197            g_string_append_printf( gstr,
    198                 ngettext( "Downloading from %1$d of %2$d connected peer",
    199                           "Downloading from %1$d of %2$d connected peers",
     198                ngettext( "Downloading from %1$'d of %2$'d connected peer",
     199                          "Downloading from %1$'d of %2$'d connected peers",
    200200                          torStat->peersConnected ),
    201201                torStat->peersSendingToUs,
     
    206206        case TR_STATUS_SEED:
    207207            g_string_append_printf( gstr,
    208                 ngettext( "Seeding to %1$d of %2$d connected peer",
    209                           "Seeding to %1$d of %2$d connected peers",
     208                ngettext( "Seeding to %1$'d of %2$'d connected peer",
     209                          "Seeding to %1$'d of %2$'d connected peers",
    210210                          torStat->peersConnected ),
    211211                torStat->peersGettingFromUs,
  • trunk/gtk/tr-icon.c

    r5312 r5313  
    6464    tr_strlspeed( upStr, stats->clientUploadSpeed, sizeof( upStr ) );
    6565    g_snprintf( tip, sizeof( tip ),
    66                 /* %1$d is the number of torrents we're seeding,
    67                    %2$d is the number of torrents we're downloading,
     66                /* %1$'d is the number of torrents we're seeding,
     67                   %2$'d is the number of torrents we're downloading,
    6868                   %3$s is our download speed,
    6969                   %4$s is our upload speed */
    70                 _( "%1$d Seeding, %2$d Downloading\nDown: %3$s, Up: %4$s" ),
     70                _( "%1$'d Seeding, %2$'d Downloading\nDown: %3$s, Up: %4$s" ),
    7171                stats->seedingCount,
    7272                stats->downloadCount,
  • trunk/gtk/tr-torrent.c

    r5230 r5313  
    298298        case TR_STATUS_DONE:
    299299            top = g_strdup_printf(
    300                 ngettext( "Uploading to %1$d of %2$d connected peer",
    301                           "Uploading to %1$d of %2$d connected peers", tpeers ),
     300                ngettext( "Uploading to %1$'d of %2$'d connected peer",
     301                          "Uploading to %1$'d of %2$'d connected peers", tpeers ),
    302302                          upeers, tpeers );
    303303            break;
     
    305305        case TR_STATUS_SEED:
    306306            top = g_strdup_printf(
    307                 ngettext( "Seeding to %1$d of %2$d connected peer",
    308                           "Seeding to %1$d of %2$d connected peers", tpeers ),
     307                ngettext( "Seeding to %1$'d of %2$'d connected peer",
     308                          "Seeding to %1$'d of %2$'d connected peers", tpeers ),
    309309                          upeers, tpeers );
    310310            break;
  • trunk/gtk/tr-window.c

    r5312 r5313  
    597597
    598598        if( torrentCount != visibleCount )
    599             g_snprintf( buf, sizeof( buf ), ngettext( "%1$d of %2$d Torrent",
    600                                                       "%1$d of %2$d Torrents",
     599            g_snprintf( buf, sizeof( buf ), ngettext( "%1$'d of %2$'d Torrent",
     600                                                      "%1$'d of %2$'d Torrents",
    601601                                                      torrentCount ),
    602602                                            visibleCount, torrentCount );
    603603        else
    604             g_snprintf( buf, sizeof( buf ), ngettext( "%d Torrent",
    605                                                       "%d Torrents",
     604            g_snprintf( buf, sizeof( buf ), ngettext( "%'d Torrent",
     605                                                      "%'d Torrents",
    606606                                                      torrentCount ),
    607607                                            torrentCount );
  • trunk/gtk/util.c

    r5307 r5313  
    108108
    109109    if ( speed < 1000.0 ) /* 0.0 KB to 999.9 KB */
    110         g_snprintf( buf, buflen, _( "%.1f KB/s" ), speed );
     110        g_snprintf( buf, buflen, _( "%'.1f KB/s" ), speed );
    111111    else if( speed < 102400.0 ) /* 0.98 MB to 99.99 MB */
    112         g_snprintf( buf, buflen, _( "%.2f MB/s" ), (speed/1024) );
     112        g_snprintf( buf, buflen, _( "%'.2f MB/s" ), (speed/1024) );
    113113    else if( speed < 1024000.0 ) /* 100.0 MB to 999.9 MB */
    114         g_snprintf( buf, buflen, _( "%.1f MB/s" ), (speed/1024) );
     114        g_snprintf( buf, buflen, _( "%'.1f MB/s" ), (speed/1024) );
    115115    else /* insane speeds */
    116         g_snprintf( buf, buflen, _( "%.2f GB/s" ), (speed/1048576) );
     116        g_snprintf( buf, buflen, _( "%'.2f GB/s" ), (speed/1048576) );
    117117
    118118    return buf;
  • trunk/libtransmission/fastresume.c

    r5243 r5313  
    642642            else
    643643                /* %s is the torrent name */
    644                 tr_torinf( tor, _( "Skipping invalid resume file for \"%s\"" ), tor->info.name );
     644                tr_torinf( tor, _( "Couldn't read resume file for \"%s\"" ), tor->info.name );
    645645        }
    646646
  • trunk/libtransmission/metainfo.c

    r5290 r5313  
    277277    if( !inf->fileCount || !inf->totalSize )
    278278    {
    279         tr_err( _( "Torrent is empty" ) );
     279        tr_err( _( "Torrent is corrupt" ) ); /* the content is missing! */
    280280        goto fail;
    281281    }
  • trunk/libtransmission/natpmp.c

    r5300 r5313  
    137137        logVal( "readnatpmpresponseorretry", val );
    138138        if( val >= 0 ) {
    139             tr_ninf( getKey(), _( "found public address %s" ), inet_ntoa( response.publicaddress.addr ) );
     139            tr_ninf( getKey(), _( "Found public address \"%s\"" ), inet_ntoa( response.publicaddress.addr ) );
    140140            nat->state = TR_NATPMP_IDLE;
    141141        } else if( val != NATPMP_TRYAGAIN ) {
  • trunk/libtransmission/shared.c

    r5290 r5313  
    7070    {
    7171        /* we're in the process of trying to set up port forwarding */
    72         case TR_NAT_TRAVERSAL_MAPPING:   return _( "starting" );
     72        case TR_NAT_TRAVERSAL_MAPPING:   return _( "Starting" );
    7373        /* we've successfully forwarded the port */
    74         case TR_NAT_TRAVERSAL_MAPPED:    return _( "forwarded" );
     74        case TR_NAT_TRAVERSAL_MAPPED:    return _( "Forwarded" );
    7575        /* we're cancelling the port forwarding */
    76         case TR_NAT_TRAVERSAL_UNMAPPING: return _( "stopping" );
     76        case TR_NAT_TRAVERSAL_UNMAPPING: return _( "Stopping" );
    7777        /* the port isn't forwarded */
    78         case TR_NAT_TRAVERSAL_UNMAPPED:  return _( "not forwarded" );
     78        case TR_NAT_TRAVERSAL_UNMAPPED:  return _( "Not forwarded" );
    7979        case TR_NAT_TRAVERSAL_ERROR:     return "???";
    8080    }
  • trunk/libtransmission/torrent.c

    r5285 r5313  
    158158
    159159        case TR_TRACKER_WARNING:
    160             tr_torerr( tor, _( "Tracker warning: %s" ), event->text );
     160            tr_torerr( tor, _( "Tracker warning: \"%s\"" ), event->text );
    161161            tor->error = TR_ERROR_TC_WARNING;
    162162            strlcpy( tor->errorString, event->text, sizeof(tor->errorString) );
     
    164164
    165165        case TR_TRACKER_ERROR:
    166             tr_torerr( tor, _( "Tracker error: %s" ), event->text );
     166            tr_torerr( tor, _( "Tracker error: \"%s\"" ), event->text );
    167167            tor->error = TR_ERROR_TC_ERROR;
    168168            strlcpy( tor->errorString, event->text, sizeof(tor->errorString) );
     
    10531053    switch( type )
    10541054    {
     1055        /* Translators: this is a minor point that's safe to skip over, but FYI:
     1056           "Complete" and "Done" are specific, different terms in Transmission:
     1057           "Complete" means we've downloaded every file in the torrent.
     1058           "Done" means we're done downloading the files we wanted, but NOT all that exist */
    10551059        case TR_CP_DONE:     return _( "Done" );
    10561060        case TR_CP_COMPLETE: return _( "Complete" );
  • trunk/libtransmission/upnp.c

    r5300 r5313  
    118118                                handle->data.servicetype,
    119119                                portStr, "TCP" );
    120         tr_ninf( getKey(), _( "Stopping port forwarding of \"%s\", service \"%s\"" ),
     120        tr_ninf( getKey(), _( "Stopping port forwarding through \"%s\", service \"%s\"" ),
    121121                handle->urls.controlURL, handle->data.servicetype );
    122122        handle->isMapped = 0;
     
    147147            handle->isMapped = !err;
    148148        }
    149         tr_ninf( getKey(), _( "Port forwarding via \"%s\", service \"%s\".  (local address: %s:%d)" ),
     149        tr_ninf( getKey(), _( "Port forwarding through \"%s\", service \"%s\".  (local address: %s:%d)" ),
    150150                 handle->urls.controlURL, handle->data.servicetype, handle->lanaddr, port );
    151151        if( handle->isMapped ) {
Note: See TracChangeset for help on using the changeset viewer.