summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-12-30 18:15:25 +0000
committerjabiertxof <info@marker.es>2016-12-30 18:15:25 +0000
commit44997a717a6b824ab70b2402a218347e99eda247 (patch)
tree3ca09b1036e7a72c439853d35abe4b81b7ec5224 /src
parentFixing clips and masks (diff)
parentcs.po: revert removed copyright header (diff)
downloadinkscape-44997a717a6b824ab70b2402a218347e99eda247.tar.gz
inkscape-44997a717a6b824ab70b2402a218347e99eda247.zip
Update to trunk
(bzr r15356.1.7)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-gears.cpp2
-rw-r--r--src/live_effects/lpe-measure-line.cpp2
-rw-r--r--src/widgets/mesh-toolbar.cpp1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/live_effects/lpe-gears.cpp b/src/live_effects/lpe-gears.cpp
index 17579c64e..dad520041 100644
--- a/src/live_effects/lpe-gears.cpp
+++ b/src/live_effects/lpe-gears.cpp
@@ -207,7 +207,7 @@ LPEGears::LPEGears(LivePathEffectObject *lpeobject) :
Effect(lpeobject),
teeth(_("_Teeth:"), _("The number of teeth"), "teeth", &wr, this, 10),
phi(_("_Phi:"), _("Tooth pressure angle (typically 20-25 deg). The ratio of teeth not in contact."), "phi", &wr, this, 5),
- min_radius(_("Min Radius:"), _("Minimun radius, low balues can slow"), "min_radius", &wr, this, 5.0)
+ min_radius(_("Min Radius:"), _("Minimum radius, low values can be slow"), "min_radius", &wr, this, 5.0)
{
/* Tooth pressure angle: The angle between the tooth profile and a perpendicular to the pitch
* circle, usually at the point where the pitch circle meets the tooth profile. Standard angles
diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp
index a317a8aa1..af2a8e919 100644
--- a/src/live_effects/lpe-measure-line.cpp
+++ b/src/live_effects/lpe-measure-line.cpp
@@ -52,7 +52,7 @@ LPEMeasureLine::LPEMeasureLine(LivePathEffectObject *lpeobject) :
orientation(_("Orientation"), _("Orientation method"), "orientation", OMConverter, &wr, this, OM_PARALLEL, false),
curve_linked(_("Curve on origin"), _("Curve on origin, set 0 to start/end"), "curve_linked", &wr, this, 1),
precision(_("Precision*"), _("Precision"), "precision", &wr, this, 2),
- position(_("Positon*"), _("Positon"), "position", &wr, this, 5),
+ position(_("Position*"), _("Position"), "position", &wr, this, 5),
text_top_bottom(_("Text top/bottom*"), _("Text top/bottom"), "text_top_bottom", &wr, this, 0),
text_right_left(_("Text right/left*"), _("Text right/left"), "text_right_left", &wr, this, 0),
helpline_distance(_("Helpline distance*"), _("Helpline distance"), "helpline_distance", &wr, this, 0.0),
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index b1cbb98b0..7a37376db 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -539,6 +539,7 @@ void sp_mesh_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, GObj
gtk_list_store_append( model, &iter );
gtk_list_store_set( model, &iter, 0, _("Bicubic"), 1, SP_MESH_TYPE_BICUBIC, -1 );
+ // TRANSLATORS: Type of Smoothing. See https://en.wikipedia.org/wiki/Coons_patch
EgeSelectOneAction* act = ege_select_one_action_new( "MeshSmoothAction", _("Coons"),
_("Coons: no smoothing. Bicubic: smoothing across patch boundaries."),
NULL, GTK_TREE_MODEL(model) );