fix common typos

jef · jef · commit 56c7575d607f · 2010-04-26T07:19:50.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13391 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -54,7 +54,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
 
     # We give this target a long logical target name.
     # (This is to avoid having the library name clash with any already
-    # install library names. If that happens then cmake dependancy
+    # install library names. If that happens then cmake dependency
     # tracking get confused.)
     STRING(REPLACE "." "_" _logical_name ${MODULE_NAME})
     SET(_logical_name "python_module_${_logical_name}")
diff --git a/scripts/spelling.dat b/scripts/spelling.dat
@@ -443,6 +443,7 @@ statics:statistics
 useage:usage
 aribitary:arbitrary
 colour:color
+colours:colors
 recommeneded:recommended
 implementaed:implemented
 containging:containing
diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp
@@ -285,7 +285,7 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( void* band, QgsGeome
       pixelRectGeometry = QgsGeometry::fromRect( QgsRectangle( currentX - hCellSizeX, currentY - hCellSizeY, currentX + hCellSizeX, currentY + hCellSizeY ) );
       if ( pixelRectGeometry )
       {
-        //intersecton
+        //intersection
         intersectGeometry = pixelRectGeometry->intersection( poly );
         if ( intersectGeometry )
         {
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -169,8 +169,8 @@ void QgsSimpleMarkerSymbolLayerV2::prepareCache( QgsSymbolV2RenderContext& conte
   p.end();
 
   // Check that the selected version is different.  If not, then re-render,
-  // filling the background with the selection colour and using the normal
-  // colours for the symbol .. could be ugly!
+  // filling the background with the selection color and using the normal
+  // colors for the symbol .. could be ugly!
 
   if ( mSelCache == mCache )
   {
diff --git a/src/core/symbology-ng/qgssymbolv2.h b/src/core/symbology-ng/qgssymbolv2.h
@@ -137,8 +137,7 @@ class CORE_EXPORT QgsSymbolV2RenderContext
     //! @note added in 1.5
     void setRenderHints( int hints ) { mRenderHints = hints; }
 
-    // Colour used for selections
-
+    // Color used for selections
     static QColor selectionColor();
 
     double outputLineWidth( double width ) const;
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -953,7 +953,7 @@ void QgsGeorefPluginGui::loadGCPs( /*bool verbose*/ )
     {
       line = points.readLine();
       QStringList ls;
-      if ( line.contains( QRegExp( "," ) ) ) // in previous format "\t" is delemiter of points in new - ","
+      if ( line.contains( QRegExp( "," ) ) ) // in previous format "\t" is delimeter of points in new - ","
       {
         // points from new georeferencer
         ls = line.split( "," );
diff --git a/src/providers/grass/qgsgrassrasterprovider.cpp b/src/providers/grass/qgsgrassrasterprovider.cpp
@@ -109,7 +109,7 @@ QImage* QgsGrassRasterProvider::draw( QgsRectangle  const & viewExtent, int pixe
     QMessageBox::warning( 0, QObject::tr( "Warning" ), QObject::tr( "Cannot draw raster" ) + "\n"
                               + e.what() );
 
-    // We dont set mValid to false, because the raster can be recreated and work next time
+    // We don't set mValid to false, because the raster can be recreated and work next time
     return image;
   }
   QgsDebugMsg( QString("%1 bytes read from modules stdout").arg(data.size()) );

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( void* band, QgsGeome`
`285`	`285`	`pixelRectGeometry = QgsGeometry::fromRect( QgsRectangle( currentX - hCellSizeX, currentY - hCellSizeY, currentX + hCellSizeX, currentY + hCellSizeY ) );`
`286`	`286`	`if ( pixelRectGeometry )`
`287`	`287`	`{`
`288`		`- //intersecton`
	`288`	`+ //intersection`
`289`	`289`	`intersectGeometry = pixelRectGeometry->intersection( poly );`
`290`	`290`	`if ( intersectGeometry )`
`291`	`291`	`{`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ void QgsSimpleMarkerSymbolLayerV2::prepareCache( QgsSymbolV2RenderContext& conte`
`169`	`169`	`p.end();`
`170`	`170`
`171`	`171`	`// Check that the selected version is different. If not, then re-render,`
`172`		`- // filling the background with the selection colour and using the normal`
`173`		`- // colours for the symbol .. could be ugly!`
	`172`	`+ // filling the background with the selection color and using the normal`
	`173`	`+ // colors for the symbol .. could be ugly!`
`174`	`174`
`175`	`175`	`if ( mSelCache == mCache )`
`176`	`176`	`{`
Original file line number	Diff line number	Diff line change
`@@ -953,7 +953,7 @@ void QgsGeorefPluginGui::loadGCPs( /bool verbose/ )`
`953`	`953`	`{`
`954`	`954`	`line = points.readLine();`
`955`	`955`	`QStringList ls;`
`956`		`- if ( line.contains( QRegExp( "," ) ) ) // in previous format "\t" is delemiter of points in new - ","`
	`956`	`+ if ( line.contains( QRegExp( "," ) ) ) // in previous format "\t" is delimeter of points in new - ","`
`957`	`957`	`{`
`958`	`958`	`// points from new georeferencer`
`959`	`959`	`ls = line.split( "," );`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ QImage* QgsGrassRasterProvider::draw( QgsRectangle const & viewExtent, int pixe`
`109`	`109`	`QMessageBox::warning( 0, QObject::tr( "Warning" ), QObject::tr( "Cannot draw raster" ) + "\n"`
`110`	`110`	`+ e.what() );`
`111`	`111`
`112`		`- // We dont set mValid to false, because the raster can be recreated and work next time`
	`112`	`+ // We don't set mValid to false, because the raster can be recreated and work next time`
`113`	`113`	`return image;`
`114`	`114`	`}`
`115`	`115`	`QgsDebugMsg( QString("%1 bytes read from modules stdout").arg(data.size()) );`