Skip to content

Commit dd9a03a

Browse files
nyalldawsonnyalldawson
authoredDec 29, 2016
Merge pull request #3915 from DelazJ/fixtypos
Fix typos
·
ltr-3_40final-3_0_0
2 parents 25697a1 + 828e447 commit dd9a03a

39 files changed

+67
-61
lines changed
 

‎NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ we recommend that you use a copy of QGIS from our Long Term Support (LTS)1.0.x
10551055
release series. In all other cases we recommend that you use this version.
10561056

10571057
This release includes around 200 bug fixes, nearly 30 new features and has had
1058-
a lot of love and attention poured in to it to take our favourite desktop GIS
1058+
a lot of love and attention poured into it to take our favorite desktop GIS
10591059
application another step on the road to GIS nirvana! So much has happened in
10601060
the 3 months since our last release that it is impossible to document
10611061
everything here. Instead we will just highlight a couple of important new

‎cmake_templates/Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1448,7 +1448,7 @@ DOT_NUM_THREADS = 0
14481448

14491449
# By default doxygen will write a font called FreeSans.ttf to the output
14501450
# directory and reference it in all dot files that doxygen generates. This
1451-
# font does not include all possible unicode characters however, so when you need
1451+
# font does not include all possible Unicode characters however, so when you need
14521452
# these (or just want a differently looking font) you can specify the font name
14531453
# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
14541454
# which can be done by putting it in a standard location or by setting the

‎doc/news.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ release series. In all other cases we recommend that you use this version.
10231023

10241024

10251025
This release includes around 200 bug fixes, nearly 30 new features and has had
1026-
a lot of love and attention poured in to it to take our favourite desktop GIS
1026+
a lot of love and attention poured in to it to take our favorite desktop GIS
10271027
application another step on the road to GIS nirvana! So much has happened in
10281028
the 3 months since our last release that it is impossible to document
10291029
everything here. Instead we will just highlight a couple of important new

‎python/core/qgscoordinatereferencesystem.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@
129129
* Caveats
130130
* =======
131131
*
132-
* There are two different flavours of WKT: one is defined by OGC, the other is the standard
132+
* There are two different flavors of WKT: one is defined by OGC, the other is the standard
133133
* used by ESRI. They look very similar, but they are not the same. QGIS is able to consume
134-
* both flavours.
134+
* both flavors.
135135
*
136136
* \see QgsCoordinateTransform
137137
*/

‎python/core/qgspallabeling.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ class QgsPalLayerSettings
408408
bool centroidInside; // whether centroid-point calculated must be inside polygon
409409

410410
/** Ordered list of predefined label positions for points. Positions earlier
411-
* in the list will be prioritised over later positions. Only used when the placement
411+
* in the list will be prioritized over later positions. Only used when the placement
412412
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
413413
* @note not available in Python bindings
414414
*/

‎python/plugins/db_manager/db_plugins/data_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def data(self, index, role):
8989
# too much data to display, elide the string
9090
val = val[:300]
9191
try:
92-
return str(val) # convert to unicode
92+
return str(val) # convert to Unicode
9393
except UnicodeDecodeError:
9494
return str(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
9595

‎python/plugins/db_manager/db_plugins/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ def editTableActionSlot(self, item, action, parent):
424424
QApplication.restoreOverrideCursor()
425425
try:
426426
if not isinstance(item, Table) or item.isView:
427-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table for editation."),
427+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table to edit."),
428428
QgsMessageBar.INFO, parent.iface.messageTimeout())
429429
return
430430
from ..dlg_table_properties import DlgTableProperties

‎python/plugins/processing/algs/help/qgis.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ qgis:createattributeindex: >
9393
Creates an index to speed up queries made against a field in a table. Support for index creation is dependent on the layer's data provider and the field type.
9494

9595
qgis:createconstantrasterlayer: >
96-
Given an input raster layer an a value, this algorithm generates a new layer with the same extent and cellsize as the input one, and all cells with the specified value.
96+
Given an input raster layer an a value, this algorithm generates a new layer with the same extent and cell size as the input one, and all cells with the specified value.
9797

