Commit bdf1580d authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

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.
parent c38cb201
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> 2005-11-02 Sven Neumann <sven@gimp.org>
* libgimpbase/gimpmemsize.c (gimp_memsize_to_string): use * libgimpbase/gimpmemsize.c (gimp_memsize_to_string): use
......
...@@ -635,7 +635,10 @@ gimp_imagefile_get_desc_string (GimpImagefile *imagefile) ...@@ -635,7 +635,10 @@ gimp_imagefile_get_desc_string (GimpImagefile *imagefile)
if (thumbnail->image_width > 0 && thumbnail->image_height > 0) 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_width,
thumbnail->image_height); thumbnail->image_height);
g_string_append_c (str, '\n'); g_string_append_c (str, '\n');
......
...@@ -351,7 +351,8 @@ gimp_image_prop_view_update (GimpImagePropView *view) ...@@ -351,7 +351,8 @@ gimp_image_prop_view_update (GimpImagePropView *view)
gchar buf[256]; gchar buf[256];
/* pixel size */ /* 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); image->width, image->height);
gtk_label_set_text (GTK_LABEL (view->pixel_size_label), buf); gtk_label_set_text (GTK_LABEL (view->pixel_size_label), buf);
......
...@@ -460,9 +460,9 @@ gimp_size_box_update_size (GimpSizeBox *box) ...@@ -460,9 +460,9 @@ gimp_size_box_update_size (GimpSizeBox *box)
if (priv->pixel_label) if (priv->pixel_label)
{ {
gchar *text; gchar *text = g_strdup_printf (ngettext ("%d x %d pixel",
"%d x %d pixels", box->height),
text = g_strdup_printf (_("%d x %d pixels"), box->width, box->height); box->width, box->height);
gtk_label_set_text (GTK_LABEL (priv->pixel_label), text); gtk_label_set_text (GTK_LABEL (priv->pixel_label), text);
g_free (text); g_free (text);
} }
......
...@@ -589,6 +589,17 @@ gimp_template_editor_show_advanced (GimpTemplateEditor *editor, ...@@ -589,6 +589,17 @@ gimp_template_editor_show_advanced (GimpTemplateEditor *editor,
/* private functions */ /* 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 static void
gimp_template_editor_aspect_callback (GtkWidget *widget, gimp_template_editor_aspect_callback (GtkWidget *widget,
GimpTemplateEditor *editor) GimpTemplateEditor *editor)
...@@ -600,7 +611,6 @@ gimp_template_editor_aspect_callback (GtkWidget *widget, ...@@ -600,7 +611,6 @@ gimp_template_editor_aspect_callback (GtkWidget *widget,
gint height = template->height; gint height = template->height;
gdouble xresolution = template->xresolution; gdouble xresolution = template->xresolution;
gdouble yresolution = template->yresolution; gdouble yresolution = template->yresolution;
gchar *text;
if (template->width == template->height) if (template->width == template->height)
{ {
...@@ -631,10 +641,7 @@ gimp_template_editor_aspect_callback (GtkWidget *widget, ...@@ -631,10 +641,7 @@ gimp_template_editor_aspect_callback (GtkWidget *widget,
gimp_template_editor_template_notify, gimp_template_editor_template_notify,
editor); editor);
text = g_strdup_printf (_("%d x %d pixels"), gimp_template_editor_set_pixels (editor, template);
template->width, template->height);
gtk_label_set_text (GTK_LABEL (editor->pixel_label), text);
g_free (text);
} }
} }
...@@ -669,10 +676,7 @@ gimp_template_editor_template_notify (GimpTemplate *template, ...@@ -669,10 +676,7 @@ gimp_template_editor_template_notify (GimpTemplate *template,
g_free (text); g_free (text);
#endif #endif
text = g_strdup_printf (_("%d x %d pixels"), gimp_template_editor_set_pixels (editor, template);
template->width, template->height);
gtk_label_set_text (GTK_LABEL (editor->pixel_label), text);
g_free (text);
if (template->width > template->height) if (template->width > template->height)
aspect = GIMP_ASPECT_LANDSCAPE; aspect = GIMP_ASPECT_LANDSCAPE;
......
2005-11-02 Sven Neumann <sven@gimp.org>
* de.po: minor updates.
2005-11-01 Adam Weinberger <adamw@gnome.org> 2005-11-01 Adam Weinberger <adamw@gnome.org>
* en_CA.po: Updated Canadian English translation. * en_CA.po: Updated Canadian English translation.
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment