Changeset 5313

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:

• gtk/details.c (modified) (2 diffs)
• gtk/makemeta-ui.c (modified) (3 diffs)
• gtk/stats.c (modified) (1 diff)
• gtk/torrent-cell-renderer.c (modified) (2 diffs)
• gtk/tr-icon.c (modified) (1 diff)
• gtk/tr-torrent.c (modified) (2 diffs)
• gtk/tr-window.c (modified) (1 diff)
• gtk/util.c (modified) (1 diff)
• libtransmission/fastresume.c (modified) (1 diff)
• libtransmission/metainfo.c (modified) (1 diff)
• libtransmission/natpmp.c (modified) (1 diff)
• libtransmission/shared.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/upnp.c (modified) (2 diffs)

trunk/gtk/details.c

@@ -669 +669 @@
   const tr_info * info = tr_torrentInfo(tor);
 
-  hig_workarea_add_section_title (t, &row, _("Torrent Information"));
+  hig_workarea_add_section_title (t, &row, _("Details"));
 
     tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) );
     g_snprintf( buf, sizeof( buf ),
-                /* %1$s is number of pieces; %2$s is how big each piece is */
-                ngettext( "%1$d Piece @ %2$s",
-                          "%1$d Pieces @ %2$s",
+                /* %1$'d is number of pieces
+                   %2$s is how big each piece is */
+                ngettext( "%1$'d Piece @ %2$s",
+                          "%1$'d Pieces @ %2$s",
                           info->pieceCount ),
                 info->pieceCount, sizeStr );
@@ -1225 +1226 @@
   /* create the dialog */
   tr_strlsize( sizeStr, info->totalSize, sizeof(sizeStr) );
-  /* %1$s is torrent name; %2$s its file size */
+  /* %1$s is torrent name 
+     %2$s its 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,

trunk/gtk/makemeta-ui.c

@@ -187 +187 @@
     filename = gtk_file_chooser_get_filename( chooser );
     if( !filename )
-        *buf = '\0';
+        g_snprintf( buf, sizeof( buf ), _( "No files selected" ) );
     else {
         ui->builder = tr_metaInfoBuilderCreate( ui->handle, filename );
@@ -205 +205 @@
         tr_strlsize( sizeStr, totalSize, sizeof(sizeStr) );
         g_snprintf( buf, sizeof( buf ),
-                    /* %1$s is the torrent size, %2$s is its number of files */
-                    ngettext( "<i>%1$s; %2$d File</i>",
-                              "<i>%1$s; %2$d Files</i>", fileCount ),
+                    /* %1$s is the torrent size
+                       %2$'d is its number of files */
+                    ngettext( "<i>%1$s; %2$'d File</i>",
+                              "<i>%1$s; %2$'d Files</i>", fileCount ),
                     sizeStr, fileCount );
     }