9898
qgis:creategridlines:
9999
This algorithm creates a line vector layer with a grid covering a given extent.
@@ -568,9 +568,9 @@ qgis:rastercalculator: >
568568

569569
- sin(), cos(), tan(), atan2(), ln(), log10()
570570

571-
The extent and cellsize can be defined by the user. If the extent is not specified, the minimum extent that covers the input layers will be used. If the cellsize is not specified, the minimum cellsize of all input layers will be used.
571+
The extent and cellsize can be defined by the user. If the extent is not specified, the minimum extent that covers the input layers will be used. If the cell size is not specified, the minimum cell size of all input layers will be used.
572572

573-
The cellsize is assumed to be the same in both X and Y axes.
573+
The cell size is assumed to be the same in both X and Y axes.
574574

575575
Layers are refered by their name as displayed in the layer list and the number of the band to use (based on 1), using the pattern 'layer_name@band number'. For instance, the first band from a layer named DEM will be referred as DEM@1.
576576

‎python/plugins/processing/algs/help/saga.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ saga:rastercalculator: >
33

44
It requires a base layer, and a set of additional layers. The base layer is identified as "a" in the formula, while the additional layers are identified as "b, c, d...", using the order in which they appear in the multiple selection dialog.
55

6-
The resulting layer has the extent and cellsize of the main layer.
6+
The resulting layer has the extent and cell size of the main layer.
77

88
The following operators and functions are available.
99

‎python/plugins/processing/algs/lidar/fusion/CanopyModel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def defineCharacteristics(self):
6262
self.addParameter(ParameterFile(
6363
self.INPUT, self.tr('Input LAS layer')))
6464
self.addParameter(ParameterNumber(
65-
self.CELLSIZE, self.tr('Cellsize'), 0, None, 10.0))
65+
self.CELLSIZE, self.tr('Cell Size'), 0, None, 10.0))
6666
self.addParameter(ParameterSelection(
6767
self.XYUNITS, self.tr('XY Units'), self.UNITS))
6868
self.addParameter(ParameterSelection(

‎python/plugins/processing/algs/lidar/fusion/Cover.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def defineCharacteristics(self):
5757
self.addParameter(ParameterFile(
5858
self.GROUND, self.tr('Input ground DTM layer')))
5959
self.addParameter(ParameterNumber(
60-
self.CELLSIZE, self.tr('Cellsize'), 0, None, 10.0))
60+
self.CELLSIZE, self.tr('Cell Size'), 0, None, 10.0))
6161
self.addParameter(ParameterNumber(
6262
self.HEIGHTBREAK, self.tr('Heightbreak'), 0, None, 10.0))
6363
self.addParameter(ParameterSelection(

‎python/plugins/processing/algs/lidar/fusion/GridMetrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def defineCharacteristics(self):
6565
self.addParameter(ParameterNumber(
6666
self.HEIGHT, self.tr('Height break')))
6767
self.addParameter(ParameterNumber(
68-
self.CELLSIZE, self.tr('Cellsize')))
68+
self.CELLSIZE, self.tr('Cell Size')))
6969

7070
self.addOutput(OutputFile(
7171
self.OUTPUT_CSV_ELEVATION, self.tr('Output table with grid metrics')))

