From 8b1765e060725080931fc64ef68164c4a05be47f Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 27 Jun 2006 19:45:52 +0000 Subject: [PATCH] applied patch from Zbigniew Chyla that adds translation context to some 2006-06-27 Sven Neumann * app/core/gimpunit.c: applied patch from Zbigniew Chyla that adds translation context to some problematic strings (bug #345982). --- ChangeLog | 5 +++++ app/core/gimpunit.c | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d319e3c4c..49226b43c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-27 Sven Neumann + + * app/core/gimpunit.c: applied patch from Zbigniew Chyla that adds + translation context to some problematic strings (bug #345982). + 2006-06-27 Sven Neumann * app/core/gimpchannel-select.c diff --git a/app/core/gimpunit.c b/app/core/gimpunit.c index a63cad9768..a3b233c159 100644 --- a/app/core/gimpunit.c +++ b/app/core/gimpunit.c @@ -67,7 +67,7 @@ static const GimpUnitDef gimp_unit_defs[GIMP_UNIT_END] = */ static const GimpUnitDef gimp_unit_percent = { - FALSE, 0.0, 0, "percent", "%", "%", N_("percent"), N_("percent") + FALSE, 0.0, 0, "percent", "%", "%", N_("percent"), N_("plural|percent") }; @@ -231,13 +231,15 @@ _gimp_unit_get_singular (Gimp *gimp, { g_return_val_if_fail ((unit < (GIMP_UNIT_END + gimp->n_user_units)) || (unit == GIMP_UNIT_PERCENT), - gettext (gimp_unit_defs[GIMP_UNIT_INCH].singular)); + gimp_unit_defs[GIMP_UNIT_INCH].singular); if (unit < GIMP_UNIT_END) - return gettext (gimp_unit_defs[unit].singular); + return g_strip_context (gimp_unit_defs[unit].singular, + gettext (gimp_unit_defs[unit].singular)); if (unit == GIMP_UNIT_PERCENT) - return gettext (gimp_unit_percent.singular); + return g_strip_context (gimp_unit_percent.singular, + gettext (gimp_unit_percent.singular)); return _gimp_unit_get_user_unit (gimp, unit)->singular; } @@ -248,13 +250,15 @@ _gimp_unit_get_plural (Gimp *gimp, { g_return_val_if_fail ((unit < (GIMP_UNIT_END + gimp->n_user_units)) || (unit == GIMP_UNIT_PERCENT), - gettext (gimp_unit_defs[GIMP_UNIT_INCH].plural)); + gimp_unit_defs[GIMP_UNIT_INCH].plural); if (unit < GIMP_UNIT_END) - return gettext (gimp_unit_defs[unit].plural); + return g_strip_context (gimp_unit_defs[unit].plural, + gettext (gimp_unit_defs[unit].plural)); if (unit == GIMP_UNIT_PERCENT) - return gettext (gimp_unit_percent.plural); + return g_strip_context (gimp_unit_percent.plural, + gettext (gimp_unit_percent.plural)); return _gimp_unit_get_user_unit (gimp, unit)->plural; }