Skip to content

Commit

Permalink
spelling fixes (closes #32408)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Feb 28, 2020
1 parent 277b646 commit edee4a3
Show file tree
Hide file tree
Showing 38 changed files with 61 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .ci/travis/linux/script.sh
Expand Up @@ -32,7 +32,7 @@ docker run -t --name qgis_container \
docker commit qgis_container qgis_image
echo "travis_fold:end:docker_build_qgis"

# running QGIS tests in commited image
# running QGIS tests in committed image
echo "travis_fold:start:docker_test_qgis"
echo "${bold}Docker run tests${endbold}"
docker-compose -f ${TRAVIS_BUILD_DIR}/.ci/travis/linux/docker-compose.travis.yml run qgis-deps /root/QGIS/.ci/travis/linux/scripts/docker-qgis-test.sh
Expand Down
6 changes: 3 additions & 3 deletions NEWS
Expand Up @@ -67,8 +67,8 @@ This release has following new features:
- Expressions: List Referenced Layer Values
- Expressions: New functions to check if a geometry is empty or null
- Expressions: Hash expressions
- Digitising: Edit Invalid Attributes on Copy/Paste to Another Layer
- Digitising: Snapping cache parallelization
- Digitizing: Edit Invalid Attributes on Copy/Paste to Another Layer
- Digitizing: Snapping cache parallelization
- Data Management: DXF Export Improvements
- Forms and Widgets: Create geometric feature from the relation editor
- Forms and Widgets: Improve feature selection dialog
Expand Down Expand Up @@ -2181,7 +2181,7 @@ Added ifdef's for WIN32 around dynamic_casts in the vector renderer

2004-11-09 [timlinux] 0.5.0devel21
Added options to graticule builder to allow you to define origin and
enpoints and to set the graticule size at < 1 degree. Note that there is
endpoints and to set the graticule size at < 1 degree. Note that there is
little error checking in there still, so putting in dodgy numbers may cause
qgis to crash.

Expand Down
6 changes: 3 additions & 3 deletions doc/NEWS.html
Expand Up @@ -148,9 +148,9 @@ <h1>1. What's new in Version 3.12 'București'?</h1>
</li>
<li>Expressions: Hash expressions
</li>
<li>Digitising: Edit Invalid Attributes on Copy/Paste to Another Layer
<li>Digitizing: Edit Invalid Attributes on Copy/Paste to Another Layer
</li>
<li>Digitising: Snapping cache parallelization
<li>Digitizing: Snapping cache parallelization
</li>
<li>Data Management: DXF Export Improvements
</li>
Expand Down Expand Up @@ -3789,7 +3789,7 @@ <h1>36. 0.5</h1>
<p></p>
2004-11-09 [timlinux] 0.5.0devel21
Added options to graticule builder to allow you to define origin and
enpoints and to set the graticule size at &lt; 1 degree. Note that there is
endpoints and to set the graticule size at &lt; 1 degree. Note that there is
little error checking in there still, so putting in dodgy numbers may cause
qgis to crash.
<p></p>
Expand Down
6 changes: 3 additions & 3 deletions doc/NEWS.t2t
Expand Up @@ -53,8 +53,8 @@ This release has following new features:
- Expressions: List Referenced Layer Values
- Expressions: New functions to check if a geometry is empty or null
- Expressions: Hash expressions
- Digitising: Edit Invalid Attributes on Copy/Paste to Another Layer
- Digitising: Snapping cache parallelization
- Digitizing: Edit Invalid Attributes on Copy/Paste to Another Layer
- Digitizing: Snapping cache parallelization
- Data Management: DXF Export Improvements
- Forms and Widgets: Create geometric feature from the relation editor
- Forms and Widgets: Improve feature selection dialog
Expand Down Expand Up @@ -2124,7 +2124,7 @@ Added ifdef's for WIN32 around dynamic_casts in the vector renderer

2004-11-09 [timlinux] 0.5.0devel21
Added options to graticule builder to allow you to define origin and
enpoints and to set the graticule size at < 1 degree. Note that there is
endpoints and to set the graticule size at < 1 degree. Note that there is
little error checking in there still, so putting in dodgy numbers may cause
qgis to crash.

Expand Down
2 changes: 1 addition & 1 deletion ms-windows/osgeo4w/creatensis.pl
Expand Up @@ -549,7 +549,7 @@ =head1 SYNOPSIS
-verbose increase verbosity
-releasename=name name of release (defaults to CMakeLists.txt setting)
-keep don't start with a fresh unpacked directory
-signwith=cert.p12 optionall sign package with certificate (requires osslsigncode)
-signwith=cert.p12 optionally sign package with certificate (requires osslsigncode)
-signpass=password password of certificate
-version=m.m.p package version (defaults to CMakeLists.txt setting)
-binary=b binary version of package
Expand Down
Expand Up @@ -102,7 +102,7 @@ Sets the geometry column types to ``geometryColumnTypes``
Returns the default name for the table entry

It is usually the table name but in case there are multiple geometry
columns, the geometry column name is appendend to the table name.
columns, the geometry column name is appended to the table name.

.. seealso:: :py:func:`geometryColumnCount`
%End
Expand Down
2 changes: 1 addition & 1 deletion python/core/auto_generated/qgsbrowserproxymodel.sip.in
Expand Up @@ -138,7 +138,7 @@ filterByLayerType() is ``True``.
Sets the customization filters for data items based on item's data provider key

By default browser model shows all items from all available data items provider and few special
items (e.g. Favourites). To customize the behavious, set the filter to not load certain data items.
items (e.g. Favourites). To customize the behavior, set the filter to not load certain data items.
The items that are not based on data item providers have prefix "special:", for example
"special:Favourites", "special:Home", "PostGIS", "MSSQL"

Expand Down
Expand Up @@ -113,7 +113,7 @@ Returns the attributes used to evaluate the expression of this rule

bool needsGeometry() const;
%Docstring
Returns ``True`` if this rule or one of its chilren needs the geometry to be applied.
Returns ``True`` if this rule or one of its children needs the geometry to be applied.
%End

QgsSymbolList symbols( const QgsRenderContext &context = QgsRenderContext() ) const;
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/db_manager/db_plugins/oracle/plugin.py
Expand Up @@ -94,7 +94,7 @@ def connect(self, parent=None):
host, port, database, username, password = [
settings.value(x, "", type=str) for x in settingsList]

# get all of the connexion options
# get all of the connection options

useEstimatedMetadata = settings.value(
"estimatedMetadata", False, type=bool)
Expand Down
Expand Up @@ -13,7 +13,7 @@ QgsProcessingParameterNumber|slide|Slide of computed point toward the original p
QgsProcessingParameterNumber|angle_thresh|Minimum angle between two consecutive segments in Hermite method|QgsProcessingParameterNumber.Double|3.0|True|0.0|180.0
QgsProcessingParameterNumber|degree_thresh|Degree threshold in network generalization|QgsProcessingParameterNumber.Integer|0|True|0|None
QgsProcessingParameterNumber|closeness_thresh|Closeness threshold in network generalization|QgsProcessingParameterNumber.Double|0.0|True|0.0|1.0
QgsProcessingParameterNumber|betweeness_thresh|Betweeness threshold in network generalization|QgsProcessingParameterNumber.Double|0.0|True|None|None
QgsProcessingParameterNumber|betweeness_thresh|Betweenness threshold in network generalization|QgsProcessingParameterNumber.Double|0.0|True|None|None
QgsProcessingParameterNumber|alpha|Snakes alpha parameter|QgsProcessingParameterNumber.Double|1.0|True|None|None
QgsProcessingParameterNumber|beta|Snakes beta parameter|QgsProcessingParameterNumber.Double|1.0|True|None|None
QgsProcessingParameterNumber|iterations|Number of iterations|QgsProcessingParameterNumber.Integer|1|True|1|None
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/SagaAlgorithm.py
Expand Up @@ -283,7 +283,7 @@ def processAlgorithm(self, parameters, context, feedback):
f.write(s)
command += ' -{} "{}"'.format(param.name(), tempTableFile)
elif isinstance(param, QgsProcessingParameterExtent):
# 'We have to substract/add half cell size, since SAGA is
# 'We have to subtract/add half cell size, since SAGA is
# center based, not corner based
halfcell = self.getOutputCellsize(parameters, context) / 2
offset = [halfcell, -halfcell, halfcell, -halfcell]
Expand Down
@@ -1,5 +1,5 @@
Flow Accumulation (Top-Down)
ta_hydrology
QgsProcessingParameterRasterLayer|ELEVATION|Elevation|None|False
QgsProcessingParameterEnum|METHOD|Method|[0] Deterministic 8;[1] Rho 8;[2] Braunschweiger Reliefmodell;[3] Deterministic Infinity;[4] Multiple Flow Direction;[5] Multiple Triangular Flow Directon
QgsProcessingParameterEnum|METHOD|Method|[0] Deterministic 8;[1] Rho 8;[2] Braunschweiger Reliefmodell;[3] Deterministic Infinity;[4] Multiple Flow Direction;[5] Multiple Triangular Flow Direction
QgsProcessingParameterRasterDestination|FLOW|Catchment Area
Expand Up @@ -8,4 +8,4 @@ QgsProcessingParameterRasterDestination|HO|Slope Height
QgsProcessingParameterRasterDestination|HU|Valley Depth
QgsProcessingParameterRasterDestination|NH|Normalized Height
QgsProcessingParameterRasterDestination|SH|Standardized Height
QgsProcessingParameterRasterDestination|MS|Mid-Slope Positon
QgsProcessingParameterRasterDestination|MS|Mid-Slope Position
2 changes: 1 addition & 1 deletion python/server/auto_generated/qgsaccesscontrolfilter.sip.in
Expand Up @@ -21,7 +21,7 @@ Security can define any (or none) of the following method:
* layerFilterExpression() - To get an additional expression filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature)
* layerFilterSQL() - To get an additional SQL filter (WMS/GetMap, WMS/GetFeatureInfo, WFS/GetFeature) for layer that support SQL
* layerPermissions() - To give the general layer permissins (read / update / insert / delete)
* authorizedLayerAttributes() - Tho filter the attributes (WMS/GetFeatureInfo, WFS/GetFeature)
* authorizedLayerAttributes() - To filter the attributes (WMS/GetFeatureInfo, WFS/GetFeature)
* allowToEdit() - (all WFS-T requests)
* cacheKey()
%End
Expand Down
2 changes: 1 addition & 1 deletion resources/qgis_global_settings.ini
Expand Up @@ -28,7 +28,7 @@ digitizing\default_snap_type=Vertex
# LayerUnits, Pixels, ProjectUnits
digitizing\default_snapping_tolerance_unit=Pixels

