diff --git a/ChangeLog b/ChangeLog
index dc04c92ca1..a991ddc8eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-27  Sven Neumann  <sven@gimp.org>
+
+	Based on a patch from Zbigniew Chyla:
+
+	* app/core/gimpunit.c (_gimp_unit_get_singular, _gimp_unit_get_plural):
+	don't call gettext() on strings returned by _gimp_unit_get_user_unit().
+
 2006-06-27  Sven Neumann  <sven@gimp.org>
 
 	Applied patch from Zbigniew Chyla:
diff --git a/app/core/gimpunit.c b/app/core/gimpunit.c
index 894688e223..a63cad9768 100644
--- a/app/core/gimpunit.c
+++ b/app/core/gimpunit.c
@@ -239,7 +239,7 @@ _gimp_unit_get_singular (Gimp     *gimp,
   if (unit == GIMP_UNIT_PERCENT)
     return gettext (gimp_unit_percent.singular);
 
-  return gettext (_gimp_unit_get_user_unit (gimp, unit)->singular);
+  return _gimp_unit_get_user_unit (gimp, unit)->singular;
 }
 
 const gchar *
@@ -256,7 +256,7 @@ _gimp_unit_get_plural (Gimp     *gimp,
   if (unit == GIMP_UNIT_PERCENT)
     return gettext (gimp_unit_percent.plural);
 
-  return gettext (_gimp_unit_get_user_unit (gimp, unit)->plural);
+  return _gimp_unit_get_user_unit (gimp, unit)->plural;
 }