Try to fix translation of LPE names.

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index d13de7f9e9fea2d99c5a13ce0cdfd8b45b525c57..30a90d83406f6f3207ba3884fc6d86d41c346ef7 100644 (file)
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -37,14 +37,14 @@ namespace Inkscape {
 namespace LivePathEffect {\r
 \r
 const Util::EnumData<EffectType> LPETypeData[INVALID_LPE] = {\r
-    // {constant defined in effect.h, _("name of your effect"), "name of your effect in SVG"}\r
-    {SKELETAL_STROKES,      _("Path along path"),      "skeletal"},\r
+    // {constant defined in effect.h, N_("name of your effect"), "name of your effect in SVG"}\r
+    {SKELETAL_STROKES,      N_("Path along path"),      "skeletal"},\r
 #ifdef LPE_ENABLE_TEST_EFFECTS\r
-    {SLANT,                 _("Slant"),                 "slant"},\r
-    {DOEFFECTSTACK_TEST,    _("doEffect stack test"),   "doeffectstacktest"},\r
+    {SLANT,                 N_("Slant"),                 "slant"},\r
+    {DOEFFECTSTACK_TEST,    N_("doEffect stack test"),   "doeffectstacktest"},\r
 #endif\r
-    {GEARS,                 _("Gears"),                 "gears"},\r
-    {CURVE_STITCH,          _("Curve stitching"),       "curvestitching"},\r
+    {GEARS,                 N_("Gears"),                 "gears"},\r
+    {CURVE_STITCH,          N_("Curve stitching"),       "curvestitching"},\r
 };\r
 const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, INVALID_LPE);\r
 \r
@@ -101,7 +101,7 @@ Glib::ustring
 Effect::getName()\r
 {\r
     if (lpeobj->effecttype_set && lpeobj->effecttype < INVALID_LPE)\r
-        return Glib::ustring( LPETypeConverter.get_label(lpeobj->effecttype) );\r
+        return Glib::ustring( _(LPETypeConverter.get_label(lpeobj->effecttype).c_str()) );\r
     else\r
         return Glib::ustring( _("No effect") );\r
 }\r

diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h
index 22aa55dab3615d4a066a7a9f02a352b555db51ab..555069b4ac1067774bb36f1f59053d51dfe616e5 100644 (file)
--- a/src/ui/widget/combo-enums.h
+++ b/src/ui/widget/combo-enums.h
@@ -41,7 +41,7 @@ public:
             Gtk::TreeModel::Row row = *_model->append();
             const Util::EnumData<E>* data = &_converter.data(i);
             row[_columns.data] = data;
-            row[_columns.label] = _converter.get_label(data->id);
+            row[_columns.label] = _( _converter.get_label(data->id).c_str() );
         }
 
         set_active(0);