Changeset 5223

Timestamp:

Mar 7, 2008, 9:59:27 PM (14 years ago)

Author:

charles

Message:

(gtk) more i18n string work w/suggestions from andre and vuntz to use format strings with positions to allow argument reordering.

Location:

trunk/gtk

Files:

• details.c (modified) (3 diffs)
• main.c (modified) (1 diff)
• torrent-cell-renderer.c (modified) (7 diffs)
• tr-icon.c (modified) (1 diff)
• tr-window.c (modified) (1 diff)

trunk/gtk/details.c

@@ -787 +787 @@
   g_free (pch);
 
-  pch = g_strdup_printf( _( "%.1f%% (%.1f%% selected)" ), stat->percentComplete*100.0, stat->percentDone*100.0 );
+  /* Translators: %1$.1f is percent of how much of what we want has been downloaded,
+                  %2$.1f is percent of how much of the whole torrent we've downloaded */
+  pch = g_strdup_printf( _( "%1$.1f%% (%2$.1f%% selected)" ), stat->percentComplete*100.0, stat->percentDone*100.0 );
   gtk_label_set_text (GTK_LABEL(a->progress_lb), pch);
   g_free (pch);
@@ -793 +795 @@
   tr_strlsize( sizeStr,  stat->haveValid + stat->haveUnchecked, sizeof(sizeStr) );
   tr_strlsize( sizeStr2, stat->haveValid,                       sizeof(sizeStr2) );
-  g_snprintf( buf, sizeof(buf), _("%s (%s verified)"), sizeStr, sizeStr2 );
+  /* Translators: %1$s is total size of what we've saved to disk, %2$s is how much of it's passed the checksum test */
+  g_snprintf( buf, sizeof(buf), _("%1$s (%2$s verified)"), sizeStr, sizeStr2 );
   gtk_label_set_text( GTK_LABEL( a->have_lb ), buf );
 
@@ -1235 +1238 @@
   /* create the dialog */
   tr_strlsize( sizeStr, info->totalSize, sizeof(sizeStr) );
