Changeset 5226


Ignore:
Timestamp:
Mar 8, 2008, 4:53:11 AM (15 years ago)
Author:
charles
Message:

the last i18n-centric commit for awhile, I hope.

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/gtk/actions.c

    r5221 r5226  
    113113  { "delete-torrent", GTK_STOCK_DELETE, N_("_Delete Files and Remove"), "<control>Delete", NULL, G_CALLBACK(action_cb) },
    114114  { "new-torrent", GTK_STOCK_NEW, N_("_New..."), NULL,
    115     N_("Create a new torrent"),
     115    N_("Create a torrent"),
    116116    G_CALLBACK(action_cb) },
    117117  { "close", GTK_STOCK_CLOSE, N_("Close _Window"), "<control>W",
    … …  
    124124  { "edit-preferences", GTK_STOCK_PREFERENCES, NULL, NULL, NULL, G_CALLBACK(action_cb) },
    125125  { "show-torrent-details", GTK_STOCK_INFO,
    126     N_("_Details"), "<alt>Return", N_("Torrent Details"), G_CALLBACK(action_cb) },
     126    N_("_Details"), "<alt>Return", NULL, G_CALLBACK(action_cb) },
    127127  { "show-about-dialog", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(action_cb) },
    128128  { "update-tracker", GTK_STOCK_NETWORK,

  • trunk/gtk/details.c

    r5225 r5226  
    3232****/
    3333
     34/* define SHOW_PIECES */
     35
     36#ifdef SHOW_PIECES
    3437static int
    3538getGridSize (int pieceCount, int * n_rows, int * n_cols)
    … …  
    221224  return FALSE;
    222225}
     226#endif
    223227
    224228/****
    … …  
    463467  append_peers_to_model (store, peers, n_peers);  /* all these are new */
    464468
     469#ifdef SHOW_PIECES
    465470  if (GDK_IS_DRAWABLE (p->completeness->window))
    466471    refresh_pieces (p->completeness, NULL, p->gtor);
     472#endif
    467473
    468474  fmtpeercount (p->seeders_lb, stat->seeders);
    … …  
    477483  guint i;
    478484  GtkTreeModel *m;
    479   GtkWidget *h, *v, *w, *ret, *da, *sw, *l, *vbox, *hbox;
     485  GtkWidget *h, *v, *w, *ret, *sw, *l, *vbox, *hbox;
    480486  tr_torrent * tor = tr_torrent_handle (gtor);
    481487  PeerData * p = g_new (PeerData, 1);
    482   char name[64];
    483488
    484489  /* TODO: make this configurable? */
    … …  
    585590  gtk_container_set_border_width (GTK_CONTAINER(vbox), GUI_PAD_BIG);
    586591
    587     g_snprintf (name, sizeof(name), "<b>%s</b>", _("Availability"));
     592#ifdef SHOW_PIECES
    588593    l = gtk_label_new (NULL);
    589594    gtk_misc_set_alignment (GTK_MISC(l), 0.0f, 0.5f);
    590     gtk_label_set_markup (GTK_LABEL(l), name);
     595    gtk_label_set_markup (GTK_LABEL(l), _( "<b>Availability</b>" ) );
    591596    gtk_box_pack_start (GTK_BOX(vbox), l, FALSE, FALSE, 0);
    592597
    … …  
    608613    gtk_box_pack_start (GTK_BOX(vbox), w, FALSE, FALSE, 0);
    609614
    610     g_snprintf (name, sizeof(name), "<b>%s</b>", _("Connected Peers"));
    611615    l = gtk_label_new (NULL);
    612616    gtk_misc_set_alignment (GTK_MISC(l), 0.0f, 0.5f);
    613     gtk_label_set_markup (GTK_LABEL(l), name);
     617    gtk_label_set_markup (GTK_LABEL(l), _( "<b>Connected Peers</b>" ) );
    614618    gtk_box_pack_start (GTK_BOX(vbox), l, FALSE, FALSE, 0);
     619#endif
    615620
    616621    h = gtk_hbox_new (FALSE, GUI_PAD);
    617     w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
    618     gtk_widget_set_size_request (w, GUI_PAD_BIG, 0);
    619     gtk_box_pack_start (GTK_BOX(h), w, FALSE, FALSE, 0);
    620622    gtk_box_pack_start_defaults (GTK_BOX(h), sw);
    621623    gtk_box_pack_start_defaults (GTK_BOX(vbox), h);
    622624
    623625    hbox = gtk_hbox_new (FALSE, GUI_PAD);
    624     w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
    625     gtk_widget_set_size_request (w, GUI_PAD_BIG, 0);
    626     gtk_box_pack_start (GTK_BOX(hbox), w, FALSE, FALSE, 0);
    627         g_snprintf (name, sizeof(name), "<b>%s:</b>", _("Seeders"));
    628626        l = gtk_label_new (NULL);
    629         gtk_label_set_markup (GTK_LABEL(l), name);
     627        gtk_label_set_markup (GTK_LABEL(l), _( "<b>Seeders:</b>" ) );
    630628        gtk_box_pack_start (GTK_BOX(hbox), l, FALSE, FALSE, 0);
    631629        l = p->seeders_lb = gtk_label_new (NULL);
    … …  
    633631    gtk_box_pack_start_defaults (GTK_BOX(hbox),
    634632                                 gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f));
    635         g_snprintf (name, sizeof(name), "<b>%s:</b>", _("Leechers"));
    636633        l = gtk_label_new (NULL);
    637         gtk_label_set_markup (GTK_LABEL(l), name);
     634        gtk_label_set_markup (GTK_LABEL(l), _( "<b>Leechers:</b>" ) );
    638635        gtk_box_pack_start (GTK_BOX(hbox), l, FALSE, FALSE, 0);
    639636        l = p->leechers_lb = gtk_label_new (NULL);
    … …  
    641638    gtk_box_pack_start_defaults (GTK_BOX(hbox),
    642639                                 gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f));
    643         g_snprintf (name, sizeof(name), "<b>%s:</b>", _("Completed"));
    644640        l = gtk_label_new (NULL);
    645         gtk_label_set_markup (GTK_LABEL(l), name);
     641        gtk_label_set_markup (GTK_LABEL(l), _( "<b>Completed:</b>" ) );
    646642        gtk_box_pack_start (GTK_BOX(hbox), l, FALSE, FALSE, 0);
    647643        l = p->completed_lb = gtk_label_new (NULL);
    … …  
    670666  char sizeStr[128];
    671667  char buf[256];
    672   char name[128];
    673   const char * namefmt = "%s:";
    674668  GtkTextBuffer * b;
    675669  const tr_info * info = tr_torrentInfo(tor);
    … …  
    677671  hig_workarea_add_section_title (t, &row, _("Torrent Information"));
    678672
    679     g_snprintf (name, sizeof(name), namefmt, _("Pieces"));
    680673    tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) );
    681674    g_snprintf( buf, sizeof( buf ),
    … …  
    686679                info->pieceCount, sizeStr );
    687680    l = gtk_label_new (buf);
    688     hig_workarea_add_row (t, &row, name, l, NULL);
    689 
    690     g_snprintf (name, sizeof(name), namefmt, _("Hash"));
     681    hig_workarea_add_row (t, &row, _("Pieces:"), l, NULL);
     682
    691683    l = gtk_label_new (info->hashString);
    692684    gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
    693     hig_workarea_add_row (t, &row, name, l, NULL);
    694 
    695     g_snprintf (name, sizeof(name), namefmt, _("Privacy"));
     685    hig_workarea_add_row (t, &row, _("Hash:"), l, NULL);
     686
    696687    pch = (info->isPrivate )
    697688      ? _("Private Torrent: PEX disabled")
    698689      : _("Public Torrent");
    699690    l = gtk_label_new (pch);
    700     hig_workarea_add_row (t, &row, name, l, NULL);
    701 
    702     g_snprintf (name, sizeof(name), namefmt, _("Comment"));
     691    hig_workarea_add_row (t, &row, _("Privacy:"), l, NULL);
     692
    703693    b = gtk_text_buffer_new (NULL);
    704694    if( info->comment )
    … …  
    711701    gtk_frame_set_shadow_type (GTK_FRAME(fr), GTK_SHADOW_IN);
    712702    gtk_container_add (GTK_CONTAINER(fr), w);
    713     w = hig_workarea_add_row (t, &row, name, fr, NULL);
     703    w = hig_workarea_add_row (t, &row, _("Comment:"), fr, NULL);
    714704    gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.0f);
    715705
    … …  
    717707  hig_workarea_add_section_title (t, &row, _("Origins"));
    718708 
    719     g_snprintf (name, sizeof(name), namefmt, _("Creator"));
    720709    l = gtk_label_new (*info->creator ? info->creator : _("Unknown"));
    721     hig_workarea_add_row (t, &row, name, l, NULL);
    722 
    723     g_snprintf (name, sizeof(name), namefmt, _("Date"));
     710    hig_workarea_add_row (t, &row, _("Creator:"), l, NULL);
     711
    724712    pch = rfc822date ((guint64)info->dateCreated * 1000u);
    725713    l = gtk_label_new (pch);
    726     hig_workarea_add_row (t, &row, name, l, NULL);
     714    hig_workarea_add_row (t, &row, _("Date:"), l, NULL);
    727715    g_free (pch);
    728716
    … …  
    730718  hig_workarea_add_section_title (t, &row, _("Location"));
    731719
    732     g_snprintf (name, sizeof(name), namefmt, _("Destination directory"));
    733720    l = gtk_label_new (tr_torrentGetFolder (tor));
    734721    gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
    735     hig_workarea_add_row (t, &row, name, l, NULL);
    736 
    737     g_snprintf (name, sizeof(name), namefmt, _("Torrent file"));
     722    hig_workarea_add_row (t, &row, _( "Destination folder" ), l, NULL);
     723
    738724    l = gtk_label_new ( info->torrent );
    739725    gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
    740     hig_workarea_add_row (t, &row, name, l, NULL);
     726    hig_workarea_add_row (t, &row, _( "Torrent file" ), l, NULL);
    741727
    742728  hig_workarea_finish (t, &row);
    … …  
    781767
    782768  /* %1$.1f is percent of how much of what we want's been downloaded,
    783    * %2$.1f is percent of how much of the whole torrent we've downloaded */
     769     %2$.1f is percent of how much of the whole torrent we've downloaded */
    784770  pch = g_strdup_printf( _( "%1$.1f%% (%2$.1f%% selected)" ), stat->percentComplete*100.0, stat->percentDone*100.0 );
    785771  gtk_label_set_text (GTK_LABEL(a->progress_lb), pch);
    … …  
    789775  tr_strlsize( sizeStr2, stat->haveValid,                       sizeof(sizeStr2) );
    790776  /* %1$s is total size of what we've saved to disk
    791    * %2$s is how much of it's passed the checksum test */
     777     %2$s is how much of it's passed the checksum test */
    792778  g_snprintf( buf, sizeof(buf), _("%1$s (%2$s verified)"), sizeStr, sizeStr2 );
    793779  gtk_label_set_text( GTK_LABEL( a->have_lb ), buf );
    … …  
    811797                      *stat->errorString ? stat->errorString : _("None"));
    812798
    813   pch = stat->startDate ? rfc822date (stat->startDate)
    814                         : g_strdup_printf ("?");
     799  pch = stat->startDate ? rfc822date( stat->startDate )
     800                        : g_strdup_printf( _( "Unknown" ) );
    815801  gtk_label_set_text (GTK_LABEL(a->date_added_lb), pch);
    816802  g_free (pch);
    817803
    818   pch = stat->activityDate ? rfc822date (stat->activityDate)
    819                            : g_strdup_printf ("?");
     804  pch = stat->activityDate ? rfc822date( stat->activityDate )
     805                           : g_strdup_printf( _( "Unknown" ) );
    820806  gtk_label_set_text (GTK_LABEL(a->last_activity_lb), pch);
    821807  g_free (pch);
    822808
     809#ifdef SHOW_PIECES
    823810  if (GDK_IS_DRAWABLE (a->availability_da->window))
    824811    refresh_pieces (a->availability_da, NULL, a->gtor);
     812#endif
    825813}
    826814 
    … …  
    832820  int row = 0;
    833821  GtkWidget *t = hig_workarea_create ();
    834   GtkWidget *l, *w;
     822  GtkWidget *l;
    835823
    836824  a->gtor = gtor;
    … …  
    867855    hig_workarea_add_row (t, &row, _("Error:"), l, NULL);
    868856
     857#ifdef SHOW_PIECES
    869858  hig_workarea_add_section_divider (t, &row);
    870859  hig_workarea_add_section_title (t, &row, _("Completion"));
    … …  
    875864    g_signal_connect (w, "expose-event", G_CALLBACK(refresh_pieces), gtor);
    876865    hig_workarea_add_wide_control( t, &row, w );
     866#endif
    877867
    878868  hig_workarea_add_section_divider (t, &row);
    … …  
    10661056    struct tracker_page * page = g_new0( struct tracker_page, 1 );
    10671057    const tr_tracker_info * track;
    1068     char name[128];
    1069     const char * namefmt = "%s:";
    10701058    const tr_info * info = tr_torrent_info (gtor);
    10711059
    … …  
    10931081    hig_workarea_add_section_title( t, &row, _( "Announce" ) );
    10941082
    1095         g_snprintf (name, sizeof(name), namefmt, _("Tracker"));
    10961083        track = info->trackerList->list;
    10971084        tmp = track->port==80
    … …  
    11001087        l = gtk_label_new( tmp );
    11011088        gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
    1102         hig_workarea_add_row (t, &row, name, l, NULL);
     1089        hig_workarea_add_row (t, &row, _( "Tracker:" ), l, NULL);
    11031090        g_free( tmp );
    11041091
    … …  
    11181105        hig_workarea_add_row( t, &row, s, l, NULL );
    11191106
    1120         /* when tracker will honor user pressing
    1121          * the "ask for more peers" button */
     1107        /* how long until the tracker will honor user
     1108         * pressing the "ask for more peers" button */
    11221109        s = _( "Manual announce allowed in:" );
    11231110        l = gtk_label_new( NULL );

  • trunk/gtk/dialogs.c

    r5224 r5226  
    135135    g_object_weak_ref( G_OBJECT( core ), promptdirnocore, stuff );
    136136
    137     wind =  gtk_file_chooser_dialog_new( _("Destination directory"), parent,
     137    wind =  gtk_file_chooser_dialog_new( _("Destination folder"), parent,
    138138                                         GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
    139139                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,

  • trunk/gtk/file-list.c

    r5224 r5226  
    6262{
    6363    switch( priority ) {
    64         /* Translators: this refers to priority */
     64        /* this refers to priority */
    6565        case TR_PRI_HIGH:   return _("High");
    66         /* Translators: this refers to priority */
     66        /* this refers to priority */
    6767        case TR_PRI_NORMAL: return _("Normal");
    68         /* Translators: this refers to priority */
     68        /* this refers to priority */
    6969        case TR_PRI_LOW:    return _("Low");
    7070        default:            return "BUG!";

  • trunk/gtk/ipc.c

    r5224 r5226  
    232232                break;
    233233            case EINVAL:
    234                 g_message( _("IPC protocol parse error") );
     234                g_message( _("IPC parse error") );
    235235                break;
    236236            default:
    237                 g_message( _("IPC parsing failed: %s"), g_strerror( errno ) );
     237                g_message( _("IPC parse error: %s"), g_strerror( errno ) );
    238238                break;
    239239        }

  • trunk/gtk/main.c

    r5224 r5226  
    930930#endif
    931931        "authors", authors,
    932         /* Translators: translate "translator-credits" with your name
    933          * to have it appear in the credits in the "About" dialog */
     932        /* Translators: translate "translator-credits" as your name
     933           to have it appear in the credits in the "About" dialog */
    934934        "translator-credits", _("translator-credits"),
    935935        NULL );

  • trunk/gtk/makemeta-ui.c

    r5224 r5226  
    255255        g_snprintf( name, sizeof(name), "%s:", _("File _Type"));
    256256        h = gtk_hbox_new( FALSE, GUI_PAD_SMALL );
    257         w = rb_dir = gtk_radio_button_new_with_mnemonic( NULL, _("Directory"));
     257        w = rb_dir = gtk_radio_button_new_with_mnemonic( NULL, _("Folder"));
    258258        gtk_box_pack_start ( GTK_BOX(h), w, FALSE, FALSE, 0 );
    259259        w = rb_file = gtk_radio_button_new_with_mnemonic_from_widget( GTK_RADIO_BUTTON(w), _("Single File") );
    … …  
    290290    hig_workarea_add_section_title (t, &row, _("Torrent"));
    291291
    292         g_snprintf( name, sizeof(name), _("Private to this Tracker") );
     292        g_snprintf( name, sizeof(name), _("Private to this tracker") );
    293293        w = ui->private_check = hig_workarea_add_wide_checkbutton( t, &row, name, FALSE );
    294294

  • trunk/gtk/msgwin.c

    r5222 r5226  
    295295  gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
    296296                             GTK_TOOLBAR_CHILD_WIDGET, levels,
    297                              NULL, _("Select the debug filter level."),
     297                             NULL, _("Set the verbosity level"),
    298298                             NULL, NULL, NULL, NULL);
    299299

  • trunk/gtk/open-dialog.c

    r5221 r5226  
    196196    ++row;
    197197    col = 0;
    198     l = gtk_label_new_with_mnemonic( _( "Destination _directory:" ) );
     198    l = gtk_label_new_with_mnemonic( _( "Destination _folder:" ) );
    199199    gtk_misc_set_alignment( GTK_MISC( l ), 0.0f, 0.5f );
    200200    gtk_table_attach( GTK_TABLE( t ), l, col, col+1, row, row+1, GTK_FILL, 0, 0, 0 );

  • trunk/gtk/stats.c

    r5126 r5226  
    88 * the Transmission project.
    99 *
    10  * $Id:$
     10 * $Id$
    1111 */
    1212
    … …  
    104104        hig_workarea_add_row( t, &row, _("Duration:"), l, NULL );
    105105    hig_workarea_add_section_divider( t, &row );
    106     hig_workarea_add_section_title( t, &row, _("Cumulative") );
     106    hig_workarea_add_section_title( t, &row, _("Total") );
    107107        l = ui->all_sessions_lb = gtk_label_new( _("Program started %d times") );
    108108        hig_workarea_add_label_w( t, row++, l );

  • trunk/gtk/torrent-cell-renderer.c

    r5224 r5226  
    4949        str = g_strdup_printf(
    5050                  /* %1$s is how much we've got,
    51                    * %2$s is how much we'll have when done,
    52                    * %3$.2f%% is a percentage of the two */
     51                     %2$s is how much we'll have when done,
     52                     %3$.2f%% is a percentage of the two */
    5353                  _("%1$s of %2$s (%3$.2f%%)"),
    5454                  tr_strlsize( buf1, haveTotal, sizeof(buf1) ),
    … …  
    5858        str = g_strdup_printf(
    5959                  /* %1$s is how much we've got,
    60                    * %2$s is the torrent's total size,
    61                    * %3$.2f%% is a percentage of the two,
    62                    * %4$s is how much we've uploaded,
    63                    * %5$s is our upload-to-download ratio */
     60                     %2$s is the torrent's total size,
     61                     %3$.2f%% is a percentage of the two,
     62                     %4$s is how much we've uploaded,
     63                     %5$s is our upload-to-download ratio */
    6464                  _("%1$s of %2$s (%3$.2f%%), uploaded %4$s (Ratio: %5$s)"),
    6565                  tr_strlsize( buf1, haveTotal, sizeof(buf1) ),
    … …  
    7171        str = g_strdup_printf(
    7272                  /* %1$s is the torrent's total size,
    73                    * %2$s is how much we've uploaded,
    74                    * %3$s is our upload-to-download ratio */
     73                     %2$s is how much we've uploaded,
     74                     %3$s is our upload-to-download ratio */
    7575                  _("%1$s, uploaded %2$s (Ratio: %3$s)"),
    7676                  tr_strlsize( buf1, info->totalSize, sizeof(buf1) ),
    … …  
    8989            char timestr[128];
    9090            tr_strltime( timestr, eta, sizeof( timestr ) );
     91            /* time remaining */
    9192            g_string_append_printf( gstr, _( "%s remaining" ), timestr );
    9293        }
    … …  
    112113    if( haveDown && haveUp )
    113114        /* Translators: do not translate the "speed|" disambiguation prefix.
    114          * %1$s is the download speed
    115          * %2$s is the upload speed */
     115           %1$s is the download speed
     116           %2$s is the upload speed */
    116117        g_snprintf( buf, buflen, Q_( "speed|Down: %1$s, Up: %2$s"), downStr, upStr );
    117118    else if( haveDown )
    118         /* Translators: this refers to download speed */
     119        /* download speed */
    119120        g_snprintf( buf, buflen, _( "Down: %s" ), downStr );
    120121    else if( haveUp )
    121         /* Translators: this refers to upload speed */
     122        /* upload speed */
    122123        g_snprintf( buf, buflen, _( "Up: %s" ), upStr );
    123124    else
    124         /* Translators: the torrent isn't uploading or downloading */
     125        /* the torrent isn't uploading or downloading */
    125126        g_strlcpy( buf, _( "Idle" ), buflen );
    126127

  • trunk/gtk/tr-icon.c

    r5224 r5226  
    7777    g_snprintf( tip, sizeof( tip ),
    7878                /* %1$d is the number of torrents we're seeding,
    79                  * %2$d is the number of torrents we're downloading,
    80                  * %3$s is our download speed,
    81                  * %4$s is our upload speed */
     79                   %2$d is the number of torrents we're downloading,
     80                   %3$s is our download speed,
     81                   %4$s is our upload speed */
    8282                _( "%1$d Seeding, %2$d Downloading\nDown: %3$s, Up: %4$s" ),
    8383                stats->seedingCount,

  • trunk/gtk/tr-prefs.c

    r5224 r5226  
    218218
    219219        w = new_path_chooser_button( PREF_KEY_DIR_DEFAULT, core );
    220         hig_workarea_add_row( t, &row, _( "Default download _location:" ), w, NULL );
     220        hig_workarea_add_row( t, &row, _( "Default destination _folder:" ), w, NULL );
    221221
    222222        s = _( "Show _options dialog" );

  • trunk/gtk/tr-torrent.c

    r5224 r5226  
    216216        {
    217217            case TR_EINVALID:
    218                 *err = g_strdup_printf( _( "File \"%s\" is not a valid torrent" ), filename );
     218                *err = g_strdup_printf( _( "File \"%s\" isn't a valid torrent" ), filename );
    219219                 break;
    220220            case TR_EDUPLICATE:
    … …  
    283283                tr_strltime( timestr, eta, sizeof( timestr ) );
    284284                /* %1$s is # of minutes
    285                  * %2$.1f is a percentage of how much of the torrent is done */
     285                   %2$.1f is a percentage of how much of the torrent is done */
    286286                top = g_strdup_printf( _("%1$s remaining (%2$.1f%%)"), timestr, prog );
    287287            }

  • trunk/gtk/tr-window.c

    r5224 r5226  
    638638        tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
    639639        /* Translators: do not translate the "size|" disambiguation prefix.
    640          * %1$s is the size of the data we've downloaded
    641          * %2$s is the size of the data we've uploaded */
     640           %1$s is the size of the data we've downloaded
     641           %2$s is the size of the data we've uploaded */
    642642        g_snprintf( buf, sizeof( buf ), Q_( "size|Down: %1$s, Up: %2$s" ), down, up );
    643643    } else if( !strcmp( pch, "total-transfer" ) ) {
    … …  
    646646        tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
    647647        /* Translators: do not translate the "size|" disambiguation prefix.
    648          * %1$s is the size of the data we've downloaded
    649          * %2$s is the size of the data we've uploaded */
     648           %1$s is the size of the data we've downloaded
     649           %2$s is the size of the data we've uploaded */
    650650        g_snprintf( buf, sizeof( buf ), Q_( "size|Down: %1$s, Up: %2$s" ), down, up );
    651651    } else { /* default is total-ratio */

  • trunk/libtransmission/shared.c

    r5225 r5226  
    120120            listen( s->bindSocket, 5 );
    121121        } else {
    122             tr_err( _( "%s: Unable to open port %d to listen for incoming peer connections (errno %d - %s)" ),
     122            tr_err( _( "%s: Couldn't open port %d to listen for incoming peer connections (errno %d - %s)" ),
    123123                    getKey(), s->publicPort, errno, tr_strerror(errno) );
    124124            s->bindPort = -1;

  • trunk/libtransmission/transmission.c

    r5224 r5226  
    172172    h->isPortSet = publicPort >= 0;
    173173
    174     /* Translators:
    175      * first %s is the application name
    176      * second %s is the version number */
     174    /* first %s is the application name
     175       second %s is the version number */
    177176    snprintf( buf, sizeof( buf ), _( "%s %s started" ),
    178177              TR_NAME, LONG_VERSION_STRING );

  • trunk/libtransmission/upnp.c

    r5224 r5226  
    8989        devlist = upnpDiscover( 2000, NULL, NULL );
    9090        if( devlist == NULL ) {
    91             tr_err( _( "%s: upnpDiscover returned NULL (errno %d - %s)" ), getKey(), errno, tr_strerror(errno) );
     91            tr_err( _( "%s: upnpDiscover failed (errno %d - %s)" ), getKey(), errno, tr_strerror(errno) );
    9292        }
    9393        errno = 0;
    9494        if( UPNP_GetValidIGD( devlist, &handle->urls, &handle->data, handle->lanaddr, sizeof(handle->lanaddr))) {
    95             tr_inf( _( "%s: Found Internet Gateway Device '%s'" ), getKey(), handle->urls.controlURL );
    96             tr_inf( _( "%s: Local Address is '%s'" ), getKey(), handle->lanaddr );
     95            tr_inf( _( "%s: Found Internet Gateway Device \"%s\"" ), getKey(), handle->urls.controlURL );
     96            tr_inf( _( "%s: Local Address is \"%s\"" ), getKey(), handle->lanaddr );
    9797            handle->state = TR_UPNP_IDLE;
    9898            handle->hasDiscovered = 1;
    … …  
    118118                                handle->data.servicetype,
    119119                                portStr, "TCP" );
    120         tr_dbg( _( "%s: Stopping port forwarding of '%s', service '%s'" ),
     120        tr_dbg( _( "%s: Stopping port forwarding of \"%s\", service \"%s\"" ),
    121121                getKey(), handle->urls.controlURL, handle->data.servicetype );
    122122        handle->isMapped = 0;
    … …  
    147147            handle->isMapped = !err;
    148148        }
    149         tr_inf( _( "%s: Port forwarding via '%s', service '%s'.  (local address: %s:%d)" ),
     149        tr_inf( _( "%s: Port forwarding via \"%s\", service \"%s\".  (local address: %s:%d)" ),
    150150                getKey(), handle->urls.controlURL, handle->data.servicetype, handle->lanaddr, port );
    151151        if( handle->isMapped ) {

  • trunk/libtransmission/utils.c

    r5224 r5226  
    530530
    531531        case TR_ERROR_IO_PARENT:
    532             return _( "Download directory doesn't exist" );
     532            return _( "Destination folder doesn't exist" );
    533533        case TR_ERROR_IO_PERMISSIONS:
    534534            return tr_strerror( EACCES );
    … …  
    540540            return tr_strerror( EMFILE );
    541541        case TR_ERROR_IO_DUP_DOWNLOAD:
    542             return _( "A torrent with this name and destination directory already exists." );
     542            return _( "A torrent with this name and destination folder already exists." );
    543543        case TR_ERROR_IO_OTHER:
    544544            return _( "Generic I/O error" );
Note: See TracChangeset for help on using the changeset viewer.