translations from spanish to english done, it might need a little review, but everything seems ok

(bzr r11950.5.1)

5 files changed, 46 insertions, 44 deletions

diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index e5412fdc2..ad03cf75d 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -53,7 +53,7 @@ bool CurveDragPoint::grabbed(GdkEventMotion */*event*/)
 
         // delta is a vector equal 1/3 of distance from first to second
         Geom::Point delta = (second->position() - first->position()) / 3.0;
-        //spanish: solo actualizamos los nodos si no es bspline
+        // only update the nodes if the mode is bspline
         if(!_pm.isBSpline(false)){
             first->front()->move(first->front()->position() + delta);
             second->back()->move(second->back()->position() - delta);
@@ -89,7 +89,8 @@ void CurveDragPoint::dragged(Geom::Point &new_pos, GdkEventMotion *event)
     Geom::Point delta = new_pos - position();
     Geom::Point offset0 = ((1-weight)/(3*t*(1-t)*(1-t))) * delta;
     Geom::Point offset1 = (weight/(3*t*t*(1-t))) * delta;
-    //spanish: modificado para que, si el trazado es bspline solo actue si está presionada la tecla SHIFT
+
+    //modified so that, if the trace is bspline, it only acts if the SHIFT key is pressed
     if(!_pm.isBSpline(false)){
         first->front()->move(first->front()->position() + offset0);
         second->back()->move(second->back()->position() + offset1);
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index b7f3ac29b..68aaa77a5 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -671,9 +671,10 @@ bool MultiPathManipulator::event(Inkscape::UI::Tools::ToolBase *event_context, G
                 // b) ctrl+del preserves shape (del_preserves_shape is false), and control is pressed
                 // Hence xor
                 guint mode = prefs->getInt("/tools/freehand/pen/freehand-mode", 0);
-                //spanish: si es trazado bspline (mode 2)
+
+                //if the trace is bspline ( mode 2)
                 if(mode==2){
-                    //spanish: ¿correcto?
+                    //  is this correct ?
                     if(del_preserves_shape ^ held_control(event->key))
                         deleteNodes(false);
                     else
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 78d8fe833..73460a313 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -167,7 +167,7 @@ void Handle::move(Geom::Point const &new_pos)
         }
         setPosition(new_pos);
 
-        //spanish: mueve el tirador y su opuesto la misma proporción
+        //move the handler and its oposite the same proportion
         if(_pm().isBSpline(false)){
             setPosition(_pm().BSplineHandleReposition(this));
             this->other()->setPosition(_pm().BSplineHandleReposition(this->other(),_parent->bsplineWeight));
@@ -184,7 +184,7 @@ void Handle::move(Geom::Point const &new_pos)
             / Geom::L2sq(direction)) * direction;
         setRelativePos(new_delta);
 
-        //spanish: mueve el tirador y su opuesto la misma proporción
+        //move the handler and its oposite the same proportion
         if(_pm().isBSpline(false)){
             setPosition(_pm().BSplineHandleReposition(this));
             this->other()->setPosition(_pm().BSplineHandleReposition(this->other(),_parent->bsplineWeight));
@@ -210,7 +210,7 @@ void Handle::move(Geom::Point const &new_pos)
     }
     setPosition(new_pos);
 
-    //spanish: mueve el tirador y su opuesto la misma proporción
+    // moves the handler and its oposite the same proportion
     if(_pm().isBSpline(false)){
         setPosition(_pm().BSplineHandleReposition(this));
         this->other()->setPosition(_pm().BSplineHandleReposition(this->other(),_parent->bsplineWeight));
@@ -292,7 +292,7 @@ bool Handle::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEven
             break;
         default: break;
         }
-    //spanish: nuevo evento de doble click para resetear a la proporción por defecto, 0.3334%, los tiradores de un nodo
+    // new double click event to set the handlers of a node to the default proportion, 0.3334% 
     case GDK_2BUTTON_PRESS:
         handle_2button_press();
         break;
@@ -303,7 +303,7 @@ bool Handle::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEven
     return ControlPoint::_eventHandler(event_context, event);
 }
 
-//spanish: función que mueve el tirador y su opuesto a la proporción por defecto de 0.3334
+//this function moves the handler and its oposite to the default proportion of 0.3334
 void Handle::handle_2button_press(){
     if(_pm().isBSpline(false)){
         setPosition(_pm().BSplineHandleReposition(this,0.3334));
@@ -359,8 +359,8 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
             ctrl_constraint = Inkscape::Snapper::SnapConstraint(parent_pos, parent_pos - perp_pos);
         }
         new_pos = result;
-        //spanish: mueve el tirador y su opuesto en X posiciones fijas depenfiendo de la configuración de el
-        //parametro "steps whith control" del efecto en vivo BSpline
+        // moves the handler and its oposite in X fixed positions depending on parameter "steps with control" 
+        // by default in live BSpline
         if(_pm().isBSpline(false)){
             setPosition(new_pos);
             int steps = _pm().BSplineGetSteps();
@@ -370,7 +370,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
     }
 
     std::vector<Inkscape::SnapCandidatePoint> unselected;
-    //spanish: si está activado el ajuste (snap) y no es bspline
+    //if the snap adjustment is activated and it is not bspline
     if (snap && !_pm().isBSpline(false)) {
         ControlPointSelection::Set &nodes = _parent->_selection.allPoints();
         for (ControlPointSelection::Set::iterator i = nodes.begin(); i != nodes.end(); ++i) {
@@ -411,8 +411,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event)
             other()->setPosition(_saved_other_pos);
         }
     }
-    //spanish: si es bspline pero no está presionado SHIFT o CONTROL
-    //lo fija en la posición original
+    //if it is bspline but SHIFT or CONTROL are not pressed it fixes it in the original position
     if(_pm().isBSpline(false) && !held_shift(*event) && !held_control(*event)){
         new_pos=_last_drag_origin();
     }
@@ -432,7 +431,7 @@ void Handle::ungrabbed(GdkEventButton *event)
         Geom::Point dist = _desktop->d2w(_parent->position()) - _desktop->d2w(position());
         if (dist.length() <= drag_tolerance) {
             move(_parent->position());
-            //spanish: marca la fuerza del bspline como 0.0000
+            //sets the bspline strength to 0.0000 
             if(_pm().isBSpline(false)){
                 _parent->bsplineWeight = 0.0000;
             }
@@ -478,9 +477,9 @@ static double snap_increment_degrees() {
 Glib::ustring Handle::_getTip(unsigned state) const
 {
     char const *more;
-    //spanish: un truco para, si el nodo tiene fuerza, nos marca que es
-    //del tipo bspline, lo utilizaremos despues para mostras los mensajes apropiados
-    //no lo podemos hacer de otra forma al ser constante la funcion
+    // a trick to mark as bspline if the node has no strength, we are going to use it later
+    // to show the appropiate messages. We cannot do it in any different way becasue the function is constant
+
     bool isBSpline = false;
     if( _parent->bsplineWeight != 0.0000)
         isBSpline = true;
@@ -622,8 +621,8 @@ void Node::move(Geom::Point const &new_pos)
     // move handles when the node moves.
     Geom::Point old_pos = position();
     Geom::Point delta = new_pos - position();
-    //spanish: guardamos la fuerza anterior del nodo para reaplicarsela
-    //de nuevo una vez sea movido el nodo
+
+    // save the previous node strength to apply it again once the node is moved 
     double oldPos = 0.0000;
     Node *n = this;
     if(_pm().isBSpline(false)){
@@ -638,8 +637,8 @@ void Node::move(Geom::Point const &new_pos)
     // if the node has a smooth handle after a line segment, it should be kept colinear
     // with the segment
     _fixNeighbors(old_pos, new_pos);
-    //spanish: movemos los tiradores involucrados, primero los del nodo en cuestión
-    //y despues los de los nodos colindantes
+
+    // move the affected handlers. First the node ones, later the adjoining ones.
     if(_pm().isBSpline(false)){
         _front.setPosition(_pm().BSplineHandleReposition(this->front(),oldPos));
         _back.setPosition(_pm().BSplineHandleReposition(this->back(),oldPos));
@@ -649,8 +648,7 @@ void Node::move(Geom::Point const &new_pos)
 
 void Node::transform(Geom::Affine const &m)
 {
-    //spanish: guardamos la fuerza anterior del nodo para reaplicarsela
-    //de nuevo una vez sea movido el nodo
+    // save the previous node strength to apply it again later when the node is moved 
     double oldPos = 0.0000;
     if(_pm().isBSpline(false)){
         oldPos = this->bsplineWeight;
@@ -663,8 +661,8 @@ void Node::transform(Geom::Affine const &m)
     /* Affine transforms keep handle invariants for smooth and symmetric nodes,
      * but smooth nodes at ends of linear segments and auto nodes need special treatment */
     _fixNeighbors(old_pos, position());
-    //spanish: movemos los tiradores involucrados, primero los del nodo en cuestión
-    //y despues los de los nodos colindantes
+
+    // move the involved handlers, first the node ones, later the adjoining ones 
     if(_pm().isBSpline(false)){
         _front.setPosition(_pm().BSplineHandleReposition(this->front(),oldPos));
         _back.setPosition(_pm().BSplineHandleReposition(this->back(),oldPos));
@@ -755,9 +753,11 @@ void Node::showHandles(bool v)
     if (!_back.isDegenerate()) {
         _back.setVisible(v);
     }
-    //spanish: definimos la fuerza de los nodos,según sea o no trazado bspline.
-    //Cada vez que actuemos sobre dichos tiradores en un trazado
-    //bspline esta fuerza se tiene que actualizar
+
+    // define the node strength, depending on being or not bspline traced.
+    // every time we operate over these handlers in a trace bspline
+    // that strength needs to be updated.
+
     this->bsplineWeight = 0.0000;
     if(_pm().isBSpline(false) && (!_front.isDegenerate() || !_back.isDegenerate())){
         if (!_front.isDegenerate()) {
@@ -868,9 +868,8 @@ void Node::setType(NodeType type, bool update_handles)
             break;
         default: break;
         }
-        //spanish: en los cambios de tipo de nodo, sobre trazados bspline, 
-        //o bien los mantenemos con potencia 0.0000 en modo esquina
-        //o les damos la potencia por defecto en modo de curva
+        /* in node type changes, about bspline traces, we can mantain them with 0.0000 power in border mode,
+           or we give them the default power in curve mode */
         if(_pm().isBSpline(false)){
             if(this->bsplineWeight !=0.0000) this->bsplineWeight = 0.3334;
             _front.setPosition(_pm().BSplineHandleReposition(this->front(),this->bsplineWeight));
@@ -1123,7 +1122,7 @@ void Node::_setState(State state)
         case STATE_CLICKED:
             mgr.setActive(_canvas_item, true);
             mgr.setPrelight(_canvas_item, false);
-            //spanish: esto muestra los tiradores al seleccionar los nodos
+            //this shows the handlers when selecting the nodes
             if(_pm().isBSpline(false)){
                 if(!this->back()->isDegenerate()){
                     _pm().BSplineHandlePosition(this->back());
@@ -1389,9 +1388,10 @@ Node *Node::nodeAwayFrom(Handle *h)
 
 Glib::ustring Node::_getTip(unsigned state) const
 {
-    //spanish: un truco par, si el nodo tiene fuerza, nos marca que es
-    //del tipo bspline, lo utilizaremos despues para mostras los mensajes apropiados
-    //no lo podemos hacer de otra forma al ser constante la funcion
+
+    /* if the node doesnt have strength, it marks it as bspline, we'll use it later
+       to show the appropiate messages. We cannot do it in any other way, because the
+       function is constant */
     bool isBSpline = false;
     if( this->bsplineWeight != 0.0000)
         isBSpline = true;
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index b7d6951d0..4393446d9 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -187,7 +187,7 @@ public:
     bool isEndNode() const;
     Handle *front() { return &_front; }
     Handle *back()  { return &_back;  }
-    //spanish: creamos valor de potencia bspline asociado a cada nodo
+    //strength value for each node
     double bsplineWeight;
 
     /**
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index a6689d93d..1cc075603 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -663,7 +663,7 @@ unsigned PathManipulator::_deleteStretch(NodeList::iterator start, NodeList::ite
         nl.erase(start);
         start = next;
     }
-    //spanish: si se borra, reajustamos los tiradores
+    // if we are removing, we readjust the handlers
     if(isBSpline(false)){
         double pos = 0.0000;
         if(start.prev()){
@@ -1182,7 +1182,7 @@ void PathManipulator::_createControlPointsFromGeometry()
     }
 }
 
-//spanish: determina si el trazado tiene efecto bspline y el numero de pasos que realiza
+//determines if the trace has a bspline effect and the number of steps that it takes
 int PathManipulator::BSplineGetSteps(){
 
     LivePathEffect::LPEBSpline *lpe_bsp = NULL;
@@ -1200,7 +1200,7 @@ int PathManipulator::BSplineGetSteps(){
     return steps;
 }
 
-//spanish: determina si el trazado tiene efecto bspline
+// determines if the trace has bspline effect
 bool PathManipulator::isBSpline(bool recalculate){
     static int BSplineSteps = this->BSplineGetSteps();
     if(recalculate){
@@ -1213,7 +1213,7 @@ bool PathManipulator::isBSpline(bool recalculate){
     return isBSpline;
 }
 
-//spanish: devuelve la fuerza que le corresponderia a la posicón de un tirador
+// returns the corresponding strength to the position of a handler
 double PathManipulator::BSplineHandlePosition(Handle *h){
     using Geom::X;
     using Geom::Y;
@@ -1231,13 +1231,13 @@ double PathManipulator::BSplineHandlePosition(Handle *h){
     return pos;
 }
 
-//spanish: mueve el tirador a la posición que le corresponda
+// moves the handler to the corresponding position
 Geom::Point PathManipulator::BSplineHandleReposition(Handle *h){
     double pos = this->BSplineHandlePosition(h);
     return BSplineHandleReposition(h,pos);
 }
 
-//spanish: mueve el tirador a una posición específica
+// moves the handler to the specified position
 Geom::Point PathManipulator::BSplineHandleReposition(Handle *h,double pos){
     using Geom::X;
     using Geom::Y;
@@ -1263,7 +1263,7 @@ Geom::Point PathManipulator::BSplineHandleReposition(Handle *h,double pos){
     return ret;
 }
 
-//spanish: mueve los tiradores del nodo y sus tiradores opuestos a la potencia de sus nodos
+//moves the node handlers and its oposite handlers to the strength of its nodes  
 void PathManipulator::BSplineNodeHandlesReposition(Node *n){
     Node * nextNode = n->nodeToward(n->front());
     Node * prevNode = n->nodeToward(n->back());