Use ngettext for plurals (#123847).

diff --git a/ChangeLog b/ChangeLog
index c8be3eea651ac7c56753090db4d299051e2d42f0..b4e8da78c37fbda904fbee05cc4c81cd3d3677a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-31  Christian Neumair  <chris@gnome-de.org>
+
+       * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata):
+       * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for
+       plurals (#123847).
+
 Wed Dec 31 02:05:39 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c8be3eea651ac7c56753090db4d299051e2d42f0..b4e8da78c37fbda904fbee05cc4c81cd3d3677a0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2003-12-31  Christian Neumair  <chris@gnome-de.org>
+
+       * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata):
+       * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for
+       plurals (#123847).
+
 Wed Dec 31 02:05:39 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c8be3eea651ac7c56753090db4d299051e2d42f0..b4e8da78c37fbda904fbee05cc4c81cd3d3677a0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2003-12-31  Christian Neumair  <chris@gnome-de.org>
+
+       * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata):
+       * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for
+       plurals (#123847).
+
 Wed Dec 31 02:05:39 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c8be3eea651ac7c56753090db4d299051e2d42f0..b4e8da78c37fbda904fbee05cc4c81cd3d3677a0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2003-12-31  Christian Neumair  <chris@gnome-de.org>
+
+       * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata):
+       * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for
+       plurals (#123847).
+
 Wed Dec 31 02:05:39 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c8be3eea651ac7c56753090db4d299051e2d42f0..b4e8da78c37fbda904fbee05cc4c81cd3d3677a0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2003-12-31  Christian Neumair  <chris@gnome-de.org>
+
+       * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata):
+       * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for
+       plurals (#123847).
+
 Wed Dec 31 02:05:39 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): 

diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c
index 445e7adf7f0a9c0d254101f8769134b6b4529b3d..cc17de48f14a475d4bd86def3f01bd8fac4844a2 100644 (file)
--- a/gdk-pixbuf/gdk-pixdata.c
+++ b/gdk-pixbuf/gdk-pixdata.c
@@ -399,7 +399,9 @@ gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
        {
          g_set_error (error, GDK_PIXBUF_ERROR,
                       GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-                      _("failed to allocate image buffer of %u bytes"),
+                      ngettext("failed to allocate image buffer of %u byte",
+                               "failed to allocate image buffer of %u bytes",
+                               pixdata->rowstride * pixdata->height),
                       pixdata->rowstride * pixdata->height);
          return NULL;
        }

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 731c49a58e2a8e0bdb7498e1a5d2f0dfd4ced706..ac3e66b647a368fb10ef9eb90a01050e57100447 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -2946,7 +2946,7 @@ list_size_data_func (GtkTreeViewColumn *tree_column,
     return;
 
   if (size < (gint64)1024)
-    str = g_strdup_printf (_("%d bytes"), (gint)size);
+    str = g_strdup_printf (ngettext ("%d byte", "%d bytes", (gint)size), (gint)size);
   else if (size < (gint64)1024*1024)
     str = g_strdup_printf (_("%.1f K"), size / (1024.));
   else if (size < (gint64)1024*1024*1024)