Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h5 class="subsubsectionHead"><a


regions. The labeled output can be passed to the ColorMapping application to render regions with
contrasted colours. Please note that this mode loads the whole input image into memory, and as such can
contrasted colors. Please note that this mode loads the whole input image into memory, and as such can
not handle large images. <br
class="newline" /><br
class="newline" />To segment large data, one can use the vector mode. In this case, the output of the application is a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h5 class="subsubsectionHead"><a


regions. The labeled output can be passed to the ColorMapping application to render regions with
contrasted colours. Please note that this mode loads the whole input image into memory, and as such can
contrasted colors. Please note that this mode loads the whole input image into memory, and as such can
not handle large images. <br
class="newline" /><br
class="newline" />To segment large data, one can use the vector mode. In this case, the output of the application is a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h5 class="subsubsectionHead"><a


regions. The labeled output can be passed to the ColorMapping application to render regions with
contrasted colours. Please note that this mode loads the whole input image into memory, and as such can
contrasted colors. Please note that this mode loads the whole input image into memory, and as such can
not handle large images. <br
class="newline" /><br
class="newline" />To segment large data, one can use the vector mode. In this case, the output of the application is a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h5 class="subsubsectionHead"><a


regions. The labeled output can be passed to the ColorMapping application to render regions with
contrasted colours. Please note that this mode loads the whole input image into memory, and as such can
contrasted colors. Please note that this mode loads the whole input image into memory, and as such can
not handle large images. <br
class="newline" /><br
class="newline" />To segment large data, one can use the vector mode. In this case, the output of the application is a
Expand Down
4 changes: 2 additions & 2 deletions resources/cpt-city-qgis-min/cb/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>cb</dir>
<name>Colour schemes by Cynthia Brewer</name>
<name>Color schemes by Cynthia Brewer</name>
<full>
Colour schemes were designed by Cynthia Brewer,
Color schemes were designed by Cynthia Brewer,
Associate Professor of Geography at the Pennsylvania
State University.
</full>
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/cb/div/DESC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dir>div</dir>
<name>Diverging</name>
<full>
Diverging colour schemes designed by Cynthia Brewer
Diverging color schemes designed by Cynthia Brewer
</full>
<date>01/08/2012</date>
</description>
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/cb/qual/DESC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dir>qual</dir>
<name>Qualitative</name>
<full>
Qualitative colour schemes designed by Cynthia Brewer
Qualitative color schemes designed by Cynthia Brewer
</full>
<date>01/08/2012</date>
</description>
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/cb/seq/DESC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dir>seq</dir>
<name>Sequential</name>
<full>
Sequential colour schemes designed by Cynthia Brewer
Sequential color schemes designed by Cynthia Brewer
</full>
<date>01/08/2012</date>
</description>
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/dg/DESC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dir>dg</dir>
<name>Dave Green's cubehelix for astronomical intensity images</name>
<full>
Dave Green's cubhelix colour scheme which is intended
Dave Green's cubhelix color scheme which is intended
to be perceived as increasing in intensity.
</full>
<date>01/08/2012</date>
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/ds9/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>ds9</dir>
<name>DS9 colour scales for astronomical visualisation</name>
<name>DS9 color scales for astronomical visualisation</name>
<full>
The palettes used in the DS9 astronomical data
visualization tool.
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/go2/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>go2</dir>
<name>Two-colour glossy gradients from GoSquared</name>
<name>Two-color glossy gradients from GoSquared</name>
<full>
Gradients from GoSquared's liquidicity blog.
</full>
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/go2/webtwo/DESC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dir>webtwo</dir>
<name>Web 2.0 gradients</name>
<full>
Basic two-colour gradients for Web 2.0 in various levels of
Basic two-color gradients for Web 2.0 in various levels of
glossiness: plain (g0), subtle glossiness (g1) and
not-so-subtle (g2).
</full>
Expand Down
4 changes: 2 additions & 2 deletions resources/cpt-city-qgis-min/grass/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>grass</dir>
<name>GRASS colour ramps</name>
<name>GRASS color ramps</name>
<full>
The colour ramps distributed with the GRASS GIS.
The color ramps distributed with the GRASS GIS.
</full>
<date>01/08/2012</date>
</description>
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/h5/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<src>
<format>ASCII table</format>
<link href="http://ab-initio.mit.edu/wiki/index.php/H5utils">H5utils homepage</link>
<link href="http://ab-initio.mit.edu/wiki/index.php/Color_tables_in_h5topng">Colour tables page</link>
<link href="http://ab-initio.mit.edu/wiki/index.php/Color_tables_in_h5topng">Color tables page</link>
</src>
<distribute>
<qgis distribute="yes" license="otherok"/>
Expand Down
4 changes: 2 additions & 2 deletions resources/cpt-city-qgis-min/h5/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>h5</dir>
<name>Colour tables from the h5utils package</name>
<name>Color tables from the h5utils package</name>
<full>
The h5utils package by MIT's Steven G. Johnson is a set of
utilities for visualization and conversion of scientific data in
the free, portable HDF5 format. Included in the package are a set
of colour tables for the h5topng program.
of color tables for the h5topng program.
</full>
<date>01/08/2012</date>
</description>
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/jjg/cbac/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</text>
</license>
<src>
<format>GMT colour palette (cpt)</format>
<format>GMT color palette (cpt)</format>
<remark>
Derived from the diverging and sequential schemes by
Cynthia Brewer and so released under the same licence.
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/jjg/cbcont/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</text>
</license>
<src>
<format>GMT colour palette (cpt)</format>
<format>GMT color palette (cpt)</format>
<remark>
Derived from the diverging and sequential schemes by
Cynthia Brewer and so released under the same licence.
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/jjg/dem/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<year>2004</year>
</license>
<src>
<format>GMT colour palette (cpt)</format>
<format>GMT color palette (cpt)</format>
</src>
<distribute>
<qgis distribute="yes" license="otherok"/>
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/jjg/misc/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<year>2004</year>
</license>
<src>
<format>GMT colour palette (cpt)</format>
<format>GMT color palette (cpt)</format>
</src>
<distribute>
<qgis distribute="yes" license="otherok"/>
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/jjg/physics/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<year>2004</year>
</license>
<src>
<format>GMT colour palette (cpt)</format>
<format>GMT color palette (cpt)</format>
<remark>
See cpt file for details of production.
</remark>
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/jjg/polarity/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</text>
</license>
<src>
<format>GMT colour palette (cpt)</format>
<format>GMT color palette (cpt)</format>
<remark>
Derived from the diverging schemes by Cynthia Brewer
and so released under the same licence.
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/jjg/polarity/DESC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<full>
Diverging gradients which are continuous except at the
centre-point, for emphasis of the sign of the data. Here the
colour-stops are taken from the diverging schemes by Cynthia
color-stops are taken from the diverging schemes by Cynthia
Brewer.
</full>
<date>01/08/2012</date>
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/km/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>km</dir>
<name>Diverging colour-maps by Kenneth Moreland</name>
<name>Diverging color-maps by Kenneth Moreland</name>
<full>
The color map derived here is an all-around good performer: it
works well for low and high frequency data, orders the data, is
Expand Down
4 changes: 2 additions & 2 deletions resources/cpt-city-qgis-min/ncl/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>ncl</dir>
<name>Colour maps from NCL (NCAR command language)</name>
<name>Color maps from NCL (NCAR command language)</name>
<full>
The NCL (NCAR Command Language) is an open-source interpreted
language designed specifically for scientific data analysis and
visualisation. The source package includes a number of
colour-tables, translated into discrete (piecewise constant)
color-tables, translated into discrete (piecewise constant)
gradients.
</full>
<date>01/08/2012</date>
Expand Down
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/ngdc/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<text href="http://www.gnu.org/licenses/gpl-2.0.html"/>
</license>
<src>
<format>GMT colour palette (cpt)</format>
<format>GMT color palette (cpt)</format>
<link href="http://www.ngdc.noaa.gov/mgg/global/global.html">NGDC global relief data site</link>
<link href="http://www.africanmarineatlas.org/">African Marine Atlas</link>
<remark>
Expand Down
4 changes: 2 additions & 2 deletions resources/cpt-city-qgis-min/saga/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>saga</dir>
<name>SAGA preset colour tables</name>
<name>SAGA preset color tables</name>
<full>
SAGA, the system for automated geoscientific analyses, is a
sophisticated, portable and open source GUI-driven GIS which
includes a number of preset colour tables.
includes a number of preset color tables.
</full>
<date>01/08/2012</date>
</description>
6 changes: 6 additions & 0 deletions scripts/spelling.dat
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ propery:property
monocrome:monochrome
independant:independent
delemiter:delimiter
delimeter:delimiter
delemeter:delimiter
emited:emitted
charcter:character
compatable:compatible
seperated:separated
Expand Down Expand Up @@ -459,3 +462,6 @@ opps:oops
arount:around
acheive:achieve
specifed:specified
widht:width
heigth:height
heigh:height
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposerlegend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
double labelX = point.x() + qMax(( double ) symbolSize.width(), labelXOffset );

// Vertical alignment of label with symbol:
// a) label height < symbol heigh: label centerd with symbol
// a) label height < symbol height: label centerd with symbol
// b) label height > symbol height: label starts at top and runs under symbol

labelSize.rheight() = lines.count() * textHeight + ( lines.count() - 1 ) * mlineSpacing;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsdataitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class CORE_EXPORT QgsDataItem : public QObject
// remove and delete child item, signals to browser are emitted
virtual void deleteChildItem( QgsDataItem * child );

// remove child item but don't delete it, signals to browser are emited
// remove child item but don't delete it, signals to browser are emitted
// returns pointer to the removed item or null if no such item was found
virtual QgsDataItem * removeChildItem( QgsDataItem * child );

Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsvectorlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -1267,15 +1267,15 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
signals:

/**
* This signal is emited when selection was changed
* This signal is emitted when selection was changed
*
* @param selected Newly selected feature ids
* @param deselected Ids of all features which have previously been selected but are not any more
* @param clearAndSelect In case this is set to true, the old selection was dismissed and the new selection corresponds to selected
*/
void selectionChanged( const QgsFeatureIds selected, const QgsFeatureIds deselected, const bool clearAndSelect );

/** This signal is emited when selection was changed */
/** This signal is emitted when selection was changed */
void selectionChanged();

