fix typos

qgis · Jun 13, 2014 · 95687a2 · 95687a2
1 parent 3682384
commit 95687a2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/python/plugins/processing/algs/qgis/help/countuniquepointsinpolygon.rst b/python/plugins/processing/algs/qgis/help/countuniquepointsinpolygon.rst
@@ -3,16 +3,16 @@ COUNT UNIQUE POINTS IN POLYGON
 
 Description
 -----------
-This algorithm counts the number of unique values of a points layer in a polygons one. The algorithm creates a new polygons 
+This algorithm counts the number of unique values of a points layer in a polygons one. The algorithm creates a new polygons
 layer with an extra column in the attribute table containing the count of unique values for each feature.
 
 Parameters
 ----------
 
 - ``Polygons[Vector]``: polygons layer in input
 - ``Points[Vector]``: points layer in input
-- ``Class field[TableField]``: points layer column name of the unique value chosen 
-- ``Count field name[String]``: column name containging the count of unique values in the resulting polygons layer 
+- ``Class field[TableField]``: points layer column name of the unique value chosen
+- ``Count field name[String]``: column name containing the count of unique values in the resulting polygons layer
 
 Outputs
 -------

diff --git a/python/plugins/processing/gui/AlgorithmClassification.py b/python/plugins/processing/gui/AlgorithmClassification.py
@@ -51,7 +51,7 @@ def loadClassification():
 
     @staticmethod
     def classificationFile():
-        return os.path.join(os.path.join(os.path.dirname(__file__), 'algclasssification.txt'))
+        return os.path.join(os.path.dirname(__file__), 'algclasssification.txt')
 
     @staticmethod
     def getGroupsAndName(alg):

diff --git a/python/plugins/processing/gui/HelpEditionDialog.py b/python/plugins/processing/gui/HelpEditionDialog.py
@@ -57,7 +57,7 @@ def __init__(self, alg):
                         self.descriptions = json.load(f)
                 except Exception, e:
                     print e
-                    ProcessingLog.addToLog(ProcessingLog.LOG_WARNING, "Cannot open gelp file: " + helpfile)
+                    ProcessingLog.addToLog(ProcessingLog.LOG_WARNING, "Cannot open help file: " + helpfile)
 
         self.currentName = self.ALG_DESC
         if self.ALG_DESC in self.descriptions:

diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -160,7 +160,7 @@ void QgsMeasureTool::canvasReleaseEvent( QMouseEvent * e )
     mDialog->restart();
   }
 
-  if ( e->button() == Qt::RightButton ) // if we clicked the rigth button we stop measuring
+  if ( e->button() == Qt::RightButton ) // if we clicked the right button we stop measuring
   {
     mDone = true;
   }

diff --git a/src/core/composer/qgscomposershape.cpp b/src/core/composer/qgscomposershape.cpp
@@ -338,7 +338,7 @@ bool QgsComposerShape::readXML( const QDomElement& itemElem, const QDomDocument&
     properties.insert( "color_border", QgsSymbolLayerV2Utils::encodeColor( pen().color() ) );
     properties.insert( "width_border", QString::number( pen().widthF() ) );
 
-    //for pre 2.0 projects, shape colour and outline were specified in a different element...
+    //for pre 2.0 projects, shape color and outline were specified in a different element...
     QDomNodeList outlineColorList = itemElem.elementsByTagName( "OutlineColor" );
     if ( outlineColorList.size() > 0 )
     {