Changeset 5307

Timestamp:

Mar 19, 2008, 5:14:47 PM (14 years ago)

Author:

charles

Message:

(gtk) small string folding & i18n tweaks.

Location:

trunk/gtk

Files:

• actions.c (modified) (2 diffs)
• open-dialog.c (modified) (1 diff)
• stats.c (modified) (2 diffs)
• tr-prefs.c (modified) (2 diffs)
• util.c (modified) (2 diffs)

trunk/gtk/actions.c

@@ -37 +37 @@
 #if !GTK_CHECK_VERSION(2,8,0)
 #define GTK_STOCK_INFO GTK_STOCK_PROPERTIES
+#endif
+
+#if !GTK_CHECK_VERSION(2,10,0)
+#define GTK_STOCK_SELECT_ALL NULL
 #endif
 
@@ -114 +118 @@
     G_CALLBACK(action_cb) },
   { "quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, NULL, G_CALLBACK(action_cb) },
-  { "select-all", NULL,
+  { "select-all", GTK_STOCK_SELECT_ALL,
     N_( "Select _All" ), "<control>A", NULL, G_CALLBACK(action_cb) },
   { "unselect-all", NULL,

trunk/gtk/open-dialog.c

@@ -202 +202 @@
     ++row;
     col = 0;
-    l = gtk_label_new_with_mnemonic( _( "Destination _folder:" ) );
+    l = gtk_label_new_with_mnemonic( _( "_Destination folder:" ) );
     gtk_misc_set_alignment( GTK_MISC( l ), 0.0f, 0.5f );
     gtk_table_attach( GTK_TABLE( t ), l, col, col+1, row, row+1, GTK_FILL, 0, 0, 0 );

trunk/gtk/stats.c

@@ -48 +48 @@
 updateStats( gpointer gdata )
 {
+    const char * fmt;
     char buf[128];
 
@@ -60 +61 @@
     setLabelFromRatio( ui->one_ratio_lb, one.ratio );
 
-    g_snprintf( buf, sizeof( buf ), _( "Started %d times" ), (int)all.sessionCount );
+    fmt = ngettext( "Started %'d time", "Started %'d times", (int)all.sessionCount );
+    g_snprintf( buf, sizeof(buf), fmt, (int)all.sessionCount );
     setLabel( ui->all_sessions_lb, buf );
     setLabel( ui->all_up_lb, tr_strlsize( buf, all.uploadedBytes, sizeof(buf) ) );

trunk/gtk/tr-prefs.c

@@ -253 +253 @@
 
         w = new_path_chooser_button( PREF_KEY_DIR_DEFAULT, core );
-        hig_workarea_add_row( t, &row, _( "Default destination _folder:" ), w, NULL );
+        hig_workarea_add_row( t, &row, _( "_Destination folder:" ), w, NULL );
 
 #ifdef HAVE_LIBNOTIFY
@@ -340 +340 @@
         gtk_misc_set_alignment( GTK_MISC(l), 0.0f, 0.5f );
         gtk_box_pack_start( GTK_BOX(h), l, FALSE, FALSE, 0 );
-        hig_workarea_add_row( t, &row, _("Incoming TCP _port:"), h, w );
+        hig_workarea_add_row( t, &row, _("Incoming _port:"), h, w );
 
         g_object_set_data( G_OBJECT(l), "tr-port-spin", w2 );

trunk/gtk/util.c

@@ -59 +59 @@
         g_strlcpy( buf, "\xE2\x88\x9E", buflen );
     else if( ratio < 10.0 )
-        g_snprintf( buf, buflen, "%.2f", ratio );
+        g_snprintf( buf, buflen, "%'.2f", ratio );
     else if( ratio < 100.0 )
-        g_snprintf( buf, buflen, "%.1f", ratio );
+        g_snprintf( buf, buflen, "%'.1f", ratio );
     else
-        g_snprintf( buf, buflen, "%.0f", ratio );
+        g_snprintf( buf, buflen, "%'.0f", ratio );
     return buf;
 }
@@ -84 +84 @@
 #else
     else if( size < (guint64)KILOBYTE_FACTOR )
-        g_snprintf( buf, buflen, ngettext("%u byte", "%u bytes", (guint)size), (guint)size );
+        g_snprintf( buf, buflen, ngettext("%'u byte", "%'u bytes", (guint)size), (guint)size );
     else {
         gdouble displayed_size;
         if (size < (guint64)MEGABYTE_FACTOR) {
             displayed_size = (gdouble) size / KILOBYTE_FACTOR;
-            g_snprintf( buf, buflen, _("%.1f KB"), displayed_size );
+            g_snprintf( buf, buflen, _("%'.1f KB"), displayed_size );
         } else if (size < (guint64)GIGABYTE_FACTOR) {
             displayed_size = (gdouble) size / MEGABYTE_FACTOR;
-            g_snprintf( buf, buflen, _("%.1f MB"), displayed_size );
+            g_snprintf( buf, buflen, _("%'.1f MB"), displayed_size );
         } else {
             displayed_size = (gdouble) size / GIGABYTE_FACTOR;
-            g_snprintf( buf, buflen, _("%.1f GB"), displayed_size );
+            g_snprintf( buf, buflen, _("%'.1f GB"), displayed_size );
         }
     }