/** This signal is emitted when modifications has been done on layer */
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayercache.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class CORE_EXPORT QgsVectorLayerCache : public QObject
signals:

/**
* When filling the cache, this signal gets emited periodically to notify about the progress
* When filling the cache, this signal gets emitted periodically to notify about the progress
* and to be able to cancel an operation.
*
* @param i The number of already fetched features
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterdataprovider.h
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast

signals:
/** Emit a signal to notify of the progress event.
* Emited theProgress is in percents (0.0-100.0) */
* Emitted theProgress is in percents (0.0-100.0) */
void progress( int theType, double theProgress, QString theMessage );
void progressUpdate( int theProgress );

Expand Down
4 changes: 2 additions & 2 deletions src/core/symbology-ng/qgscptcityarchive.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ class CORE_EXPORT QgsCptCityDataItem : public QObject
// refresh - refresh populated item, emit signals to model
virtual void addChildItem( QgsCptCityDataItem * child, bool refresh = false );

// remove and delete child item, signals to browser are emited
// remove and delete child item, signals to browser are emitted
virtual void deleteChildItem( QgsCptCityDataItem * child );

// remove child item but don't delete it, signals to browser are emited
// remove child item but don't delete it, signals to browser are emitted
// returns pointer to the removed item or null if no such item was found
virtual QgsCptCityDataItem * removeChildItem( QgsCptCityDataItem * child );

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgisinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ class GUI_EXPORT QgisInterface : public QObject
virtual int messageTimeout() = 0;

signals:
/** Emited whenever current (selected) layer changes.
/** Emitted whenever current (selected) layer changes.
* The pointer to layer can be null if no layer is selected
*/
void currentLayerChanged( QgsMapLayer * layer );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsexpressionbuilderwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp
void setExpressionState( bool state );