‎python/plugins/processing/algs/lidar/fusion/GridSurfaceCreate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def defineCharacteristics(self):
6363
self.addParameter(ParameterFile(
6464
self.INPUT, self.tr('Input LAS layer')))
6565
self.addParameter(ParameterNumber(
66-
self.CELLSIZE, self.tr('Cellsize'), 0, None, 10.0))
66+
self.CELLSIZE, self.tr('Cell Size'), 0, None, 10.0))
6767
self.addParameter(ParameterSelection(
6868
self.XYUNITS, self.tr('XY Units'), self.UNITS))
6969
self.addParameter(ParameterSelection(

‎python/plugins/processing/algs/lidar/fusion/GroundFilter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def defineCharacteristics(self):
5050
self.addParameter(ParameterFile(
5151
self.INPUT, self.tr('Input LAS layer')))
5252
self.addParameter(ParameterNumber(self.CELLSIZE,
53-
self.tr('Cellsize for intermediate surfaces'), 0, None, 10))
53+
self.tr('Cell size for intermediate surfaces'), 0, None, 10))
5454
self.addOutput(OutputFile(
5555
self.OUTPUT, self.tr('Output ground LAS file')))
5656
self.addParameter(ParameterBoolean(

‎python/plugins/processing/algs/lidar/fusion/TinSurfaceCreate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def defineCharacteristics(self):
5454
self.addParameter(ParameterFile(
5555
self.INPUT, self.tr('Input LAS layer')))
5656
self.addParameter(ParameterNumber(self.CELLSIZE,
57-
self.tr('Cellsize'), 0, None, 10.0))
57+
self.tr('Cell Size'), 0, None, 10.0))
5858
self.addParameter(ParameterSelection(self.XYUNITS,
5959
self.tr('XY Units'), self.UNITS))
6060
self.addParameter(ParameterSelection(self.ZUNITS,

‎python/plugins/processing/algs/qgis/Eliminate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def processAlgorithm(self, progress):
133133
y = str(comparisonvalue)
134134
except ValueError:
135135
selectionError = True
136-
msg = self.tr('Cannot convert "%s" to unicode' % str(comparisonvalue))
136+
msg = self.tr('Cannot convert "%s" to Unicode' % str(comparisonvalue))
137137
elif selectType == QVariant.Date:
138138
# date
139139
dateAndFormat = comparisonvalue.split(' ')

‎python/plugins/processing/algs/qgis/IdwInterpolation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ def dataToString(data):
128128
self.tr('Number of rows'),
129129
0, 10000000, 300))
130130
self.addParameter(ParameterNumber(self.CELLSIZE_X,
131-
self.tr('Cellsize X'),
131+
self.tr('Cell Size X'),
132132
0.0, 999999.000000, 0.0))
133133
self.addParameter(ParameterNumber(self.CELLSIZE_Y,
134-
self.tr('Cellsize Y'),
134+
self.tr('Cell Size Y'),
135135
0.0, 999999.000000, 0.0))
136136
self.addParameter(ParameterExtent(self.EXTENT,
137137
self.tr('Extent')))

‎python/plugins/processing/algs/qgis/RasterCalculator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def evaluateForModeler(self, value, model):
8181
multiline=True,
8282
metadata={'widget_wrapper': ExpressionWidgetWrapper}))
8383
self.addParameter(ParameterNumber(self.CELLSIZE,
84-
self.tr('Cellsize (use 0 or empty to set it automatically)'),
84+
self.tr('Cell size (use 0 or empty to set it automatically)'),
8585
minValue=0.0, default=0.0, optional=True))
8686
self.addParameter(ParameterExtent(self.EXTENT,
8787
self.tr('Output extent'),

‎python/plugins/processing/algs/qgis/TinInterpolation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ def dataToString(data):
137137
self.tr('Number of rows'),
138138
0, 10000000, 300))
139139
self.addParameter(ParameterNumber(self.CELLSIZE_X,
140-
self.tr('Cellsize X'),
140+
self.tr('Cell size X'),
141141
0.0, 999999.000000, 0.0))
142142
self.addParameter(ParameterNumber(self.CELLSIZE_Y,
143-
self.tr('Cellsize Y'),
143+
self.tr('Cell size Y'),
144144
0.0, 999999.000000, 0.0))
145145
self.addParameter(ParameterExtent(self.EXTENT,
146146
self.tr('Extent')))

‎python/plugins/processing/algs/saga/SagaAlgorithm212.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ def editCommands(self, commands):
293293
return commands
294294

