Changeset 3333

Timestamp:

Oct 8, 2007, 7:40:34 PM (15 years ago)

Author:

charles

Message:

i18n cleanup: (1) take strings that were very similar and make them identical, so there are fewer strings to translate. (2) unmark things that shouldn't've been marked for translation, such as the UTF-8 infinity symbol.

Location:

trunk/gtk

Files:

• dialogs.c (modified) (1 diff)
• ipc.c (modified) (7 diffs)
• makemeta-ui.c (modified) (2 diffs)
• torrent-inspector.c (modified) (3 diffs)
• util.c (modified) (1 diff)

trunk/gtk/dialogs.c

@@ -257 +257 @@
     if( 0 > count )
     {
-        gtk_label_set_text( label, _("?") );
+        gtk_label_set_text( label, "?" );
     }
     else

trunk/gtk/ipc.c

@@ -195 +195 @@
       0 > ipc_addmsg( con->msgs, IPC_MSG_UPLIMIT,      smsg_int ) )
   {
-      errmsg( con->u.serv.wind, _("Failed to set up IPC:\n%s"),
+      errmsg( con->u.serv.wind, _("Failed to set up IPC: %s"),
               strerror( errno ) );
       g_free( con );
@@ -227 +227 @@
   if( NULL == con->msgs )
   {
-      fprintf( stderr, _("failed to set up IPC: %s\n"), strerror( errno ) );
+      g_message( _("Failed to set up IPC: %s"), strerror( errno ) );
       g_free( con );
       return FALSE;
@@ -307 +307 @@
 
  fail:
-  errmsg(con->u.serv.wind, _("Failed to set up socket:\n%s"),
+  errmsg(con->u.serv.wind, _("Failed to set up socket: %s"),
          strerror(errno));
   if(0 <= con->fd)
@@ -330 +330 @@
 
   if(0 > (con->fd = socket(AF_UNIX, SOCK_STREAM, 0))) {
-    fprintf(stderr, _("failed to create socket: %s\n"), strerror(errno));
+    g_message( _("Failed to create socket: %s"), strerror(errno));
     return FALSE;
   }
@@ -339 +339 @@
 
   if(0 > connect(con->fd, (struct sockaddr*)&addr, SUN_LEN(&addr))) {
-    fprintf(stderr, _("failed to connect to %s: %s\n"), path, strerror(errno));
+    g_message( _("Failed to connect to %s: %s"), path, strerror(errno));
     return FALSE;
   }
@@ -429 +429 @@
         {
             case EPERM:
-                errmsg( con->u.serv.wind, _("bad IPC protocol version") );
+                errmsg( con->u.serv.wind, _("Bad IPC protocol version") );
                 break;
             case EINVAL:
@@ -465 +465 @@
         {
             case EPERM:
-                fprintf( stderr, _("bad IPC protocol version\n") );
+                g_message( _("Bad IPC protocol version") );
                 break;
             case EINVAL:
-                fprintf( stderr, _("IPC protocol parse error\n") );
+                g_message( _("IPC protocol parse error") );
                 break;
             default:
-                fprintf( stderr, _("IPC parsing failed: %s\n"),
-                         strerror( errno ) );
+                g_message( _("IPC parsing failed: %s"), strerror( errno ) );
                 break;
         }

trunk/gtk/makemeta-ui.c

@@ -195 +195 @@
     g_snprintf( buf, sizeof(buf), "<i>%s; %d %s</i>",
                 pch, fileCount,
-                ngettext("file", "files", fileCount) );
+                ngettext("File", "Files", fileCount) );
     gtk_label_set_markup ( GTK_LABEL(ui->size_lb), buf );
     g_free( pch );
@@ -202 +202 @@
     g_snprintf( buf, sizeof(buf), "<i>%d %s @ %s</i>",
                 pieceCount,
-                ngettext("piece", "pieces", pieceCount),
+                ngettext("Piece", "Pieces", pieceCount),
                 pch );
     gtk_label_set_markup ( GTK_LABEL(ui->pieces_lb), buf );

trunk/gtk/torrent-inspector.c

@@ -409 +409 @@
 {
   if( 0 > count ) {
-    gtk_label_set_text( GTK_LABEL(l), _("?") );
+    gtk_label_set_text( GTK_LABEL(l), "?" );
   } else {
     char str[16];
@@ -837 +837 @@
 
   pch = stat->startDate ? rfc822date (stat->startDate)
-                        : g_strdup_printf (_("?"));
+                        : g_strdup_printf ("?");
   gtk_label_set_text (GTK_LABEL(a->date_added_lb), pch);
   g_free (pch);
 
   pch = stat->activityDate ? rfc822date (stat->activityDate)
-                           : g_strdup_printf (_("?"));
+                           : g_strdup_printf ("?");
   gtk_label_set_text (GTK_LABEL(a->last_activity_lb), pch);
   g_free (pch);
@@ -1502 +1502 @@
   row = 0;
   t = hig_workarea_create ();
-  hig_workarea_add_section_title (t, &row, _("Transfer Bandwidth"));
+  hig_workarea_add_section_title (t, &row, _("Speed Limits") );
   hig_workarea_add_section_spacer (t, row, 2);
 

trunk/gtk/util.c

@@ -128 +128 @@
   if(0 == down)
     /* this is a UTF-8 infinity symbol */
-    return g_strdup(_("\xE2\x88\x9E"));
+    return g_strdup("\xE2\x88\x9E");
 
   ratio = (double)up / (double)down;