signals:
/** Emited when the user changes the expression in the widget.
/** Emitted when the user changes the expression in the widget.
* Users of this widget should connect to this signal to decide if to let the user
* continue.
* @param isValid Is true if the expression the user has typed is valid.
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmaptoolidentify.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList<IdentifyResult> *results, Qg
else return false;
}

// We can only use context (extent, width, heigh) if layer is not reprojected,
// We can only use context (extent, width, height) if layer is not reprojected,
// otherwise we don't know source resolution (size).
if ( mCanvas->hasCrsTransformEnabled() && dprovider->crs() != mCanvas->mapRenderer()->destinationCrs() )
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class eVisDatabaseConnectionGui : public QDialog, private Ui::eVisDatabaseConnec
void on_pbtnRunQuery_clicked( );

signals:
/** \brief signal emited by the drawNewVectorLayer slot */
/** \brief signal emitted by the drawNewVectorLayer slot */
void drawVectorLayer( QString, QString, QString );
};

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/georeferencer/qgsgeorefplugingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,7 @@ void QgsGeorefPluginGui::loadGCPs( /*bool verbose*/ )
{
line = points.readLine();
QStringList ls;
if ( line.contains( QRegExp( "," ) ) ) // in previous format "\t" is delimeter of points in new - ","
if ( line.contains( QRegExp( "," ) ) ) // in previous format "\t" is delimiter of points in new - ","
{
// points from new georeferencer
ls = line.split( "," );
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qgsgrassbrowser.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class QgsGrassBrowser: public QMainWindow
void showContextMenu( const QPoint &position );

signals:
// emited when something in GRASS Tools changed region
// emitted when something in GRASS Tools changed region
void regionChanged();

private:
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/grass/qgsgrassmodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2710,7 +2710,7 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module,

connect( QgsMapLayerRegistry::instance(), SIGNAL( layersAdded( QList<QgsMapLayer *> ) ),
this, SLOT( updateQgisLayers() ) );
// layersWillBeRemoved is emited AFTER the layer was removed from registry
// layersWillBeRemoved is emitted AFTER the layer was removed from registry
connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ),
this, SLOT( updateQgisLayers() ) );

Expand Down Expand Up @@ -3348,7 +3348,7 @@ QgsGrassModuleGdalInput::QgsGrassModuleGdalInput(

connect( QgsMapLayerRegistry::instance(), SIGNAL( layersAdded( QList<QgsMapLayer *> ) ),
this, SLOT( updateQgisLayers() ) );
// layersWillBeRemoved is emited after the layer was removed from registry
// layersWillBeRemoved is emitted after the layer was removed from registry
connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ),
this, SLOT( updateQgisLayers() ) );

Expand Down
4 changes: 2 additions & 2 deletions tests/testdata/cpt-city/cb/DESC.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<description>
<dir>cb</dir>
<name>Colour schemes by Cynthia Brewer</name>
<name>Color schemes by Cynthia Brewer</name>
<full>
Colour schemes were designed by Cynthia Brewer,
Color schemes were designed by Cynthia Brewer,
Associate Professor of Geography at the Pennsylvania
State University.
</full>
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/cpt-city/cb/div/DESC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dir>div</dir>
<name>Diverging</name>
<full>
Diverging colour schemes designed by Cynthia Brewer
Diverging color schemes designed by Cynthia Brewer
</full>
<date>01/08/2012</date>
</description>
2 changes: 1 addition & 1 deletion tests/testdata/cpt-city/jjg/misc/COPYING.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<year>2004</year>
</license>
<src>
<format>GMT colour palette (cpt)</format>
<format>GMT color palette (cpt)</format>
</src>
</copying>
2 changes: 1 addition & 1 deletion tests/testdata/font/CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ and Information Physics, Faculty of Engineering, University of Tokyo

Young Ryu is the author of Txfonts, a set of mathematical symbols
designed to accompany text typeset in Times or its variants. In the
documentation, Young adresses the design of mathematical symbols: "The
documentation, Young addresses the design of mathematical symbols: "The
Adobe Times fonts are thicker than the CM fonts. Designing math fonts
for Times based on the rule thickness of Times = , , + , / , < ,
etc. would result in too thick math symbols, in my opinion. In the TX
Expand Down