295295
def getOutputCellsize(self):
296-
"""Tries to guess the cellsize of the output, searching for
296+
"""Tries to guess the cell size of the output, searching for
297297
a parameter with an appropriate name for it.
298298
"""
299299

‎python/plugins/processing/core/ProcessingConfig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def initialize():
146146
ProcessingConfig.addSetting(Setting(
147147
ProcessingConfig.tr('General'),
148148
ProcessingConfig.RECENT_ALGORITHMS,
149-
ProcessingConfig.tr('Recent algs'), '', hidden=True))
149+
ProcessingConfig.tr('Recent algorithms'), '', hidden=True))
150150
extensions = processing.tools.dataobjects.getSupportedOutputVectorLayerExtensions()
151151
ProcessingConfig.addSetting(Setting(
152152
ProcessingConfig.tr('General'),

‎python/pyplugin_installer/version_compare.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
2424
Usage: compareVersions(version1, version2)
2525
26-
The function accepts arguments of any type convertable to unicode string
26+
The function accepts arguments of any type convertable to Unicode string
2727
and returns integer value:
2828
0 - the versions are equal
2929
1 - version 1 is higher
3030
2 - version 2 is higher
3131
3232
-----------------------------------------------------------------------------
3333
HOW DOES IT WORK...
34-
First, both arguments are converted to uppercase unicode and stripped of
34+
First, both arguments are converted to uppercase Unicode and stripped of
3535
'VERSION' or 'VER.' prefix. Then they are chopped into a list of particular
3636
numeric and alphabetic elements. The dots, dashes and underlines are recognized
3737
as delimiters. Also numbers and non numbers are separated. See example below:

‎resources/function_help/json/regexp_matches

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{"arg":"string", "description":"the string to capture groups from against the regular expression"},
77
{"arg":"regex","description":"the regular expression used to capture groups"},
88
{"arg":"empty_value","optional":true,"default":"''","description":"the optional string to use as replacement for empty (zero length) matches"}],
9-
"examples": [ { "expression":"regexp_matches('qgis=>rocks','(.*)=>(.*)')", "returns":"array: 'qgis', 'rocks'"},
9+
"examples": [ { "expression":"regexp_matches('QGIS=>rocks','(.*)=>(.*)')", "returns":"array: 'QGIS', 'rocks'"},
1010
{ "expression":"regexp_matches('key=>','(.*)=>(.*)','empty value')", "returns":"array: 'key', 'empty value'"}
1111
]
1212
}

‎scripts/spelling.dat

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ debians:Debian's
140140
decompres:decompress
141141
definate:definite
142142
definately:definitely
143+
definintion:definition
143144
deimiter:delimiter
144145
delemeter:delimiter
145146
delemiter:delimiter
@@ -196,6 +197,8 @@ familar:familiar
196197
fatser:faster
197198
fetaures:features
198199
feture:feature
200+
flavour:flavor
201+
flavours:flavors
199202
forse:force
200203
fortan:fortran
201204
forwardig:forwarding
@@ -357,6 +360,8 @@ prepaired:prepared
357360
primative:primitive
358361
princliple:principle
359362
priorty:priority
363+
prioritise:prioritize
364+
prioritising:prioritizing
360365
proccesors:processors
361366
proces:process
362367
processessing:processing
@@ -459,6 +464,7 @@ supress:suppress
459464
surpress:suppress
460465
suspicously:suspiciously
461466
swaped:swapped
467+
symbo:symbol
462468
syle:style
463469
symetrical:symmetrical
464470
synax:syntax

‎src/app/composer/qgscomposer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2488,7 +2488,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
24882488
"with layers not being clipped to the map "
24892489
"bounding box.</p>" )
24902490
+ tr( "If you require a vector-based output file from "
2491-
"Qgis it is suggested that you try printing "
2491+
"QGIS it is suggested that you try printing "
24922492
"to PostScript if the SVG output is not "
24932493
"satisfactory."
24942494
"</p>" ) );

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6369,7 +6369,7 @@ void QgisApp::saveAsLayerDefinition()
63696369
bool saved = QgsLayerDefinition::exportLayerDefinition( path, mLayerTreeView->selectedNodes(), errorMessage );
63706370
if ( !saved )
63716371
{
6372-
messageBar()->pushMessage( tr( "Error saving layer definintion file" ), errorMessage, QgsMessageBar::WARNING );
6372+
messageBar()->pushMessage( tr( "Error saving layer definition file" ), errorMessage, QgsMessageBar::WARNING );
63736373
}
63746374
}
63756375

‎src/app/qgspluginregistry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ void QgsPluginRegistry::loadCppPlugin( const QString& theFullPathName )
380380
{
381381
// something went wrong
382382
QMessageBox::warning( mQgisInterface->mainWindow(), QObject::tr( "Error Loading Plugin" ),
383-
QObject::tr( "There was an error loading a plugin."
383+
QObject::tr( "There was an error loading a plugin. "
384384
"The following diagnostic information may help the QGIS developers resolve the issue:\n%1." )
385385
.arg( myError ) );
386386
//disable it to the qsettings file [ts]

‎src/core/pal/feature.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ namespace pal
143143
*/
144144
int createCandidatesOverPoint( double x, double y, QList<LabelPosition *> &lPos, double angle );
145145

146-
/** Generates candidates following a prioritised list of predefined positions around a point.
146+
/** Generates candidates following a prioritized list of predefined positions around a point.
147147
* @param x x coordinate of the point
148148
* @param y y coordinate of the point
149149
* @param lPos pointer to an array of candidates, will be filled by generated candidate

‎src/core/qgscoordinatereferencesystem.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ typedef void ( *CUSTOM_CRS_VALIDATION )( QgsCoordinateReferenceSystem& );
176176
* Caveats
177177
* =======
178178
*
179-
* There are two different flavours of WKT: one is defined by OGC, the other is the standard
179+
* There are two different flavors of WKT: one is defined by OGC, the other is the standard
180180
* used by ESRI. They look very similar, but they are not the same. QGIS is able to consume
181-
* both flavours.
181+
* both flavors.
182182
*
183183
* \see QgsCoordinateTransform
184184
*/

‎src/core/qgspallabeling.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ class CORE_EXPORT QgsPalLayerSettings
427427
bool centroidInside; // whether centroid-point calculated must be inside polygon
428428

429429
/** Ordered list of predefined label positions for points. Positions earlier
430-
* in the list will be prioritised over later positions. Only used when the placement
430+
* in the list will be prioritized over later positions. Only used when the placement
431431
* is set to QgsPalLayerSettings::OrderedPositionsAroundPoint.
432432
* @note not available in Python bindings
433433
*/

‎src/core/qgsvectorfilewriter.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,7 +1535,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
15351535
) );
15361536

15371537
layerOptions.insert( QStringLiteral( "FORMAT" ), new SetOption(
1538-
QObject::tr( "Controls the format used for the geometry column. Defaults to WKB."
1538+
QObject::tr( "Controls the format used for the geometry column. Defaults to WKB. "
15391539
"This is generally more space and processing efficient, but harder "
15401540
"to inspect or use in simple applications than WKT (Well Known Text)." ),
15411541
QStringList()
@@ -1569,7 +1569,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
15691569
"for databases that have big string blobs. However, use with care, since "
15701570
"the value of such columns will be seen as compressed binary content with "
15711571
"other SQLite utilities (or previous OGR versions). With OGR, when inserting, "
1572-
"modifying or queryings compressed columns, compression/decompression is "
1572+
"modifying or querying compressed columns, compression/decompression is "
15731573
"done transparently. However, such columns cannot be (easily) queried with "
15741574
"an attribute filter or WHERE clause. Note: in table definition, such columns "
15751575
"have the 'VARCHAR_deflate' declaration type." ),
@@ -1621,14 +1621,14 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
16211621
) );
16221622

16231623
layerOptions.insert( QStringLiteral( "SPATIAL_INDEX" ), new BoolOption(
1624-
QObject::tr( "If the database is of the SpatiaLite flavour, and if OGR is linked "
1624+
QObject::tr( "If the database is of the SpatiaLite flavor, and if OGR is linked "
16251625
"against libspatialite, this option can be used to control if a spatial "
16261626
"index must be created." ),
16271627
true // Default value
16281628
) );
16291629

16301630
layerOptions.insert( QStringLiteral( "COMPRESS_GEOM" ), new BoolOption(
1631-
QObject::tr( "If the format of the geometry BLOB is of the SpatiaLite flavour, "
1631+
QObject::tr( "If the format of the geometry BLOB is of the SpatiaLite flavor, "
16321632
"this option can be used to control if the compressed format for "
16331633
"geometries (LINESTRINGs, POLYGONs) must be used" ),
16341634
false // Default value

‎src/core/qgsvectorlayereditutils.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint>& splitLine, bo
301301
QgsRectangle bBox; //bounding box of the split line
302302
int returnCode = 0;
303303
int splitFunctionReturn; //return code of QgsGeometry::splitGeometry
304-
int numberOfSplittedFeatures = 0;
304+
int numberOfSplitFeatures = 0;
305305

306306
QgsFeatureIterator features;
307307
const QgsFeatureIds selectedIds = L->selectedFeatureIds();
@@ -384,15 +384,15 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint>& splitLine, bo
384384
addTopologicalPoints( *topol_it );
385385
}
386386
}
387-
++numberOfSplittedFeatures;
387+
++numberOfSplitFeatures;
388388
}
389389
else if ( splitFunctionReturn > 1 ) //1 means no split but also no error
390390
{
391391
returnCode = splitFunctionReturn;
392392
}
393393
}
394394

395-
if ( numberOfSplittedFeatures == 0 && !selectedIds.isEmpty() )
395+
if ( numberOfSplitFeatures == 0 && !selectedIds.isEmpty() )
396396
{
397397
//There is a selection but no feature has been split.
398398
//Maybe user forgot that only the selected features are split
@@ -411,7 +411,7 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint>& splitLine, bool
411411
QgsRectangle bBox; //bounding box of the split line
412412
int returnCode = 0;
413413
int splitFunctionReturn; //return code of QgsGeometry::splitGeometry
414-
int numberOfSplittedParts = 0;
414+
int numberOfSplitParts = 0;
415415

416416
QgsFeatureIterator fit;
417417

@@ -519,15 +519,15 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint>& splitLine, bool
519519
addTopologicalPoints( *topol_it );
520520
}
521521
}
522-
++numberOfSplittedParts;
522+
++numberOfSplitParts;
523523
}
524524
else if ( splitFunctionReturn > 1 ) //1 means no split but also no error
525525
{
526526
returnCode = splitFunctionReturn;
527527
}
528528
}
529529

530-
if ( numberOfSplittedParts == 0 && L->selectedFeatureCount() > 0 && returnCode == 0 )
530+
if ( numberOfSplitParts == 0 && L->selectedFeatureCount() > 0 && returnCode == 0 )
531531
{
532532
//There is a selection but no feature has been split.
533533
//Maybe user forgot that only the selected features are split

‎src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ void eVisDatabaseConnectionGui::on_pbtnLoadPredefinedQueries_clicked()
417417
}
418418
else
419419
{
420-
teditConsole->append( tr( "Error: Unabled to open file [%1]" ).arg( myFilename ) );
420+
teditConsole->append( tr( "Error: Unable to open file [%1]" ).arg( myFilename ) );
421421
}
422422
}
423423
}

‎src/providers/postgres/qgspostgresconn.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ QgsPostgresConn::QgsPostgresConn( const QString& conninfo, bool readOnly, bool s
269269
return;
270270
}
271271

272-
//set client encoding to unicode because QString uses UTF-8 anyway
272+
//set client encoding to Unicode because QString uses UTF-8 anyway
273273
QgsDebugMsg( "setting client encoding to UNICODE" );
274274
int errcode = PQsetClientEncoding( mConn, QStringLiteral( "UNICODE" ).toLocal8Bit() );
275275
if ( errcode == 0 )

‎src/python/qgspythonutilsimpl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj )
546546
}
547547

548548
// it's some other type of object:
549-
// convert object to unicode string (equivalent to calling unicode(obj) )
549+
// convert object to Unicode string (equivalent to calling unicode(obj) )
550550
PyObject* obj_uni = PyObject_Unicode( obj ); // obj_uni is new reference
551551
if ( obj_uni )
552552
{
@@ -564,7 +564,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj )
564564
}
565565
#endif
566566

567-
// if conversion to unicode failed, try to convert it to classic string, i.e. str(obj)
567+
// if conversion to Unicode failed, try to convert it to classic string, i.e. str(obj)
568568
PyObject* obj_str = PyObject_Str( obj ); // new reference
569569
if ( obj_str )
570570
{
@@ -573,7 +573,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj )
573573
return result;
574574
}
575575

576-
// some problem with conversion to unicode string
576+
// some problem with conversion to Unicode string
577577
QgsDebugMsg( "unable to convert PyObject to a QString!" );
578578
return QStringLiteral( "(qgis error)" );
579579
}

‎src/ui/qgsattributeactionpropertiesdialogbase.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<item row="1" column="0">
1818
<widget class="QLabel" name="textLabel1">
1919
<property name="whatsThis">
20-
<string>Enter the name of an action here. The name should be unique (qgis will make it unique if necessary).</string>
20+
<string>Enter the name of an action here. The name should be unique (QGIS will make it unique if necessary).</string>
2121
</property>
2222
<property name="text">
2323
<string>Description</string>
@@ -243,7 +243,7 @@
243243
<string>Enter the action name here</string>
244244
</property>
245245
<property name="whatsThis">
246-
<string>Enter the name of an action here. The name should be unique (qgis will make it unique if necessary).</string>
246+
<string>Enter the name of an action here. The name should be unique (QGIS will make it unique if necessary).</string>
247247
</property>
248248
<property name="placeholderText">
249249
<string>Mandatory description</string>

‎src/ui/qgsstylemanagerdialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
<string>Export selected symbol(s) as PNG…</string>
469469
</property>
470470
<property name="toolTip">
471-
<string>Export selected symbo(s) as PNG</string>
471+
<string>Export selected symbol(s) as PNG</string>
472472
</property>
473473
</action>
474474
<action name="actnExportAsSVG">

‎src/ui/qgstextformatwidgetbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3868,7 +3868,7 @@ font-style: italic;</string>
38683868
<item row="0" column="0">
38693869
<widget class="QRadioButton" name="radPredefinedOrder">
38703870
<property name="toolTip">
3871-
<string>Uses cartographically 'ideal' placements, prioritising label placement with best visual relationship with the point feature</string>
3871+
<string>Uses 'ideal' cartographic placements, prioritizing label placement with best visual relationship with the point feature</string>
38723872
</property>
38733873
<property name="text">
38743874
<string>Cartographic</string>

‎tests/src/python/test_qgsdelimitedtextprovider.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ def toString(self):
8888

8989

9090
def normalize_query_items_order(s):
91-
splitted_url = s.split('?')
92-
urlstr = splitted_url[0]
93-
if len(splitted_url) == 2:
94-
items_list = splitted_url[1].split('&')
91+
split_url = s.split('?')
92+
urlstr = split_url[0]
93+
if len(split_url) == 2:
94+
items_list = split_url[1].split('&')
9595
items_map = {}
9696
for item in items_list:
97-
splitted_item = item.split('=')
98-
items_map[splitted_item[0]] = splitted_item[1]
97+
split_item = item.split('=')
98+
items_map[split_item[0]] = split_item[1]
9999
first_arg = True
100100
for k in sorted(items_map.keys()):
101101
if first_arg:

0 commit comments

Comments
 (0)
Please sign in to comment.