# Snap on invisble feature
# Snap on invisible feature
digitizing\snap_invisible_feature=false

# Default XYZ tile servers to include
Expand Down
15 changes: 15 additions & 0 deletions scripts/spell_check/spelling.dat
Expand Up @@ -67,6 +67,7 @@ accelleration:acceleration
accension:ascension
acceptence:acceptance
acceptible:acceptable
accetable:acceptable
acces:access
accesing:accessing
accesnt:accent
Expand Down Expand Up @@ -559,6 +560,7 @@ appearence:appearance
appearences:appearances
appeares:appears
appeneded:appended
appendend:appended
apperance:appearance
apperances:appearances
appereance:appearance
Expand Down Expand Up @@ -1297,6 +1299,7 @@ chemcially:chemically
chemestry:chemistry
chemicaly:chemically
childen:children
chilren:children
childern:children
childs:children:*
chnage:change
Expand Down Expand Up @@ -1487,6 +1490,7 @@ comparaison:comparison
comparation:comparison
comparations:comparisons
comparision:comparison
comaprison:comparison
comparisions:comparisons
comparitive:comparative
comparitively:comparatively
Expand Down Expand Up @@ -1951,6 +1955,7 @@ customise:customize
cxan:cyan
cyclinder:cylinder
cymk:CMYK
dicarding:discarding
dacquiri:daiquiri
daed:dead
dael:deal
Expand Down Expand Up @@ -2025,6 +2030,7 @@ defenitions:definitions
defered:deferred
deffensively:defensively
defferent:different
differnent:different
defferred:deferred
deffine:define
deffined:defined
Expand Down Expand Up @@ -2201,6 +2207,7 @@ detatches:detaches
detatching:detaching
detemine:determine
detemined:determined
determinated:determined
detemines:determines
detemining:determining
deteoriated:deteriorated
Expand Down Expand Up @@ -2501,6 +2508,7 @@ driectly:directly
drnik:drink
drop down:drop-down
droped:dropped:*
dorp:drop
droppped:dropped
druming:drumming
drummless:drumless
Expand Down Expand Up @@ -3376,6 +3384,7 @@ hander:handler
handfull:handful
hanle:handle
hanled:handled
handeled:handled
hanles:handles
hanling:handling
hanshake:handshake
Expand Down Expand Up @@ -4422,6 +4431,7 @@ manufaturing:manufacturing
manully:manually
manupulation:manipulation
manupulations:manipulations
maniuplated:manipulated
manuver:maneuver
maped:mapped
maping:mapping
Expand Down Expand Up @@ -4797,6 +4807,7 @@ noteable:notable
noteably:notably
noteriety:notoriety
notfication:notification
notificaton:notification
notfications:notifications
noth:north
nothern:northern
Expand Down Expand Up @@ -5851,6 +5862,7 @@ redefintions:redefinitions
rediculous:ridiculous
redircet:redirect
redirectrion:redirection
directon:direction
reedeming:redeeming
reenable:re-enable
reenabled:re-enabled
Expand Down Expand Up @@ -7678,6 +7690,7 @@ waranties:warranties
waranty:warranty
wardobe:wardrobe
waring:warning
warinings:warnings
warrent:warrant
warrriors:warriors
was'nt:weren't
Expand Down Expand Up @@ -7730,6 +7743,7 @@ widesread:widespread
widht:width
wief:wife
wierd:weird
wierdness:weirdness
wiew:view
wih:with
wihout:without
Expand Down Expand Up @@ -7817,3 +7831,4 @@ yrea:year
ytou:you
yuo:you
yur:your
mose:mouse
2 changes: 1 addition & 1 deletion src/analysis/interpolation/MathUtils.cpp
Expand Up @@ -75,7 +75,7 @@ bool MathUtils::BarycentricToXY( double u, double v, double w, QgsPoint *p1, Qgs
py = ( 2 * v * area - px * ( p3->y() - p1->y() ) - p3->x() * p1->y() + p1->x() * p3->y() ) / ( p1->x() - p3->x() );
}
}
else//dorp out px in the two equations(maybe this possibility occurs only, if p1, p2 and p3 are coplanar
else//drop out px in the two equations(maybe this possibility occurs only, if p1, p2 and p3 are coplanar
{
py = ( 2 * u * area * ( p3->y() - p1->y() ) - 2 * v * area * ( p2->y() - p3->y() ) - p2->x() * p3->y() * ( p3->y() - p1->y() ) + p3->x() * p1->y() * ( p2->y() - p3->y() ) + p3->x() * p2->y() * ( p3->y() - p1->y() ) - p1->x() * p3->y() * ( p2->y() - p3->y() ) ) / ( ( p3->x() - p2->x() ) * ( p3->y() - p1->y() ) - ( p1->x() - p3->x() ) * ( p2->y() - p3->y() ) );
if ( ( p2->y() - p3->y() ) != 0 )
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsfixattributedialog.h
Expand Up @@ -60,7 +60,7 @@ class APP_EXPORT QgsFixAttributeDialog : public QDialog
QgsFeatureList fixedFeatures() { return mFixedFeatures; }

/**
* Returns unfixed features (canceled or not handeled)
* Returns unfixed features (canceled or not handled)
*/
QgsFeatureList unfixedFeatures() { return mUnfixedFeatures; }

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptooloffsetcurve.h
Expand Up @@ -80,7 +80,7 @@ class APP_EXPORT QgsMapToolOffsetCurve: public QgsMapToolEdit
//! Snapping indicators
std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

//! The layer being maniuplated
//! The layer being manipulated
QgsVectorLayer *mSourceLayer = nullptr;

//! Geometry to manipulate
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmeasuredialog.h
Expand Up @@ -46,7 +46,7 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
//! Add new point
void addPoint();

//! Mose move
//! Mouse move
void mouseMove( const QgsPointXY &point );

//! Removes the last point
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsabstractdatabaseproviderconnection.h
Expand Up @@ -141,7 +141,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
* Returns the default name for the table entry
*
* It is usually the table name but in case there are multiple geometry
* columns, the geometry column name is appendend to the table name.
* columns, the geometry column name is appended to the table name.
* \see geometryColumnCount()
*/
QString defaultName() const;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsbrowserproxymodel.h
Expand Up @@ -147,7 +147,7 @@ class CORE_EXPORT QgsBrowserProxyModel : public QSortFilterProxyModel
* Sets the customization filters for data items based on item's data provider key
*
* By default browser model shows all items from all available data items provider and few special
* items (e.g. Favourites). To customize the behavious, set the filter to not load certain data items.
* items (e.g. Favourites). To customize the behavior, set the filter to not load certain data items.
* The items that are not based on data item providers have prefix "special:", for example
* "special:Favourites", "special:Home", "PostGIS", "MSSQL"
*
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsmaprendererjob.cpp
Expand Up @@ -812,7 +812,7 @@ void QgsMapRendererJob::composeSecondPass( LayerRenderJobs &secondPassJobs, Labe
{
QPainter tempPainter;

// resue the first pass painter, if available
// reuse the first pass painter, if available
QPainter *painter1 = job.firstPassJob->context.painter();
if ( ! painter1 )
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsmaprendererjob.h
Expand Up @@ -129,7 +129,7 @@ struct LabelRenderJob
* There is only one label job, with labels coming from different layers or rules (for rule-based labeling).
* So we may have different labels with different label masks. We then need one different mask image for each configuration of label masks.
* Labels that share the same kind of label masks, i.e. having the same set of symbol layers that are to be masked, should share the same mask image.
* Labels that have different label masks, i.e. having different set of symbol layers that are to be masked, should have differnent mask images.
* Labels that have different label masks, i.e. having different set of symbol layers that are to be masked, should have different mask images.
* The index in the vector corresponds to the mask identifier.
* \see maskIdProvider
*/
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsrunprocess.h
Expand Up @@ -44,7 +44,7 @@ class CORE_EXPORT QgsRunProcess: public QObject SIP_NODEFAULTCTORS

public:
// This class deletes itself, so to ensure that it is only created
// using new, the Named Consturctor Idiom is used, and one needs to
// using new, the Named Constructor Idiom is used, and one needs to
// use the create() static function to get an instance of this class.

// The action argument contains string with the command.
Expand Down
2 changes: 1 addition & 1 deletion src/core/symbology/qgsrulebasedrenderer.h
Expand Up @@ -163,7 +163,7 @@ class CORE_EXPORT QgsRuleBasedRenderer : public QgsFeatureRenderer
QSet<QString> usedAttributes( const QgsRenderContext &context ) const;

/**
* Returns TRUE if this rule or one of its chilren needs the geometry to be applied.
* Returns TRUE if this rule or one of its children needs the geometry to be applied.
*/
bool needsGeometry() const;

Expand Down
2 changes: 1 addition & 1 deletion src/core/symbology/qgssymbollayerutils.cpp
Expand Up @@ -2767,7 +2767,7 @@ bool QgsSymbolLayerUtils::createFunctionElement( QDomDocument &doc, QDomElement

bool QgsSymbolLayerUtils::functionFromSldElement( QDomElement &element, QString &function )
{
// check if ogc:Filter or containe ogc:Filters
// check if ogc:Filter or contains ogc:Filters
QDomElement elem = element;
if ( element.tagName() != QLatin1String( "Filter" ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/layout/qgslayoutmousehandles.h
Expand Up @@ -50,7 +50,7 @@ class GUI_EXPORT QgsLayoutMouseHandles: public QObject, public QGraphicsRectItem
Q_OBJECT
public:

//! Describes the action (move or resize in different directon) to be done during mouse move
//! Describes the action (move or resize in different direction) to be done during mouse move
enum MouseAction
{
MoveItem,
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/gps_importer/qgsgpsdevicedialog.cpp
Expand Up @@ -107,7 +107,7 @@ void QgsGpsDeviceDialog::slotUpdateDeviceList( const QString &selection )
}

// We're going to be changing the selected item, so disable our
// notificaton of that.
// notification of that.
QObject::disconnect( lbDeviceList, &QListWidget::currentItemChanged,
this, &QgsGpsDeviceDialog::slotSelectionChanged );

Expand Down

0 comments on commit edee4a3

Please sign in to comment.