Merge from trunk

(bzr r9508.1.73)

1 files changed, 9 insertions, 9 deletions

diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index d00dc11db..0a05228d2 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -61,22 +61,22 @@ LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) :
     pattern(_("Pattern source:"), _("Path to put along the skeleton path"), "pattern", &wr, this, "M0,0 L1,0"),
     copytype(_("Pattern copies:"), _("How many pattern copies to place along the skeleton path"),
         "copytype", PAPCopyTypeConverter, &wr, this, PAPCT_SINGLE_STRETCHED),
-    prop_scale(_("Width:"), _("Width of the pattern"), "prop_scale", &wr, this, 1),
-    scale_y_rel(_("Width in units of length"),
+    prop_scale(_("_Width:"), _("Width of the pattern"), "prop_scale", &wr, this, 1),
+    scale_y_rel(_("Wid_th in units of length"),
         _("Scale the width of the pattern in units of its length"),
         "scale_y_rel", &wr, this, false),
-    spacing(_("Spacing:"),
+    spacing(_("Spa_cing:"),
         // xgettext:no-c-format
         _("Space between copies of the pattern. Negative values allowed, but are limited to -90% of pattern width."),
         "spacing", &wr, this, 0),
-    normal_offset(_("Normal offset:"), "", "normal_offset", &wr, this, 0),
-    tang_offset(_("Tangential offset:"), "", "tang_offset", &wr, this, 0),
-    prop_units(_("Offsets in unit of pattern size"),
+    normal_offset(_("No_rmal offset:"), "", "normal_offset", &wr, this, 0),
+    tang_offset(_("Tan_gential offset:"), "", "tang_offset", &wr, this, 0),
+    prop_units(_("Offsets in _unit of pattern size"),
         _("Spacing, tangential and normal offset are expressed as a ratio of width/height"),
         "prop_units", &wr, this, false),
-    vertical_pattern(_("Pattern is vertical"), _("Rotate pattern 90 deg before applying"),
+    vertical_pattern(_("Pattern is _vertical"), _("Rotate pattern 90 deg before applying"),
         "vertical_pattern", &wr, this, false),
-    fuse_tolerance(_("Fuse nearby ends:"), _("Fuse ends closer than this number. 0 means don't fuse."),
+    fuse_tolerance(_("_Fuse nearby ends:"), _("Fuse ends closer than this number. 0 means don't fuse."),
         "fuse_tolerance", &wr, this, 0)
 {
     registerParameter( dynamic_cast<Parameter *>(&pattern) );
@@ -230,7 +230,7 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
 }
 
 void
-LPEPatternAlongPath::transform_multiply(Geom::Matrix const& postmul, bool set)
+LPEPatternAlongPath::transform_multiply(Geom::Affine const& postmul, bool set)
 {
     // overriding the Effect class default method, disabling transform forwarding to the parameters.