diff --git a/INSTALL b/INSTALL index 0b6c25fa180..624c595340f 100644 --- a/INSTALL +++ b/INSTALL @@ -526,7 +526,7 @@ Running QGIS from within MSVC: Edit the properties of the project ALL_BUILD: Debugging -> Command -> D:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\output\bin\RelWithDebInfo\qgis.exe Run. - Ignore the "These projects are out of date" message, it appeares even if no files were was changed. + Ignore the "These projects are out of date" message, it appears even if no files were changed. Old alternative method that might still work using cmake-gui: Create a 'build' directory somewhere. This will be where all the build output diff --git a/doc/msvc.t2t b/doc/msvc.t2t index 061e266820e..3179c347ef5 100644 --- a/doc/msvc.t2t +++ b/doc/msvc.t2t @@ -103,7 +103,7 @@ Running QGIS from within MSVC: Edit the properties of the project ALL_BUILD: Debugging -> Command -> D:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\output\bin\RelWithDebInfo\qgis.exe Run. - Ignore the "These projects are out of date" message, it appeares even if no files were was changed. + Ignore the "These projects are out of date" message, it appears even if no files were changed. Old alternative method that might still work using cmake-gui: diff --git a/mac/development.md b/mac/development.md index 898a06fada0..9e2b2ee85b2 100644 --- a/mac/development.md +++ b/mac/development.md @@ -208,7 +208,7 @@ brew tap osgeo/osgeo4mac brew unlink qt brew unlink pyqt -# Older txt2tags generator for INSTALL doc breakes build and chokes on Python 3 +# Older txt2tags generator for INSTALL doc breaks build and chokes on Python 3 brew unlink txt2tags # Install and verify GDAL/OGR with decent driver support diff --git a/src/plugins/georeferencer/qgsleastsquares.cpp b/src/plugins/georeferencer/qgsleastsquares.cpp index 650c7f9e8b9..cbf20c7bdcb 100644 --- a/src/plugins/georeferencer/qgsleastsquares.cpp +++ b/src/plugins/georeferencer/qgsleastsquares.cpp @@ -176,7 +176,7 @@ void QgsLeastSquares::affine( QVector mapCoords, /** * Scales the given coordinates so that the center of gravity is at the origin and the mean distance to the origin is sqrt(2). * - * Also returns 3x3 homogenous matrices which can be used to normalize and de-normalize coordinates. + * Also returns 3x3 homogeneous matrices which can be used to normalize and de-normalize coordinates. */ void normalizeCoordinates( const QVector &coords, QVector &normalizedCoords, double normalizeMatrix[9], double denormalizeMatrix[9] ) diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp index c6a683ba4de..11c4734d26f 100644 --- a/src/plugins/globe/globe_plugin.cpp +++ b/src/plugins/globe/globe_plugin.cpp @@ -767,7 +767,7 @@ void GlobePlugin::setupProxy() qputenv( "OSGEARTH_CURL_PROXYAUTH", auth.toLocal8Bit() ); } //TODO: settings.value("/proxyType") - //TODO: URL exlusions + //TODO: URL exclusions osgEarth::HTTPClient::setProxySettings( proxySettings ); } settings.endGroup(); diff --git a/src/plugins/grass/qtermwidget/kprocess.h b/src/plugins/grass/qtermwidget/kprocess.h index ac79ee047e4..d9dd4f62d22 100644 --- a/src/plugins/grass/qtermwidget/kprocess.h +++ b/src/plugins/grass/qtermwidget/kprocess.h @@ -207,7 +207,7 @@ public: * respective functions provided by QProcess. * * If KProcess determines that the command does not really need a - * shell, it will trasparently execute it without one for performance + * shell, it will transparently execute it without one for performance * reasons. * * This function must be called before starting the process, obviously. diff --git a/src/plugins/grass/scripts/v.class.mlpy.qgis.py b/src/plugins/grass/scripts/v.class.mlpy.qgis.py index 34e0f98ea63..f44c101de3c 100644 --- a/src/plugins/grass/scripts/v.class.mlpy.qgis.py +++ b/src/plugins/grass/scripts/v.class.mlpy.qgis.py @@ -197,7 +197,7 @@ def fatal_noEnoughColumns(mapName, ncols, required): def fatal_noClassColumn(mapName, columnName): grass.fatal(_("Vector map <%(map)s> does not have" - " the column <%(col)s> cointaining class") + " the column <%(col)s> containing class") % {'map': mapName, 'col': columnName}) diff --git a/src/providers/grass/qgsgrassvectormaplayer.cpp b/src/providers/grass/qgsgrassvectormaplayer.cpp index b025fbed3d9..f70043c455b 100644 --- a/src/providers/grass/qgsgrassvectormaplayer.cpp +++ b/src/providers/grass/qgsgrassvectormaplayer.cpp @@ -673,7 +673,7 @@ void QgsGrassVectorMapLayer::addColumn( const QgsField &field, QString &error ) return; } } - else // the table alread exists + else // the table already exists { QString type = field.typeName(); if ( type == QLatin1String( "varchar" ) ) diff --git a/src/quickgui/plugin/qgsquickfeatureform.qml b/src/quickgui/plugin/qgsquickfeatureform.qml index 84c3c92d5e9..f470f1d2201 100644 --- a/src/quickgui/plugin/qgsquickfeatureform.qml +++ b/src/quickgui/plugin/qgsquickfeatureform.qml @@ -85,7 +85,7 @@ Item { property QgsQuick.Project project /** - * The function used for a component loader to find qml edit widget componets used in form. + * The function used for a component loader to find qml edit widget components used in form. */ property var loadWidgetFn: QgsQuick.Utils.getEditorComponentSource diff --git a/tests/src/analysis/testqgsmeshcalculator.cpp b/tests/src/analysis/testqgsmeshcalculator.cpp index ce0f7d79625..4f587a4656f 100644 --- a/tests/src/analysis/testqgsmeshcalculator.cpp +++ b/tests/src/analysis/testqgsmeshcalculator.cpp @@ -219,7 +219,7 @@ void TestQgsMeshCalculator::calcWithLayers() QgsRectangle extent( 783235, 3348110, 783350, 3347960 ); QTemporaryFile tmpFile; - tmpFile.open(); // fileName is no avialable until open + tmpFile.open(); // fileName is not available until open QString tmpName = tmpFile.fileName(); tmpFile.close(); diff --git a/tests/src/analysis/testqgsrastercalculator.cpp b/tests/src/analysis/testqgsrastercalculator.cpp index 5ae4f3160af..04fff6afab1 100644 --- a/tests/src/analysis/testqgsrastercalculator.cpp +++ b/tests/src/analysis/testqgsrastercalculator.cpp @@ -459,7 +459,7 @@ void TestQgsRasterCalculator::calcWithLayers() QgsRectangle extent( 783235, 3348110, 783350, 3347960 ); QTemporaryFile tmpFile; - tmpFile.open(); // fileName is no avialable until open + tmpFile.open(); // fileName is not available until open QString tmpName = tmpFile.fileName(); tmpFile.close(); diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp index 8e3705ec486..0186bea5cbc 100644 --- a/tests/src/core/testqgsgeometry.cpp +++ b/tests/src/core/testqgsgeometry.cpp @@ -6696,7 +6696,7 @@ void TestQgsGeometry::triangle() QVERIFY( !t1.exteriorRing() ); QVERIFY( !t1.interiorRing( 0 ) ); - // degenarate triangles + // degenerate triangles QgsTriangle invalid( QgsPointXY( 0, 0 ), QgsPointXY( 0, 0 ), QgsPointXY( 10, 10 ) ); QVERIFY( !invalid.isEmpty() ); invalid = QgsTriangle( QPointF( 0, 0 ), QPointF( 0, 0 ), QPointF( 10, 10 ) ); diff --git a/tests/src/core/testqgsrasterfilewriter.cpp b/tests/src/core/testqgsrasterfilewriter.cpp index 80ba6963bec..18bc2f68fc8 100644 --- a/tests/src/core/testqgsrasterfilewriter.cpp +++ b/tests/src/core/testqgsrasterfilewriter.cpp @@ -125,7 +125,7 @@ bool TestQgsRasterFileWriter::writeTest( const QString &rasterName ) // I don't see any method to get only a name without opening file QTemporaryFile tmpFile; - tmpFile.open(); // fileName is no avialable until open + tmpFile.open(); // fileName is not available until open QString tmpName = tmpFile.fileName(); tmpFile.close(); // do not remove when class is destroyd so that we can read the file and see difference diff --git a/tests/src/python/test_qgsrasterfilewriter.py b/tests/src/python/test_qgsrasterfilewriter.py index e8b724ae466..fe92646a6f8 100644 --- a/tests/src/python/test_qgsrasterfilewriter.py +++ b/tests/src/python/test_qgsrasterfilewriter.py @@ -48,7 +48,7 @@ class TestQgsRasterFileWriter(unittest.TestCase): provider = rasterLayer.dataProvider() tmpFile = QTemporaryFile() - tmpFile.open() # fileName is no avialable until open + tmpFile.open() # fileName is not available until open tmpName = tmpFile.fileName() tmpFile.close() # do not remove when class is destroyed so that we can read