From 95687a281a5c0b3aa60bf1cc33bad1140dbdcb91 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 13 Jun 2014 09:04:44 +0200
Subject: [PATCH] fix typos

---
 .../algs/qgis/help/countuniquepointsinpolygon.rst           | 6 +++---
 python/plugins/processing/gui/AlgorithmClassification.py    | 2 +-
 python/plugins/processing/gui/HelpEditionDialog.py          | 2 +-
 src/app/qgsmeasuretool.cpp                                  | 2 +-
 src/core/composer/qgscomposershape.cpp                      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/python/plugins/processing/algs/qgis/help/countuniquepointsinpolygon.rst b/python/plugins/processing/algs/qgis/help/countuniquepointsinpolygon.rst
index b026c027ff8..d2e76063fa4 100644
--- a/python/plugins/processing/algs/qgis/help/countuniquepointsinpolygon.rst
+++ b/python/plugins/processing/algs/qgis/help/countuniquepointsinpolygon.rst
@@ -3,7 +3,7 @@ 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
@@ -11,8 +11,8 @@ 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
index 7398f94c51e..71700b08219 100644
--- a/python/plugins/processing/gui/AlgorithmClassification.py
+++ b/python/plugins/processing/gui/AlgorithmClassification.py
@@ -51,7 +51,7 @@ class AlgorithmDecorator:
 
     @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
index 04281a2ea01..7fc80c1f408 100644
--- a/python/plugins/processing/gui/HelpEditionDialog.py
+++ b/python/plugins/processing/gui/HelpEditionDialog.py
@@ -57,7 +57,7 @@ class HelpEditionDialog(QDialog, Ui_DlgHelpEdition):
                         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
index 842dfe68f79..2616951ec7a 100644
--- 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
index dc6bb5a2dd0..5a103d51d62 100644
--- 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 )
     {