fix typos

jef-n · jef-n · commit 22af5bf5d42a · 2016-10-09T01:47:09.000+02:00
diff --git a/resources/context_help/HeatmapGui b/resources/context_help/HeatmapGui
@@ -26,7 +26,7 @@ clustering of points.</p>
 
 <h4>Rows and Columns</h4>
 <p>Used to change the dimensions of the output raster file. These values are also linked to the <b>Cell size X</b> and <b>Cell size Y</b> values. 
-Increasing the number of rows or colums will decrease the cell size and increase the file size of the output file. The values in Rows and Columns
+Increasing the number of rows or columns will decrease the cell size and increase the file size of the output file. The values in Rows and Columns
 are also linked, so doubling the number of rows will automatically double the number of columns and the cell sizes will also be halved. The geographical area of the output raster will remain the same!</p>
 
 <h4>Cell size X and Y</h4>
diff --git a/src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp b/src/app/gps/qwtpolar-0.1/qwt_polar_plot.cpp
@@ -186,7 +186,7 @@ const QwtTextLabel *QwtPolarPlot::titleLabel() const
 
   \param legend Legend
   \param pos The legend's position. For top/left position the number
-             of colums will be limited to 1, otherwise it will be set to
+             of columns will be limited to 1, otherwise it will be set to
              unlimited.
 
   \param ratio Ratio between legend and the bounding rect
diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp
@@ -167,7 +167,7 @@ const QwtTextLabel *QwtPolarPlot::titleLabel() const
 
   \param legend Legend
   \param pos The legend's position. For top/left position the number
-             of colums will be limited to 1, otherwise it will be set to
+             of columns will be limited to 1, otherwise it will be set to
              unlimited.
 
   \param ratio Ratio between legend and the bounding rect
diff --git a/src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp b/src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
@@ -171,7 +171,7 @@ const QwtTextLabel *QwtPolarPlot::titleLabel() const
 
   \param legend Legend
   \param pos The legend's position. For top/left position the number
-             of colums will be limited to 1, otherwise it will be set to
+             of columns will be limited to 1, otherwise it will be set to
              unlimited.
 
   \param ratio Ratio between legend and the bounding rect
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
@@ -697,7 +697,7 @@ struct DXFLIB_EXPORT DL_InsertData {
     double sz;
     /*! Rotation angle in degrees. */
     double angle;
-    /*! Number of colums if we insert an array of the block or 1. */
+    /*! Number of columns if we insert an array of the block or 1. */
     int cols;
     /*! Number of rows if we insert an array of the block or 1. */
     int rows;
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -600,7 +600,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle  const & theExtent,
   char *tmpBlock = ( char * )qgsMalloc( dataSize * tmpWidth * tmpHeight );
   if ( ! tmpBlock )
   {
-    QgsDebugMsg( QString( "Coudn't allocate temporary buffer of %1 bytes" ).arg( dataSize * tmpWidth * tmpHeight ) );
+    QgsDebugMsg( QString( "Couldn't allocate temporary buffer of %1 bytes" ).arg( dataSize * tmpWidth * tmpHeight ) );
     return;
   }
   GDALRasterBandH gdalBand = GDALGetRasterBand( mGdalDataset, theBandNo );

Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle const & theExtent,`
`600`	`600`	`char tmpBlock = ( char )qgsMalloc( dataSize * tmpWidth * tmpHeight );`
`601`	`601`	`if ( ! tmpBlock )`
`602`	`602`	`{`
`603`		`- QgsDebugMsg( QString( "Coudn't allocate temporary buffer of %1 bytes" ).arg( dataSize * tmpWidth * tmpHeight ) );`
	`603`	`+ QgsDebugMsg( QString( "Couldn't allocate temporary buffer of %1 bytes" ).arg( dataSize * tmpWidth * tmpHeight ) );`
`604`	`604`	`return;`
`605`	`605`	`}`
`606`	`606`	`GDALRasterBandH gdalBand = GDALGetRasterBand( mGdalDataset, theBandNo );`