[gnome-applets] trashapplet: Revert a string change.

[Callum McKenzie <callum src gnome org>]

commit 99024034292b85f28a9f2973e5b6557229e50589
Author: Callum McKenzie <callum spooky-possum org>
Date:   Sun Aug 16 16:57:51 2009 +1200

    trashapplet: Revert a string change.
    
    It turns out gettext isn't as smart as I gave it credit for. See
    bug 591904.

 trashapplet/src/trash-empty.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/trashapplet/src/trash-empty.c b/trashapplet/src/trash-empty.c
index e420129..529318b 100644
--- a/trashapplet/src/trash-empty.c
+++ b/trashapplet/src/trash-empty.c
@@ -73,11 +73,16 @@ trash_empty_update_dialog (gpointer user_data)
       char *text_tmp, *text;
       char *tmp;
 
-      /* Translators, the G_GSIZE_FORMAT is necessary because
-       * of poor definitions in the standard for printf. Think of it
-       * as %d. */
-      text = g_strdup_printf (_("Removing item %"G_GSIZE_FORMAT" of %"G_GSIZE_FORMAT), deleted + 1, total);
+      /* The i18n tools can't handle a direct embedding of the
+       * size format using a macro. This is a work-around. */
+      index_str = g_strdup_printf ("%"G_GSIZE_FORMAT, deleted + 1);
+      total_str = g_strdup_printf ("%"G_GSIZE_FORMAT, total);
+      /* Translators: the %s in this string should be read as %d. */
+      text = g_strdup_printf (_("Removing item %s of %s"),
+                              index_str, total_str);
       gtk_progress_bar_set_text (trash_empty_progress_bar, text);
+      g_free (total_str);
+      g_free (index_str);
       g_free (text);
 
       if (deleted > total)