app/core/gimpimagefile.c app/widgets/gimpimagepropview.c

2005-11-02  Sven Neumann  <sven@gimp.org>

	* app/core/gimpimagefile.c
	* app/widgets/gimpimagepropview.c
	* app/widgets/gimpsizebox.c
	* app/widgets/gimptemplateeditor.c: use ngettext() for plural forms.

ChangeLog

@@ -1,3 +1,10 @@
+2005-11-02  Sven Neumann  <sven@gimp.org>
+
+	* app/core/gimpimagefile.c
+	* app/widgets/gimpimagepropview.c
+	* app/widgets/gimpsizebox.c
+	* app/widgets/gimptemplateeditor.c: use ngettext() for plural forms.
+
 2005-11-02  Sven Neumann  <sven@gimp.org>
 
 	* libgimpbase/gimpmemsize.c (gimp_memsize_to_string): use

app/core/gimpimagefile.c

@@ -635,7 +635,10 @@ gimp_imagefile_get_desc_string (GimpImagefile *imagefile)
 
               if (thumbnail->image_width > 0 && thumbnail->image_height > 0)
                 {
-                  g_string_append_printf (str, _("%d x %d pixels"),
+                  g_string_append_printf (str,
+                                          ngettext ("%d x %d pixel",
+                                                    "%d x %d pixels",
+                                                    thumbnail->image_height),
                                           thumbnail->image_width,
                                           thumbnail->image_height);
                   g_string_append_c (str, '\n');

app/widgets/gimpimagepropview.c

@@ -351,7 +351,8 @@ gimp_image_prop_view_update (GimpImagePropView *view)
   gchar              buf[256];
 
   /*  pixel size  */
-  g_snprintf (buf, sizeof (buf), _("%d x %d pixels"),
+  g_snprintf (buf, sizeof (buf), ngettext ("%d x %d pixel",
+                                           "%d x %d pixels", image->height),
               image->width, image->height);
   gtk_label_set_text (GTK_LABEL (view->pixel_size_label), buf);
 

app/widgets/gimpsizebox.c

@@ -460,9 +460,9 @@ gimp_size_box_update_size (GimpSizeBox *box)
 
   if (priv->pixel_label)
     {
-      gchar *text;
-
-      text = g_strdup_printf (_("%d x %d pixels"), box->width, box->height);
+      gchar *text = g_strdup_printf (ngettext ("%d x %d pixel",
+                                               "%d x %d pixels", box->height),
+                                     box->width, box->height);
       gtk_label_set_text (GTK_LABEL (priv->pixel_label), text);
       g_free (text);
     }

app/widgets/gimptemplateeditor.c

@@ -589,6 +589,17 @@ gimp_template_editor_show_advanced (GimpTemplateEditor *editor,
 
 /*  private functions  */
 
+static void
+gimp_template_editor_set_pixels (GimpTemplateEditor *editor,
+                                 GimpTemplate       *template)
+{
+  gchar *text = g_strdup_printf (ngettext ("%d x %d pixel",
+                                           "%d x %d pixels", template->height),
+                                 template->width, template->height);
+  gtk_label_set_text (GTK_LABEL (editor->pixel_label), text);
+  g_free (text);
+}
+
 static void
 gimp_template_editor_aspect_callback (GtkWidget          *widget,
                                       GimpTemplateEditor *editor)
@@ -600,7 +611,6 @@ gimp_template_editor_aspect_callback (GtkWidget          *widget,
       gint          height      = template->height;
       gdouble       xresolution = template->xresolution;
       gdouble       yresolution = template->yresolution;
-      gchar        *text;
 
       if (template->width == template->height)
         {
@@ -631,10 +641,7 @@ gimp_template_editor_aspect_callback (GtkWidget          *widget,
                                          gimp_template_editor_template_notify,
                                          editor);
 
-      text = g_strdup_printf (_("%d x %d pixels"),
-                              template->width, template->height);
-      gtk_label_set_text (GTK_LABEL (editor->pixel_label), text);
-      g_free (text);
+      gimp_template_editor_set_pixels (editor, template);
     }
 }
 
@@ -669,10 +676,7 @@ gimp_template_editor_template_notify (GimpTemplate       *template,
   g_free (text);
 #endif
 
-  text = g_strdup_printf (_("%d x %d pixels"),
-                          template->width, template->height);
-  gtk_label_set_text (GTK_LABEL (editor->pixel_label), text);
-  g_free (text);
+  gimp_template_editor_set_pixels (editor, template);
 
   if (template->width > template->height)
     aspect = GIMP_ASPECT_LANDSCAPE;

po/ChangeLog

@@ -1,3 +1,7 @@
+2005-11-02  Sven Neumann  <sven@gimp.org>
+
+	* de.po: minor updates.
+
 2005-11-01  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.