Merge branch 'luzpaz/inkscape-typos' (!119)

16 files changed, 26 insertions, 26 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 5674e29dc..f4aad4f53 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -835,13 +835,13 @@ Effect::defaultParamSet()
             bool valid = prefs->getEntry(pref_path).isValid();
             const gchar * set_or_upd;
             Glib::ustring def = Glib::ustring(_("<b>Default value:</b> ")) + Glib::ustring(param->param_getDefaultSVGValue()) + Glib::ustring("\n");
-            Glib::ustring ove = Glib::ustring(_("<b>Default value overrided:</b> ")) + Glib::ustring(prefs->getString(pref_path)) + Glib::ustring("\n");
+            Glib::ustring ove = Glib::ustring(_("<b>Default value overridden:</b> ")) + Glib::ustring(prefs->getString(pref_path)) + Glib::ustring("\n");
             if (valid) {
                 set_or_upd = _("Update");
                 def = Glib::ustring(_("<b>Default value:</b> <s>")) + Glib::ustring(param->param_getDefaultSVGValue()) + Glib::ustring("</s>\n");
             } else {
                 set_or_upd = _("Set");
-                ove = Glib::ustring(_("<b>Default value overrided:</b> None\n"));
+                ove = Glib::ustring(_("<b>Default value overridden:</b> None\n"));
             }
             Glib::ustring cur = Glib::ustring(_("<b>Current parameter value:</b> ")) + Glib::ustring(param->param_getSVGValue());
             Gtk::HBox * vbox_param = Gtk::manage( new Gtk::HBox(true) );
@@ -892,7 +892,7 @@ Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, gchar *
     set->set_label((Glib::ustring)label);
     unset->set_sensitive(true);
     Glib::ustring def = Glib::ustring(_("<b>Default value:</b> <s>")) + Glib::ustring(defvalue) + Glib::ustring("</s>\n");
-    Glib::ustring ove = Glib::ustring(_("<b>Default value overrided:</b> ")) + Glib::ustring(value) + Glib::ustring("\n");
+    Glib::ustring ove = Glib::ustring(_("<b>Default value overridden:</b> ")) + Glib::ustring(value) + Glib::ustring("\n");
     Glib::ustring cur = Glib::ustring(_("<b>Current parameter value:</b> ")) + Glib::ustring(value);
     parameter_label->set_tooltip_markup((tooltip + def + ove + cur).c_str());
 }
@@ -906,7 +906,7 @@ Effect::unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, gchar
     set->set_label((Glib::ustring)label);
     unset->set_sensitive(false);
     Glib::ustring def = Glib::ustring(_("<b>Default value:</b> ")) + Glib::ustring(defvalue) + Glib::ustring("\n");
-    Glib::ustring ove = Glib::ustring(_("<b>Default value overrided:</b> None\n"));
+    Glib::ustring ove = Glib::ustring(_("<b>Default value overridden:</b> None\n"));
     Glib::ustring cur = Glib::ustring(_("<b>Current parameter value:</b> ")) + Glib::ustring(value);
     parameter_label->set_tooltip_markup((tooltip + def + ove + cur).c_str());
 }
diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp
index 2930414b3..6299b282b 100644
--- a/src/live_effects/lpe-bool.cpp
+++ b/src/live_effects/lpe-bool.cpp
@@ -121,7 +121,7 @@ sp_pathvector_boolop_slice_intersect(Geom::PathVector const &pathva, Geom::PathV
     // (i) filter the descr_cmd of the result path with this bool vector
     //
     // The main inefficieny here is step (e) because I use a winding function of the area-shape which goes
-    // through teh complete edge list for each point I ask for, so effort is n-edges-contour * n-edges-area.
+    // through the complete edge list for each point I ask for, so effort is n-edges-contour * n-edges-area.
     // It is tricky to improve this without building into the livarot code.
     // One way might be to decide at the intersection points which edges touching the intersection points are
     // in by making a loop through all edges on the intersection vertex. Since this is a directed non intersecting
diff --git a/src/live_effects/lpe-dynastroke.cpp b/src/live_effects/lpe-dynastroke.cpp
index 33e754a8a..d0655d9bd 100644
--- a/src/live_effects/lpe-dynastroke.cpp
+++ b/src/live_effects/lpe-dynastroke.cpp
@@ -22,7 +22,7 @@
 namespace Inkscape {
 namespace LivePathEffect {
 //TODO: growfor/fadefor can be expressed in unit of width.
-//TODO: make round/sharp end choices independant for start and end.
+//TODO: make round/sharp end choices independent for start and end.
 //TODO: define more styles like in calligtool.
 //TODO: allow fancy ends.
 
@@ -166,7 +166,7 @@ LPEDynastroke::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & p
                  //  General  formula:  n1 = w*u with ||u||=1 and u.v = -dw/dt            
                  Piecewise<SBasis> dw = derivative(w);
                  Piecewise<SBasis> ncomp = sqrt(dot(v,v)-dw*dw,.1,3);
-                 //FIXME: is force continuity usefull? compatible with corners?
+                 //FIXME: is force continuity useful? compatible with corners?
 //                 std::cout<<"ici\n";
                  n1 = -dw*v + ncomp*rot90(v);
                  n1 = w*force_continuity(unitVector(n1),.1);
diff --git a/src/live_effects/lpe-embrodery-stitch-ordering.h b/src/live_effects/lpe-embrodery-stitch-ordering.h
index b2b5d36db..c307ec555 100644
--- a/src/live_effects/lpe-embrodery-stitch-ordering.h
+++ b/src/live_effects/lpe-embrodery-stitch-ordering.h
@@ -195,7 +195,7 @@ struct OrderingGroupConnection {
         Connect(1, toIn);
     }
 
-    // Connect one of the conection endpoints to the given point
+    // Connect one of the connection endpoints to the given point
     void Connect(int index, OrderingGroupPoint *point)
     {
         assert(point);
diff --git a/src/live_effects/lpe-embrodery-stitch.cpp b/src/live_effects/lpe-embrodery-stitch.cpp
index f2342032b..282419fd8 100644
--- a/src/live_effects/lpe-embrodery-stitch.cpp
+++ b/src/live_effects/lpe-embrodery-stitch.cpp
@@ -345,7 +345,7 @@ PathVector LPEEmbroderyStitch::doEffect_path(PathVector const &path_in)
                     Piecewise<D2<SBasis> > pwOneEqdist = arc_length_parametrization(pwOne);
                     Interval pwdomain = pwOneEqdist.domain();
 
-                    // Compute the points of teh shortened piece
+                    // Compute the points of the shortened piece
                     Coord len = pwdomain.max() - pwdomain.min();
                     Coord offs = 0.5 * (show_stitch_gap < 0.5 * len ? show_stitch_gap : 0.5 * len);
                     Point p1 = pwOneEqdist.valueAt(pwdomain.min() + offs);
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp
index 8528ab14d..688841617 100644
--- a/src/live_effects/lpe-envelope.cpp
+++ b/src/live_effects/lpe-envelope.cpp
@@ -205,7 +205,7 @@ LPEEnvelope::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd
         output /= 2.;
 
         return output;
-        /*Of course, the result is not perfect, but on a graphical point of view, this is sufficent.*/
+        /*Of course, the result is not perfect, but on a graphical point of view, this is sufficient.*/
 
     }
 
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 2b052ace1..fb78c2065 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -131,7 +131,7 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem)
             }
             //we add the last satellite on open path because _pathvector_satellites is related to nodes, not curves
             //so maybe in the future we can need this last satellite in other effects
-            //dont remove for this effect because _pathvector_satellites class has methods when the path is modiffied
+            //don't remove for this effect because _pathvector_satellites class has methods when the path is modiffied
             //and we want one method for all uses
             if (!path_it->closed()) {
                 Satellite satellite(satellite_type);
@@ -323,7 +323,7 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
         //mandatory call
         satellites_param.setEffectType(effectType());
         Geom::PathVector const pathv = pathv_to_linear_and_cubic_beziers(sp_curve->get_pathvector());
-        //if are diferent sizes call to recalculate
+        //if are different sizes call to recalculate
         //TODO: Update the satellite data in paths modified,
         Satellites satellites = satellites_param.data();
         if (satellites.empty()) {
@@ -468,7 +468,7 @@ LPEFilletChamfer::doEffect_path(Geom::PathVector const &path_in)
             Satellite satellite = satellites[path][next_index];
             if (Geom::are_near((*curve_it1).initialPoint(), (*curve_it1).finalPoint())) {
                 _degenerate_hide = true;
-                g_warning("Knots hidded if consecutive nodes has the same position.");
+                g_warning("Knots hidden if consecutive nodes has the same position.");
                 return path_in;
             }
             if (!curve) { //curve == 0 
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index 22c548c1d..b21181ffc 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -520,7 +520,7 @@ collectPathsAndWidths (SPLPEItem const *lpeitem, Geom::PathVector &paths, std::v
             Geom::PathVector subpaths = pathv_to_linear_and_cubic_beziers(c->get_pathvector());
             for (unsigned i=0; i<subpaths.size(); i++){
                 paths.push_back(subpaths[i]);
-                //FIXME: do we have to be more carefull when trying to access stroke width?
+                //FIXME: do we have to be more careful when trying to access stroke width?
                 stroke_widths.push_back(lpeitem->style->stroke_width.computed);
             }
         }
diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index e827491c0..e8642d4e7 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -103,7 +103,7 @@ Geom::Piecewise<Geom::D2<Geom::SBasis> >
 LPELattice2::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in)
 {
     PathVector pathv = path_from_piecewise(pwd2_in,0.001);
-    //this is because strange problems whith sb2 and LineSegment
+    //this is because strange problems with sb2 and LineSegment
     PathVector cubic = pathv_to_cubicbezier(pathv);
     Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in_linear_and_cubic = paths_to_pw(cubic);
     D2<SBasis2d> sb2;
diff --git a/src/live_effects/lpe-ruler.cpp b/src/live_effects/lpe-ruler.cpp
index 7ba5a7913..7726af176 100644
--- a/src/live_effects/lpe-ruler.cpp
+++ b/src/live_effects/lpe-ruler.cpp
@@ -171,7 +171,7 @@ LPERuler::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_i
     if (border_marks == BORDERMARK_END || border_marks == BORDERMARK_BOTH){
         Point A = pwd2_in.lastValue();
         Point n = rot90(unit_vector(speed.lastValue()))*sign;
-        //speed.lastValue() is somtimes wrong when the path is closed: a tiny line seg might added at the end to fix rounding errors...
+        //speed.lastValue() is sometimes wrong when the path is closed: a tiny line seg might added at the end to fix rounding errors...
         //TODO: Find a better fix!! (How do we know if the path was closed?)
         if ( A == pwd2_in.firstValue() &&
              speed.segs.size() > 1 &&
diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp
index e3376b7e5..dfb860de8 100644
--- a/src/live_effects/lpe-sketch.cpp
+++ b/src/live_effects/lpe-sketch.cpp
@@ -107,7 +107,7 @@ LPESketch::LPESketch(LivePathEffectObject *lpeobject) :
     tgtlength_rdm.param_set_range(0, 1.);
     tgt_places_rdmness.param_set_range(0, 1.);
     //this is not very smart, but required to avoid having lot of tangents stacked on short components.
-    //Nota: we could specify a density instead of an absolute number, but this would be scale dependant.
+    //Note: we could specify a density instead of an absolute number, but this would be scale dependent.
     concatenate_before_pwd2 = true;
 #endif
 }
diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp
index b9fd8908a..f04c243f6 100644
--- a/src/live_effects/lpe-vonkoch.cpp
+++ b/src/live_effects/lpe-vonkoch.cpp
@@ -169,7 +169,7 @@ LPEVonKoch::doEffect_path (Geom::PathVector const & path_in)
 }
 
 
-//Usefull?? 
+//Useful?? 
 //void 
 //LPEVonKoch::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec)
 /*{
diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h
index bffbebd54..c0cb7ce42 100644
--- a/src/live_effects/lpe-vonkoch.h
+++ b/src/live_effects/lpe-vonkoch.h
@@ -55,7 +55,7 @@ public:
 
     virtual void doBeforeEffect(SPLPEItem const* item);
 
-    //Usefull??
+    //Useful??
     //    protected: 
     //virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); 
 
diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h
index 374e715ec..baee35614 100644
--- a/src/live_effects/lpeobject-reference.h
+++ b/src/live_effects/lpeobject-reference.h
@@ -32,7 +32,7 @@ public:
 
     SPObject       *owner;
 
-    // concerning the LPEObject that is refered to:
+    // concerning the LPEObject that is referred to:
     char                 *lpeobject_href;
     Inkscape::XML::Node  *lpeobject_repr;
     LivePathEffectObject *lpeobject;
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index bd6608737..f89fad3ee 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -343,7 +343,7 @@ PathParam::set_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & newpa
  *
  * If write_to_svg = true :
  *          The new path data is written to SVG. In this case the signal_path_changed signal
- *          is not directly emited in this method, because writing to SVG
+ *          is not directly emitted in this method, because writing to SVG
  *          triggers the LPEObject to which this belongs to call Effect::setParameter which calls
  *          PathParam::readSVGValue, which finally emits the signal_path_changed signal.
  * If write_to_svg = false :
diff --git a/src/live_effects/parameter/satellitesarray.h b/src/live_effects/parameter/satellitesarray.h
index 5ae372ac2..3039eb432 100644
--- a/src/live_effects/parameter/satellitesarray.h
+++ b/src/live_effects/parameter/satellitesarray.h
@@ -5,14 +5,14 @@
  * Inkscape::LivePathEffectParameters
  * Copyright (C) Jabiertxo Arraiza Cenoz <jabier.arraiza@marker.es>
  * Special thanks to Johan Engelen for the base of the effect -powerstroke-
- * Also to ScislaC for point me to the idea
- * Also su_v for his construvtive feedback and time
+ * Also to ScislaC for pointing me to the idea
+ * Also su_v for his constructive feedback and time
  * To Nathan Hurst for his review and help on refactor
- * and finaly to Liam P. White for his big help on coding, that save me a lot of
- * hours
+ * and finally to Liam P. White for his big help on coding, 
+ * that saved me a lot of hours
  *
  *
- * This parameter act as bridge from pathVectorSatellites class to serialize it as a LPE
+ * This parameter acts as a bridge from pathVectorSatellites class to serialize it as a LPE
  * parameter
  *
  * Released under GNU GPL, read the file 'COPYING' for more information