-  /* Translators: first %s is torrent name, second is file size */
-  g_snprintf( title, sizeof(title), _( "Details for %s (%s)" ), info->name, sizeStr );
+  /* Translators: %1$s is torrent name, %2$s is file size */
+  g_snprintf( title, sizeof(title), _( "Details for %1$s (%2$s)" ), info->name, sizeStr );
   d = gtk_dialog_new_with_buttons (title, parent, 0,
                                    GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,

trunk/gtk/main.c

@@ -760 +760 @@
                 joined = joinstrlist( cbdata->errqueue, "\n" );
                 errmsg( cbdata->wind,
-                        ngettext( "Failed to load torrent file:\n%s",
-                                  "Failed to load torrent files:\n%s",
+                        ngettext( "Failed to load torrent file: %s",
+                                  "Failed to load torrent files: %s",
                                   g_list_length( cbdata->errqueue ) ),
                         joined );

trunk/gtk/torrent-cell-renderer.c

@@ -48 +48 @@
     if( !isDone )
         str = g_strdup_printf(
-                  _("%s of %s (%.2f%%)"),
+                  /* Translators: %1$s is how much we've got, %2$s is how much we'll have when done, %3$.2f%% is a percentage of the two */
+                  _("%1$s of %2$s (%3$.2f%%)"),
                   tr_strlsize( buf1, haveTotal, sizeof(buf1) ),
                   tr_strlsize( buf2, torStat->desiredSize, sizeof(buf2) ),
@@ -54 +55 @@
     else if( !isSeed )
         str = g_strdup_printf(
-                  _("%s of %s (%.2f%%), uploaded %s (Ratio: %s)"),
+                  /* Translators: %1$s is how much we've got, %2$s is the torrent's total size, %3$.2f%% is a percentage of the two,
+                     %4$s is how much we've uploaded, %5$s is our upload-to-download ratio */
+                  _("%1$s of %2$s (%3$.2f%%), uploaded %4$s (Ratio: %5$s)"),
                   tr_strlsize( buf1, haveTotal, sizeof(buf1) ),
                   tr_strlsize( buf2, info->totalSize, sizeof(buf2) ),
@@ -62 +65 @@
     else
         str = g_strdup_printf(
-                  _("%s, uploaded %s (Ratio: %s)"),
+                  /* Translators: %1$s is the torrent's total size, %2$s is how much we've uploaded,
+                     %3$s is our upload-to-download ratio */
+                  _("%1$s, uploaded %2$s (Ratio: %3$s)"),
                   tr_strlsize( buf1, info->totalSize, sizeof(buf1) ),
                   tr_strlsize( buf2, torStat->uploadedEver, sizeof(buf2) ),
@@ -100 +105 @@
 
     if( haveDown && haveUp )
-        g_snprintf( buf, buflen, _( "Down: %s, Up: %s"), downStr, upStr );
+        /* Translators: %1$s is download speed, %2$s is upload speed */
+        g_snprintf( buf, buflen, _( "Down: %1$s, Up: %2$s"), downStr, upStr );
     else if( haveDown )
+        /* Translators: this refers to download speed */
         g_snprintf( buf, buflen, _( "Down: %s" ), downStr );
     else if( haveUp )
+        /* Translators: this refers to upload speed */
         g_snprintf( buf, buflen, _( "Up: %s" ), upStr );
     else
+        /* Translators: the torrent isn't uploading or downloading */
         g_strlcpy( buf, _( "Idle" ), buflen );
 
@@ -137 +146 @@
             if( torStat->status != TR_STATUS_DOWNLOAD ) {
                 tr_strlratio( buf, torStat->ratio, sizeof( buf ) );
-                g_string_append_printf( gstr, _("Ratio: %s, " ), buf );
+                g_string_append_printf( gstr, _("Ratio: %s" ), buf );
+                g_string_append( gstr, ", " );
             }
             getShortTransferString( torStat, buf, sizeof( buf ) );
@@ -177 +187 @@
         case TR_STATUS_DOWNLOAD:
             g_string_append_printf( gstr,
-                ngettext( "Downloading from %d of %d connected peer",
-                          "Downloading from %d of %d connected peers",
+                ngettext( "Downloading from %1$d of %2$d connected peer",
+                          "Downloading from %1$d of %2$d connected peers",
                           torStat->peersConnected ),
                 torStat->peersSendingToUs,
@@ -187 +197 @@
         case TR_STATUS_SEED:
             g_string_append_printf( gstr,
-                ngettext( "Seeding to %d of %d connected peer",
-                          "Seeding to %d of %d connected peers",
+                ngettext( "Seeding to %1$d of %2$d connected peer",
+                          "Seeding to %1$d of %2$d connected peers",
                           torStat->peersConnected ),
                 torStat->peersGettingFromUs,

trunk/gtk/tr-icon.c

@@ -76 +76 @@
     tr_strlspeed( upStr, stats->clientUploadSpeed, sizeof( upStr ) );
     g_snprintf( tip, sizeof( tip ),
-                _( "%d Seeding, %d Downloading\nDown: %s, Up: %s" ), 
+                /* Translators: %1$d is the number of torrents we're seeding,
+                                %2$d is the number of torrents we're downloading,
+                                %3$s is our download speed,
+                                %4$s is our upload speed */
+                _( "%1$d Seeding, %2$d Downloading\nDown: %3$s, Up: %4$s" ), 
                 stats->seedingCount,
                 stats->downloadCount,

trunk/gtk/tr-window.c

@@ -633 +633 @@
         tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
         tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
-        g_snprintf( buf, sizeof( buf ), _( "Down: %s, Up: %s" ), down, up );
+        /* Translators: %1$s is downloaded byte count, %2$s is uploaded byte count*/
+        g_snprintf( buf, sizeof( buf ), _( "Down: %1$s, Up: %2$s" ), down, up );
     } else if( !strcmp( pch, "total-transfer" ) ) { 
         tr_getCumulativeSessionStats( handle, &stats );
         tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
         tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
-        g_snprintf( buf, sizeof( buf ), _( "Down: %s, Up: %s" ), down, up );
+        /* Translators: %1$s is downloaded byte count, %2$s is uploaded byte count*/
+        g_snprintf( buf, sizeof( buf ), _( "Down: %1$s, Up: %2$s" ), down, up );
     } else { /* default is total-ratio */
         tr_getCumulativeSessionStats( handle, &stats );