Changeset 10536


Ignore:
Timestamp:
Apr 28, 2010, 1:26:46 AM (11 years ago)
Author:
charles
Message:

(trunk) #3174 "Use IEC standard units (KiB, MiB, GiB) instead of (KB, MB, GB)" -- implemented for gtk, qt, daemon, cli, and web client

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/cli.c

    r10240 r10536  
    6262    { 'B', "no-blocklist",         "Disable peer blocklists", "B",  0, NULL        },
    6363    { 'c', "comment",              "Set the new torrent's comment", "c",  1, "<comment>" },
    64     { 'd', "downlimit",            "Set max download speed in KB/s", "d",  1, "<speed>"   },
     64    { 'd', "downlimit",            "Set max download speed in KiB/s", "d",  1, "<speed>"   },
    6565    { 'D', "no-downlimit",         "Don't limit the download speed", "D",  0, NULL        },
    6666    { 910, "encryption-required",  "Encrypt all peer connections", "er", 0, NULL        },
     
    7777    { 's', "scrape",               "Scrape the torrent and exit", "s",  0, NULL        },
    7878    { 't', "tos", "Peer socket TOS (0 to 255, default=" TR_DEFAULT_PEER_SOCKET_TOS_STR ")", "t", 1, "<tos>" },
    79     { 'u', "uplimit",              "Set max upload speed in KB/s", "u",  1, "<speed>"   },
     79    { 'u', "uplimit",              "Set max upload speed in KiB/s", "u",  1, "<speed>"   },
    8080    { 'U', "no-uplimit",           "Don't limit the upload speed", "U",  0, NULL        },
    8181    { 'v', "verify",               "Verify the specified torrent", "v",  0, NULL        },
     
    258258        tr_snprintf(
    259259            buf, buflen,
    260             "Progress: %.1f%%, dl from %d of %d peers (%.0f KB/s), "
    261             "ul to %d (%.0f KB/s) [%s]",
     260            "Progress: %.1f%%, dl from %d of %d peers (%.0f KiB/s), "
     261            "ul to %d (%.0f KiB/s) [%s]",
    262262            tr_truncd( 100 * st->percentDone, 1 ),
    263263            st->peersSendingToUs,
     
    274274        tr_snprintf(
    275275            buf, buflen,
    276             "Seeding, uploading to %d of %d peer(s), %.0f KB/s [%s]",
     276            "Seeding, uploading to %d of %d peer(s), %.0f KiB/s [%s]",
    277277            st->peersGettingFromUs, st->peersConnected,
    278278            st->pieceUploadSpeed, ratioStr );
  • trunk/daemon/remote.c

    r10497 r10536  
    6666    { 970, "alt-speed",             "Use the alternate Limits", "as",  0, NULL },
    6767    { 971, "no-alt-speed",          "Don't use the alternate Limits", "AS",  0, NULL },
    68     { 972, "alt-speed-downlimit",   "max alternate download speed (in KB/s)", "asd",  1, "<speed>" },
    69     { 973, "alt-speed-uplimit",     "max alternate upload speed (in KB/s)", "asu",  1, "<speed>" },
     68    { 972, "alt-speed-downlimit",   "max alternate download speed (in KiB/s)", "asd",  1, "<speed>" },
     69    { 973, "alt-speed-uplimit",     "max alternate upload speed (in KiB/s)", "asu",  1, "<speed>" },
    7070    { 974, "alt-speed-scheduler",   "Use the scheduled on/off times", "asc",  0, NULL },
    7171    { 975, "no-alt-speed-scheduler","Don't use the scheduled on/off times", "ASC",  0, NULL },
     
    7777    { 'C', "no-incomplete-dir",     "Don't store incomplete torrents in a different location", "C", 0, NULL },
    7878    { 'b', "debug",                 "Print debugging information", "b",  0, NULL },
    79     { 'd', "downlimit",             "Set the maximum global download speed in KB/s", "d",  1, "<speed>" },
     79    { 'd', "downlimit",             "Set the maximum global download speed in KiB/s", "d",  1, "<speed>" },
    8080    { 'D', "no-downlimit",          "Don't limit the global download speed", "D",  0, NULL },
    8181    { 910, "encryption-required",   "Encrypt all peer connections", "er", 0, NULL },
     
    119119    { 992, "trash-torrent",         "Delete torrents after adding", NULL, 0, NULL },
    120120    { 993, "no-trash-torrent",      "Do not delete torrents after adding", NULL, 0, NULL },
    121     { 980, "torrent-downlimit",     "Set the maximum download speed for the current torrent(s) in KB/s", "td",  1, "<speed>" },
     121    { 980, "torrent-downlimit",     "Set the maximum download speed for the current torrent(s) in KiB/s", "td",  1, "<speed>" },
    122122    { 981, "no-torrent-downlimit",  "Don't limit the download speed for the current torrent(s)", "TD",  0, NULL },
    123     { 982, "torrent-uplimit",       "Set the maximum upload speed for the current torrent(s) in KB/s", "tu",  1, "<speed>" },
     123    { 982, "torrent-uplimit",       "Set the maximum upload speed for the current torrent(s) in KiB/s", "tu",  1, "<speed>" },
    124124    { 983, "no-torrent-uplimit",    "Don't limit the upload speed for the current torrent(s)", "TU",  0, NULL },
    125125    { 984, "honor-session",         "Make the current torrent(s) honor the session limits", "hl",  0, NULL },
    126126    { 985, "no-honor-session",      "Make the current torrent(s) not honor the session limits", "HL",  0, NULL },
    127     { 'u', "uplimit",               "Set the maximum global upload speed in KB/s", "u",  1, "<speed>" },
     127    { 'u', "uplimit",               "Set the maximum global upload speed in KiB/s", "u",  1, "<speed>" },
    128128    { 'U', "no-uplimit",            "Don't limit the global upload speed", "U",  0, NULL },
    129129    { 'v', "verify",                "Verify the current torrent(s)", "v",  0, NULL },
     
    992992        {
    993993            displayed_size = (double) size / KILOBYTE_FACTOR;
    994             tr_snprintf( buf, buflen, "%'.1f KB", displayed_size );
     994            tr_snprintf( buf, buflen, "%'.1f KiB", displayed_size );
    995995        }
    996996        else if( size < (int64_t)GIGABYTE_FACTOR )
    997997        {
    998998            displayed_size = (double) size / MEGABYTE_FACTOR;
    999             tr_snprintf( buf, buflen, "%'.1f MB", displayed_size );
     999            tr_snprintf( buf, buflen, "%'.1f MiB", displayed_size );
    10001000        }
    10011001        else
    10021002        {
    10031003            displayed_size = (double) size / GIGABYTE_FACTOR;
    1004             tr_snprintf( buf, buflen, "%'.1f GB", displayed_size );
     1004            tr_snprintf( buf, buflen, "%'.1f GiB", displayed_size );
    10051005        }
    10061006    }
     
    11341134
    11351135                if( altEnabled )
    1136                     tr_snprintf( buf, sizeof( buf ), "%"PRId64" KB/s", altUp );
     1136                    tr_snprintf( buf, sizeof( buf ), "%"PRId64" KiB/s", altUp );
    11371137                else if( upEnabled )
    1138                     tr_snprintf( buf, sizeof( buf ), "%"PRId64" KB/s", upLimit );
     1138                    tr_snprintf( buf, sizeof( buf ), "%"PRId64" KiB/s", upLimit );
    11391139                else
    11401140                    tr_strlcpy( buf, "Unlimited", sizeof( buf ) );
    1141                 printf( "  Upload speed limit: %s  (%s limit: %"PRId64" KB/s; %s turtle limit: %"PRId64" KB/s)\n",
     1141                printf( "  Upload speed limit: %s  (%s limit: %"PRId64" KiB/s; %s turtle limit: %"PRId64" KiB/s)\n",
    11421142                        buf,
    11431143                        (upEnabled?"Enabled":"Disabled"), upLimit,
     
    11451145
    11461146                if( altEnabled )
    1147                     tr_snprintf( buf, sizeof( buf ), "%"PRId64" KB/s", altDown );
     1147                    tr_snprintf( buf, sizeof( buf ), "%"PRId64" KiB/s", altDown );
    11481148                else if( downEnabled )
    1149                     tr_snprintf( buf, sizeof( buf ), "%"PRId64" KB/s", downLimit );
     1149                    tr_snprintf( buf, sizeof( buf ), "%"PRId64" KiB/s", downLimit );
    11501150                else
    11511151                    tr_strlcpy( buf, "Unlimited", sizeof( buf ) );
    1152                 printf( "  Download speed limit: %s  (%s limit: %"PRId64" KB/s; %s turtle limit: %"PRId64" KB/s)\n",
     1152                printf( "  Download speed limit: %s  (%s limit: %"PRId64" KiB/s; %s turtle limit: %"PRId64" KiB/s)\n",
    11531153                        buf,
    11541154                        (downEnabled?"Enabled":"Disabled"), downLimit,
     
    12661266                printf( "  ETA: %s\n", tr_strltime( buf, i, sizeof( buf ) ) );
    12671267            if( tr_bencDictFindInt( t, "rateDownload", &i ) )
    1268                 printf( "  Download Speed: %.1f KB/s\n", i / 1024.0 );
     1268                printf( "  Download Speed: %.1f KiB/s\n", i / 1024.0 );
    12691269            if( tr_bencDictFindInt( t, "rateUpload", &i ) )
    1270                 printf( "  Upload Speed: %.1f KB/s\n", i / 1024.0 );
     1270                printf( "  Upload Speed: %.1f KiB/s\n", i / 1024.0 );
    12711271            if( tr_bencDictFindInt( t, "haveUnchecked", &i )
    12721272              && tr_bencDictFindInt( t, "haveValid", &j ) )
     
    15401540                printf( "  Download Limit: " );
    15411541                if( boolVal )
    1542                     printf( "%" PRId64 " KB/s\n", i );
     1542                    printf( "%" PRId64 " KiB/s\n", i );
    15431543                else
    15441544                    printf( "Unlimited\n" );
     
    15491549                printf( "  Upload Limit: " );
    15501550                if( boolVal )
    1551                     printf( "%" PRId64 " KB/s\n", i );
     1551                    printf( "%" PRId64 " KiB/s\n", i );
    15521552                else
    15531553                    printf( "Unlimited\n" );
  • trunk/gtk/details.c

    r10512 r10536  
    452452    d->honorLimitsCheckTag = tag;
    453453
    454     tb = gtk_check_button_new_with_mnemonic( _( "Limit _download speed (KB/s):" ) );
     454    tb = gtk_check_button_new_with_mnemonic( _( "Limit _download speed (KiB/s):" ) );
    455455    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( tb ), FALSE );
    456456    d->downLimitedCheck = tb;
     
    464464    d->downLimitSpin = w;
    465465
    466     tb = gtk_check_button_new_with_mnemonic( _( "Limit _upload speed (KB/s):" ) );
     466    tb = gtk_check_button_new_with_mnemonic( _( "Limit _upload speed (KiB/s):" ) );
    467467    d->upLimitedCheck = tb;
    468468    tag = g_signal_connect( tb, "toggled", G_CALLBACK( up_speed_toggled_cb ), d );
  • trunk/gtk/dialogs.c

    r8889 r10536  
    176176    if( response == GTK_RESPONSE_ACCEPT )
    177177        removeTorrents( data );
    178     else
    179         g_slist_foreach( data->torrents, (GFunc)g_object_unref, NULL );
    180178
    181179    gtk_widget_destroy( GTK_WIDGET( dialog ) );
  • trunk/gtk/tr-prefs.c

    r10391 r10536  
    11991199    hig_workarea_add_section_title( t, &row, _( "Speed Limits" ) );
    12001200
    1201         s = _( "Limit _download speed (KB/s):" );
     1201        s = _( "Limit _download speed (KiB/s):" );
    12021202        w = new_check_button( s, TR_PREFS_KEY_DSPEED_ENABLED, core );
    12031203        w2 = new_spin_button( TR_PREFS_KEY_DSPEED, core, 0, INT_MAX, 5 );
     
    12061206        hig_workarea_add_row_w( t, &row, w, w2, NULL );
    12071207
    1208         s = _( "Limit _upload speed (KB/s):" );
     1208        s = _( "Limit _upload speed (KiB/s):" );
    12091209        w = new_check_button( s, TR_PREFS_KEY_USPEED_ENABLED, core );
    12101210        w2 = new_spin_button( TR_PREFS_KEY_USPEED, core, 0, INT_MAX, 5 );
     
    12311231        hig_workarea_add_wide_control( t, &row, w );
    12321232
    1233         s = _( "Limit do_wnload speed (KB/s):" );
     1233        s = _( "Limit do_wnload speed (KiB/s):" );
    12341234        w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_DOWN, core, 0, INT_MAX, 5 );
    12351235        hig_workarea_add_row( t, &row, s, w, NULL );
    12361236
    1237         s = _( "Limit u_pload speed (KB/s):" );
     1237        s = _( "Limit u_pload speed (KiB/s):" );
    12381238        w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_UP, core, 0, INT_MAX, 5 );
    12391239        hig_workarea_add_row( t, &row, s, w, NULL );
  • trunk/gtk/tr-window.c

    r10383 r10536  
    735735        /* this is to determine the maximum width/height for the label */
    736736        PangoLayout * pango_layout =
    737             gtk_widget_create_pango_layout( p->ul_lb, _( "999.9 KB/s" ) );
     737            gtk_widget_create_pango_layout( p->ul_lb, _( "999.9 KiB/s" ) );
    738738        pango_layout_get_pixel_size( pango_layout, &w, &h );
    739739        gtk_widget_set_size_request( p->ul_lb, w, h );
  • trunk/gtk/util.c

    r10512 r10536  
    135135        {
    136136            displayed_size = (gdouble) size / KILOBYTE_FACTOR;
    137             g_snprintf( buf, buflen, _( "%'.1f KB" ), displayed_size );
     137            g_snprintf( buf, buflen, _( "%'.1f KiB" ), displayed_size );
    138138        }
    139139        else if( size < (guint64)GIGABYTE_FACTOR )
    140140        {
    141141            displayed_size = (gdouble) size / MEGABYTE_FACTOR;
    142             g_snprintf( buf, buflen, _( "%'.1f MB" ), displayed_size );
     142            g_snprintf( buf, buflen, _( "%'.1f MiB" ), displayed_size );
    143143        }
    144144        else
    145145        {
    146146            displayed_size = (gdouble) size / GIGABYTE_FACTOR;
    147             g_snprintf( buf, buflen, _( "%'.1f GB" ), displayed_size );
     147            g_snprintf( buf, buflen, _( "%'.1f GiB" ), displayed_size );
    148148        }
    149149    }
     
    159159    const double speed = kb_sec;
    160160
    161     if( speed < 1000.0 )  /* 0.0 KB to 999.9 KB */
    162         g_snprintf( buf, buflen, _( "%'.1f KB/s" ), speed );
    163     else if( speed < 102400.0 ) /* 0.98 MB to 99.99 MB */
    164         g_snprintf( buf, buflen, _( "%'.2f MB/s" ), ( speed / KILOBYTE_FACTOR ) );
    165     else if( speed < 1024000.0 ) /* 100.0 MB to 999.9 MB */
    166         g_snprintf( buf, buflen, _( "%'.1f MB/s" ), ( speed / MEGABYTE_FACTOR ) );
     161    if( speed < 1000.0 )  /* 0.0 KiB to 999.9 KiB */
     162        g_snprintf( buf, buflen, _( "%'.1f KiB/s" ), speed );
     163    else if( speed < 102400.0 ) /* 0.98 MiB to 99.99 MiB */
     164        g_snprintf( buf, buflen, _( "%'.2f MiB/s" ), ( speed / KILOBYTE_FACTOR ) );
     165    else if( speed < 1024000.0 ) /* 100.0 MiB to 999.9 MiB */
     166        g_snprintf( buf, buflen, _( "%'.1f MiB/s" ), ( speed / MEGABYTE_FACTOR ) );
    167167    else /* insane speeds */
    168         g_snprintf( buf, buflen, _( "%'.2f GB/s" ), ( speed / GIGABYTE_FACTOR ) );
     168        g_snprintf( buf, buflen, _( "%'.2f GiB/s" ), ( speed / GIGABYTE_FACTOR ) );
    169169
    170170    return buf;
  • trunk/qt/details.cc

    r10457 r10536  
    990990    connect( c, SIGNAL(clicked(bool)), this, SLOT(onHonorsSessionLimitsToggled(bool)) );
    991991
    992     c = new QCheckBox( tr( "Limit &download speed (KB/s):" ) );
     992    c = new QCheckBox( tr( "Limit &download speed (KiB/s):" ) );
    993993    mySingleDownCheck = c;
    994994    s = new QSpinBox( );
     
    10001000    connect( s, SIGNAL(valueChanged(int)), this, SLOT(onDownloadLimitChanged(int)));
    10011001
    1002     c = new QCheckBox( tr( "Limit &upload speed (KB/s):" ) );
     1002    c = new QCheckBox( tr( "Limit &upload speed (KiB/s):" ) );
    10031003    mySingleUpCheck = c;
    10041004    s = new QSpinBox( );
     
    11241124
    11251125    const QFontMetrics m( font( ) );
    1126     QSize size = m.size( 0, "1024 MB/s" );
     1126    QSize size = m.size( 0, "1024 MiB/s" );
    11271127    myPeerTree->setColumnWidth( COL_UP, size.width( ) );
    11281128    myPeerTree->setColumnWidth( COL_DOWN, size.width( ) );
  • trunk/qt/prefs-dialog.cc

    r10516 r10536  
    268268    hig->addSectionTitle( tr( "Speed Limits" ) );
    269269
    270         l = checkBoxNew( tr( "Limit &download speed (KB/s):" ), Prefs::DSPEED_ENABLED );
     270        l = checkBoxNew( tr( "Limit &download speed (KiB/s):" ), Prefs::DSPEED_ENABLED );
    271271        r = spinBoxNew( Prefs::DSPEED, 0, INT_MAX, 5 );
    272272        hig->addRow( l, r );
    273273        enableBuddyWhenChecked( qobject_cast<QCheckBox*>(l), r );
    274274
    275         l = checkBoxNew( tr( "Limit &upload speed (KB/s):" ), Prefs::USPEED_ENABLED );
     275        l = checkBoxNew( tr( "Limit &upload speed (KiB/s):" ), Prefs::USPEED_ENABLED );
    276276        r = spinBoxNew( Prefs::USPEED, 0, INT_MAX, 5 );
    277277        hig->addRow( l, r );
     
    294294        hig->addWideControl( new QLabel( s ) );
    295295
    296         s = tr( "Limit d&ownload speed (KB/s):" );
     296        s = tr( "Limit d&ownload speed (KiB/s):" );
    297297        r = spinBoxNew( Prefs :: ALT_SPEED_LIMIT_DOWN, 0, INT_MAX, 5 );
    298298        hig->addRow( s, r );
    299299
    300         s = tr( "Limit u&pload speed (KB/s):" );
     300        s = tr( "Limit u&pload speed (KiB/s):" );
    301301        r = spinBoxNew( Prefs :: ALT_SPEED_LIMIT_UP, 0, INT_MAX, 5 );
    302302        hig->addRow( s, r );
  • trunk/qt/torrent.cc

    r10459 r10536  
    9090    { SEED_RATIO_LIMIT, "seedRatioLimit", QVariant::Double, STAT_EXTRA },
    9191    { SEED_RATIO_MODE, "seedRatioMode", QVariant::Int, STAT_EXTRA },
    92     { DOWN_LIMIT, "downloadLimit", QVariant::Int, STAT_EXTRA }, /* KB/s */
     92    { DOWN_LIMIT, "downloadLimit", QVariant::Int, STAT_EXTRA }, /* KiB/s */
    9393    { DOWN_LIMITED, "downloadLimited", QVariant::Bool, STAT_EXTRA },
    94     { UP_LIMIT, "uploadLimit", QVariant::Int, STAT_EXTRA }, /* KB/s */
     94    { UP_LIMIT, "uploadLimit", QVariant::Int, STAT_EXTRA }, /* KiB/s */
    9595    { UP_LIMITED, "uploadLimited", QVariant::Bool, STAT_EXTRA },
    9696    { HONORS_SESSION_LIMITS, "honorsSessionLimits", QVariant::Bool, STAT_EXTRA },
  • trunk/qt/utils.cc

    r9868 r10536  
    5252        {
    5353            displayed_size = (double)size / KILOBYTE_FACTOR;
    54             str = tr( "%L1 KB" ).arg( displayed_size,  0, 'f', 1 );
     54            str = tr( "%L1 KiB" ).arg( displayed_size,  0, 'f', 1 );
    5555        }
    5656        else if( size < (int64_t)GIGABYTE_FACTOR )
    5757        {
    5858            displayed_size = (double)size / MEGABYTE_FACTOR;
    59             str = tr( "%L1 MB" ).arg( displayed_size,  0, 'f', 1 );
     59            str = tr( "%L1 MiB" ).arg( displayed_size,  0, 'f', 1 );
    6060        }
    6161        else
    6262        {
    6363            displayed_size = (double) size / GIGABYTE_FACTOR;
    64             str = tr( "%L1 GB" ).arg( displayed_size,  0, 'f', 1 );
     64            str = tr( "%L1 GiB" ).arg( displayed_size,  0, 'f', 1 );
    6565        }
    6666    }
     
    144144    QString str;
    145145
    146     if( kbps < 1000.0 )  /* 0.0 KB to 999.9 KB */
    147         str = tr( "%L1 KB/s" ).arg( kbps, 0, 'f', 1 );
    148     else if( kbps < 102400.0 ) /* 0.98 MB to 99.99 MB */
    149         str = tr( "%L1 MB/s" ).arg( kbps/1024.0, 0, 'f', 2 );
     146    if( kbps < 1000.0 )  /* 0.0 KiB to 999.9 KiB */
     147        str = tr( "%L1 KiB/s" ).arg( kbps, 0, 'f', 1 );
     148    else if( kbps < 102400.0 ) /* 0.98 MiB to 99.99 MiB */
     149        str = tr( "%L1 MiB/s" ).arg( kbps/1024.0, 0, 'f', 2 );
    150150    else // insane speeds
    151         str = tr( "%L1 GB/s" ).arg( kbps/(1024.0*1024.0), 0, 'f', 1 );
     151        str = tr( "%L1 GiB/s" ).arg( kbps/(1024.0*1024.0), 0, 'f', 1 );
    152152
    153153    return str;
  • trunk/web/javascript/common.js

    r10391 r10536  
    110110/*
    111111 *   Converts file & folder byte size values to more
    112  *   readable values (bytes, KB, MB, GB or TB).
     112 *   readable values (bytes, KiB, MiB, GiB or TiB).
    113113 *
    114114 *   @param integer bytes
     
    119119    var unit;
    120120
    121     // Terabytes (TB).
     121    // Terabytes (TiB).
    122122    if ( bytes >= 1099511627776 ) {
    123123        size = bytes / 1099511627776;
    124                 unit = ' TB';
    125 
    126     // Gigabytes (GB).
     124        unit = ' TiB';
     125
     126    // Gigabytes (GiB).
    127127    } else if ( bytes >= 1073741824 ) {
    128128        size = bytes / 1073741824;
    129                 unit = ' GB';
    130 
    131     // Megabytes (MB).
     129        unit = ' GiB';
     130
     131    // Megabytes (MiB).
    132132    } else if ( bytes >= 1048576 ) {
    133133        size = bytes / 1048576;
    134                 unit = ' MB';
    135 
    136     // Kilobytes (KB).
     134        unit = ' MiB';
     135
     136    // Kilobytes (KiB).
    137137    } else if ( bytes >= 1024 ) {
    138138        size = bytes / 1024;
    139                 unit = ' KB';
    140 
    141     // The file is less than one KB
     139        unit = ' KiB';
     140
     141    // The file is less than one KiB
    142142    } else {
    143143        size = bytes;
    144                 unit = ' bytes';
     144        unit = ' bytes';
    145145    }
    146146       
  • trunk/web/javascript/torrent.js

    r10497 r10536  
    439439
    440440                        case Torrent._StatusDownloading:
    441                                 // 'Downloading from 36 of 40 peers - DL: 60.2 KB/s UL: 4.3 KB/s'
     441                                // 'Downloading from 36 of 40 peers - DL: 60.2 KiB/s UL: 4.3 KiB/s'
    442442                                c = 'Downloading from ';
    443443                                c += this.peersSendingToUs();
     
    452452
    453453                        case Torrent._StatusSeeding:
    454                                 // 'Seeding to 13 of 22 peers - UL: 36.2 KB/s'
     454                                // 'Seeding to 13 of 22 peers - UL: 36.2 KiB/s'
    455455                                c = 'Seeding to ';
    456456                                c += this.peersGettingFromUs();
     
    520520                       
    521521                        // Create the 'progress details' label
    522                         // Eg: '101 MB of 631 MB (16.02%) - 2 hr remaining'
     522                        // Eg: '101 MiB of 631 MiB (16.02%) - 2 hr remaining'
    523523                        c = Math.formatBytes( this._sizeWhenDone - this._leftUntilDone );
    524524                        c += ' of ';
     
    561561
    562562                        // Create the 'progress details' label
    563                         // Eg: '698.05 MB, uploaded 8.59 GB (Ratio: 12.3)'
     563                        // Eg: '698.05 MiB, uploaded 8.59 GiB (Ratio: 12.3)'
    564564                        c = Math.formatBytes( this._size );
    565565                        c += ', uploaded ';
  • trunk/web/javascript/transmission.js

    r10497 r10536  
    944944                if (!iPhone)
    945945                {
    946                         setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + down_limit + ' KB/s)' );
     946                        setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + down_limit + ' KiB/s)' );
    947947                        var key = down_limited ? '#limited_download_rate'
    948948                                               : '#unlimited_download_rate';
    949949                        $(key).deselectMenuSiblings().selectMenuItem();
    950950               
    951                         setInnerHTML( $('#limited_upload_rate')[0], 'Limit (' + up_limit + ' KB/s)' );
     951                        setInnerHTML( $('#limited_upload_rate')[0], 'Limit (' + up_limit + ' KiB/s)' );
    952952                        key = up_limited ? '#limited_upload_rate'
    953953                                         : '#unlimited_upload_rate';
     
    10541054                                        args[RPC._DownSpeedLimited] = false;
    10551055                                } else {
    1056                                         setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + rate + ' KB/s)' );
     1056                                        setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + rate + ' KiB/s)' );
    10571057                                        $('#limited_download_rate').deselectMenuSiblings().selectMenuItem();
    10581058                                        $('div.preference input#download_rate')[0].value = rate;
     
    10721072                                        args[RPC._UpSpeedLimited] = false;
    10731073                                } else {
    1074                                         setInnerHTML( $('#limited_upload_rate')[0], 'Limit (' + rate + ' KB/s)' );
     1074                                        setInnerHTML( $('#limited_upload_rate')[0], 'Limit (' + rate + ' KiB/s)' );
    10751075                                        $('#limited_upload_rate').deselectMenuSiblings().selectMenuItem();
    10761076                                        $('div.preference input#upload_rate')[0].value = rate;
Note: See TracChangeset for help on using the changeset viewer.