@@ -217 +218 @@
         tr_strlsize( sizeStr, pieceSize, sizeof(sizeStr) );
         g_snprintf( buf, sizeof( buf ),
-                    /* %1$s is number of pieces; %2$s is how big each piece is */
-                    ngettext( "<i>%1$d Piece @ %2$s</i>",
-                              "<i>%1$d Pieces @ %2$s</i>",
+                    /* %1$'s is number of pieces;
+                       %2$s is how big each piece is */
+                    ngettext( "<i>%1$'d Piece @ %2$s</i>",
+                              "<i>%1$'d Pieces @ %2$s</i>",
                               pieceCount ),
                     pieceCount, sizeStr );

trunk/gtk/stats.c

@@ -109 +109 @@
     hig_workarea_add_section_divider( t, &row );
     hig_workarea_add_section_title( t, &row, _("Total") );
-        l = ui->all_sessions_lb = gtk_label_new( _("Program started %d times") );
+        l = ui->all_sessions_lb = gtk_label_new( _("Started %'d time") );
         hig_workarea_add_label_w( t, row++, l );
         l = ui->all_up_lb = gtk_label_new( NULL );

trunk/gtk/torrent-cell-renderer.c

@@ -196 +196 @@
         case TR_STATUS_DOWNLOAD:
             g_string_append_printf( gstr,
-                ngettext( "Downloading from %1$d of %2$d connected peer",
-                          "Downloading from %1$d of %2$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,
@@ -206 +206 @@
         case TR_STATUS_SEED:
             g_string_append_printf( gstr,
-                ngettext( "Seeding to %1$d of %2$d connected peer",
-                          "Seeding to %1$d of %2$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

@@ -64 +64 @@
     tr_strlspeed( upStr, stats->clientUploadSpeed, sizeof( upStr ) );
     g_snprintf( tip, sizeof( tip ),
-                /* %1$d is the number of torrents we're seeding,
-                   %2$d is the number of torrents we're downloading,
+                /* %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" ), 
+                _( "%1$'d Seeding, %2$'d Downloading\nDown: %3$s, Up: %4$s" ), 
                 stats->seedingCount,
                 stats->downloadCount,

trunk/gtk/tr-torrent.c

@@ -298 +298 @@
         case TR_STATUS_DONE:
             top = g_strdup_printf(
-                ngettext( "Uploading to %1$d of %2$d connected peer",
-                          "Uploading to %1$d of %2$d connected peers", tpeers ),
+                ngettext( "Uploading to %1$'d of %2$'d connected peer",
+                          "Uploading to %1$'d of %2$'d connected peers", tpeers ),
                           upeers, tpeers );
             break;
@@ -305 +305 @@
         case TR_STATUS_SEED:
             top = g_strdup_printf(
-                ngettext( "Seeding to %1$d of %2$d connected peer",
-                          "Seeding to %1$d of %2$d connected peers", tpeers ),
+                ngettext( "Seeding to %1$'d of %2$'d connected peer",
+                          "Seeding to %1$'d of %2$'d connected peers", tpeers ),
                           upeers, tpeers );
             break;

trunk/gtk/tr-window.c

@@ -597 +597 @@
 
         if( torrentCount != visibleCount )
-            g_snprintf( buf, sizeof( buf ), ngettext( "%1$d of %2$d Torrent",
-                                                      "%1$d of %2$d Torrents",
+            g_snprintf( buf, sizeof( buf ), ngettext( "%1$'d of %2$'d Torrent",
+                                                      "%1$'d of %2$'d Torrents",
                                                       torrentCount ),
                                             visibleCount, torrentCount );
         else
-            g_snprintf( buf, sizeof( buf ), ngettext( "%d Torrent",
-                                                      "%d Torrents",
+            g_snprintf( buf, sizeof( buf ), ngettext( "%'d Torrent",
+                                                      "%'d Torrents",
                                                       torrentCount ),
                                             torrentCount );

trunk/gtk/util.c

@@ -108 +108 @@
 
     if ( speed < 1000.0 ) /* 0.0 KB to 999.9 KB */
-        g_snprintf( buf, buflen, _( "%.1f KB/s" ), speed );
+        g_snprintf( buf, buflen, _( "%'.1f KB/s" ), speed );
     else if( speed < 102400.0 ) /* 0.98 MB to 99.99 MB */
-        g_snprintf( buf, buflen, _( "%.2f MB/s" ), (speed/1024) );
+        g_snprintf( buf, buflen, _( "%'.2f MB/s" ), (speed/1024) );
     else if( speed < 1024000.0 ) /* 100.0 MB to 999.9 MB */
-        g_snprintf( buf, buflen, _( "%.1f MB/s" ), (speed/1024) );
+        g_snprintf( buf, buflen, _( "%'.1f MB/s" ), (speed/1024) );
     else /* insane speeds */
-        g_snprintf( buf, buflen, _( "%.2f GB/s" ), (speed/1048576) );
+        g_snprintf( buf, buflen, _( "%'.2f GB/s" ), (speed/1048576) );
 
     return buf;

trunk/libtransmission/fastresume.c

@@ -642 +642 @@
             else
                 /* %s is the torrent name */
-                tr_torinf( tor, _( "Skipping invalid resume file for \"%s\"" ), tor->info.name );
+                tr_torinf( tor, _( "Couldn't read resume file for \"%s\"" ), tor->info.name );
         }
 

trunk/libtransmission/metainfo.c

@@ -277 +277 @@
     if( !inf->fileCount || !inf->totalSize )
     {
-        tr_err( _( "Torrent is empty" ) );
+        tr_err( _( "Torrent is corrupt" ) ); /* the content is missing! */
         goto fail;
     }

trunk/libtransmission/natpmp.c

@@ -137 +137 @@
         logVal( "readnatpmpresponseorretry", val );
         if( val >= 0 ) {
-            tr_ninf( getKey(), _( "found public address %s" ), inet_ntoa( response.publicaddress.addr ) );
+            tr_ninf( getKey(), _( "Found public address \"%s\"" ), inet_ntoa( response.publicaddress.addr ) );
             nat->state = TR_NATPMP_IDLE;
         } else if( val != NATPMP_TRYAGAIN ) {

trunk/libtransmission/shared.c

@@ -70 +70 @@
     {
         /* we're in the process of trying to set up port forwarding */
-        case TR_NAT_TRAVERSAL_MAPPING:   return _( "starting" );
+        case TR_NAT_TRAVERSAL_MAPPING:   return _( "Starting" );
         /* we've successfully forwarded the port */
-        case TR_NAT_TRAVERSAL_MAPPED:    return _( "forwarded" );
+        case TR_NAT_TRAVERSAL_MAPPED:    return _( "Forwarded" );
         /* we're cancelling the port forwarding */
-        case TR_NAT_TRAVERSAL_UNMAPPING: return _( "stopping" );
+        case TR_NAT_TRAVERSAL_UNMAPPING: return _( "Stopping" );
         /* the port isn't forwarded */
-        case TR_NAT_TRAVERSAL_UNMAPPED:  return _( "not forwarded" );
+        case TR_NAT_TRAVERSAL_UNMAPPED:  return _( "Not forwarded" );
         case TR_NAT_TRAVERSAL_ERROR:     return "???";
     }

trunk/libtransmission/torrent.c

@@ -158 +158 @@
 
         case TR_TRACKER_WARNING:
-            tr_torerr( tor, _( "Tracker warning: %s" ), event->text );
+            tr_torerr( tor, _( "Tracker warning: \"%s\"" ), event->text );
             tor->error = TR_ERROR_TC_WARNING;
             strlcpy( tor->errorString, event->text, sizeof(tor->errorString) );
@@ -164 +164 @@
 
         case TR_TRACKER_ERROR:
-            tr_torerr( tor, _( "Tracker error: %s" ), event->text );
+            tr_torerr( tor, _( "Tracker error: \"%s\"" ), event->text );
             tor->error = TR_ERROR_TC_ERROR;
             strlcpy( tor->errorString, event->text, sizeof(tor->errorString) );
@@ -1053 +1053 @@
     switch( type )
     {
+        /* Translators: this is a minor point that's safe to skip over, but FYI:
+           "Complete" and "Done" are specific, different terms in Transmission:
+           "Complete" means we've downloaded every file in the torrent.
+           "Done" means we're done downloading the files we wanted, but NOT all that exist */
         case TR_CP_DONE:     return _( "Done" );
         case TR_CP_COMPLETE: return _( "Complete" );

trunk/libtransmission/upnp.c

@@ -118 +118 @@
                                 handle->data.servicetype,
                                 portStr, "TCP" );
-        tr_ninf( getKey(), _( "Stopping port forwarding of \"%s\", service \"%s\"" ),
+        tr_ninf( getKey(), _( "Stopping port forwarding through \"%s\", service \"%s\"" ),
                 handle->urls.controlURL, handle->data.servicetype );
         handle->isMapped = 0;
@@ -147 +147 @@
             handle->isMapped = !err;
         }
-        tr_ninf( getKey(), _( "Port forwarding via \"%s\", service \"%s\".  (local address: %s:%d)" ),
+        tr_ninf( getKey(), _( "Port forwarding through \"%s\", service \"%s\".  (local address: %s:%d)" ),
                  handle->urls.controlURL, handle->data.servicetype, handle->lanaddr, port );
         if( handle->isMapped ) {