spelling fixes

qgis · Jan 12, 2017 · 6c74e4e · 6c74e4e
1 parent 46f786e
commit 6c74e4e
Show file tree

Hide file tree

Showing 168 changed files with 245 additions and 241 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -451,7 +451,7 @@ IF (WIN32)
     SET (DEFAULT_BIN_SUBDIR bin)
     SET (DEFAULT_CGIBIN_SUBDIR bin)
     # put all the build products into a single directory
-    # under build (doesnt affect install target) to make for
+    # under build (doesn't affect install target) to make for
     # easier debugging.
 
     # Turn on defines for non standard maths stuff

diff --git a/INSTALL b/INSTALL
@@ -753,7 +753,7 @@ to get versions that match your current Qt installed version.
       ===========================
 
 /!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
-successfull install, they're not needed anymore.
+successful install, they're not needed anymore.
 
 
     4.2.5. git

diff --git a/NEWS b/NEWS
@@ -1063,7 +1063,7 @@ features for you.
 
 Probably the biggest new feature is the addition of the new vector symbology
 infrastructure. This is provided alongside the old implementation - you can
-switch using a button in the vector layer properties dialog. It does't replace
+switch using a button in the vector layer properties dialog. It doesn't replace
 the old symbology implementation completely yet because there are various isues
 that need to be resolved and a large amount of testinhen it is considered
 ready.
@@ -1926,13 +1926,13 @@ Complete buffering so that bar as well as text will be visible on both
 
 Fix for bug [ 973922 ] Overview shows layers in wrong order
 
-Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
+Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
 
 Added setZOrder which will be used in next commit to fix projectio zorder problem
 
 2004-06-20 [ts] 0.3.0devel43
 
-Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
+Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
 
 2004-06-19 [ts] 0.3.0devel42
 
@@ -1947,8 +1947,8 @@ Added an option for setting the length of the scale bar to closest
 Win32 support for package path - which will hopefully ensure pyramid and overview mini 
    icons are displayed on legend entry now.
 
-Beginnings of generic vector file writer - incomplete and doesnt do anything useful 
-   yet except has abilty to make a shapefile with a couple of user defined fields e.g. 
+Beginnings of generic vector file writer - incomplete and doesn't do anything useful 
+   yet except has ability to make a shapefile with a couple of user defined fields e.g. 
    to create a new point shapefile:
 
    QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
@@ -2394,7 +2394,7 @@ updated German translation
 !! otherwise it's not detected by the plugins autogen.sh (more exactly
 !! aclocal)
 !! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
-!! autogen.sh. But be carefull not to commit that to CVS
+!! autogen.sh. But be careful not to commit that to CVS
 
 2004-04-18 [jobi] 0.1.0devel33
 Added internationalisations stuff
@@ -2408,7 +2408,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves
    grayscale
 
 2004-04-06 [ts] 0.1.0devel31
-Added new plugin (grid_maker) to build arbitary sized graticules and add
+Added new plugin (grid_maker) to build arbitrary sized graticules and add
    them to the current map view.
 
 2004-04-05 [jobi] 0.1.0devel30

diff --git a/ci/travis/check_spelling.sh b/ci/travis/check_spelling.sh
@@ -11,6 +11,5 @@ if [[ !  -z  $TRAVIS_PULL_REQUEST_BRANCH  ]]; then
   echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
   FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' )
 fi
-
-./scripts/chkspelling_ag.sh $FILES
 
+./scripts/spell_check/check_spelling.sh -r $FILES
diff --git a/cmake/FindPyQt4.cmake b/cmake/FindPyQt4.cmake
@@ -12,7 +12,7 @@
 # This file defines the following variables:
 #
 # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
-#     suitable for comparision as a string
+#     suitable for comparison as a string
 #
 # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
 #

diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake
@@ -12,7 +12,7 @@
 # This file defines the following variables:
 #
 # PYQT5_VERSION - The version of PyQt5 found expressed as a 6 digit hex number
-#     suitable for comparision as a string
+#     suitable for comparison as a string
 #
 # PYQT5_VERSION_STR - The version of PyQt5 as a human readable string.
 #

diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake
@@ -9,7 +9,7 @@
 # This file defines the following variables:
 #
 # SIP_VERSION - The version of SIP found expressed as a 6 digit hex number
-#     suitable for comparision as a string.
+#     suitable for comparison as a string.
 #
 # SIP_VERSION_STR - The version of SIP found as a human readable string.
 #

diff --git a/debian/changelog b/debian/changelog
@@ -279,7 +279,7 @@ qgis (1.3.0) UNRELEASED; urgency=low
 
   * new upstream release
   * add analysis library and raster terrain analysis plugin
-  * alternativly depend on libgdal1-1.6.0-grass
+  * alternatively depend on libgdal1-1.6.0-grass
   * include CONTRIBUTORS, TRANSLATORS and DONORS
   * reverse order of libgdal1-*-grass dependencies
 

diff --git a/doc/INSTALL.html b/doc/INSTALL.html
@@ -1094,7 +1094,7 @@ <H4>4.2.4.5. Final python notes</H4>
 
 <P>
 /!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
-successfull install, they're not needed anymore.
+successful install, they're not needed anymore.
 </P>
 
 <H3>4.2.5. git</H3>

diff --git a/doc/msys.t2t b/doc/msys.t2t
@@ -108,7 +108,7 @@ make install
 ==== Final python notes ====
 
 /!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
-successfull install, they're not needed anymore.
+successful install, they're not needed anymore.
 
 === git ===
 

diff --git a/doc/news.html b/doc/news.html
@@ -1192,7 +1192,7 @@ <H1>17. Whats new in Version 1.4.0 'Enceladus'?</H1>
 <P>
 Probably the biggest new feature is the addition of the new vector symbology
 infrastructure. This is provided alongside the old implementation - you can
-switch using a button in the vector layer properties dialog. It does't replace
+switch using a button in the vector layer properties dialog. It doesn't replace
 the old symbology implementation completely yet because there are various isues
 that need to be resolved and a large amount of testinhen it is considered
 ready.
@@ -2099,13 +2099,13 @@ <H1>28. 0.5</H1>
  <P></P>
 Fix for bug [ 973922 ] Overview shows layers in wrong order
  <P></P>
-Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
+Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
  <P></P>
 Added setZOrder which will be used in next commit to fix projectio zorder problem
  <P></P>
 2004-06-20 [ts] 0.3.0devel43
  <P></P>
-Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
+Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
  <P></P>
 2004-06-19 [ts] 0.3.0devel42
  <P></P>
@@ -2120,8 +2120,8 @@ <H1>28. 0.5</H1>
 Win32 support for package path - which will hopefully ensure pyramid and overview mini 
    icons are displayed on legend entry now.
  <P></P>
-Beginnings of generic vector file writer - incomplete and doesnt do anything useful 
-   yet except has abilty to make a shapefile with a couple of user defined fields e.g. 
+Beginnings of generic vector file writer - incomplete and doesn't do anything useful 
+   yet except has ability to make a shapefile with a couple of user defined fields e.g. 
    to create a new point shapefile:
  <P></P>
    QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
@@ -2682,7 +2682,7 @@ <H1>28. 0.5</H1>
 !! otherwise it's not detected by the plugins autogen.sh (more exactly
 !! aclocal)
 !! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
-!! autogen.sh. But be carefull not to commit that to CVS
+!! autogen.sh. But be careful not to commit that to CVS
 </P>
 <P>
 2004-04-18 [jobi] 0.1.0devel33
@@ -2699,7 +2699,7 @@ <H1>28. 0.5</H1>
 </P>
 <P>
 2004-04-06 [ts] 0.1.0devel31
-Added new plugin (grid_maker) to build arbitary sized graticules and add
+Added new plugin (grid_maker) to build arbitrary sized graticules and add
    them to the current map view.
 </P>
 <P>

diff --git a/doc/news.t2t b/doc/news.t2t
@@ -1032,7 +1032,7 @@ features for you.
 
 Probably the biggest new feature is the addition of the new vector symbology
 infrastructure. This is provided alongside the old implementation - you can
-switch using a button in the vector layer properties dialog. It does't replace
+switch using a button in the vector layer properties dialog. It doesn't replace
 the old symbology implementation completely yet because there are various isues
 that need to be resolved and a large amount of testinhen it is considered
 ready.
@@ -1877,13 +1877,13 @@ Complete buffering so that bar as well as text will be visible on both
 
 Fix for bug [ 973922 ] Overview shows layers in wrong order
 
-Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
+Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
 
 Added setZOrder which will be used in next commit to fix projectio zorder problem
 
 2004-06-20 [ts] 0.3.0devel43
 
-Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
+Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
 
 2004-06-19 [ts] 0.3.0devel42
 
@@ -1898,8 +1898,8 @@ Added an option for setting the length of the scale bar to closest
 Win32 support for package path - which will hopefully ensure pyramid and overview mini 
    icons are displayed on legend entry now.
 
-Beginnings of generic vector file writer - incomplete and doesnt do anything useful 
-   yet except has abilty to make a shapefile with a couple of user defined fields e.g. 
+Beginnings of generic vector file writer - incomplete and doesn't do anything useful 
+   yet except has ability to make a shapefile with a couple of user defined fields e.g. 
    to create a new point shapefile:
 
    QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
@@ -2348,7 +2348,7 @@ updated German translation
 !! otherwise it's not detected by the plugins autogen.sh (more exactly
 !! aclocal)
 !! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
-!! autogen.sh. But be carefull not to commit that to CVS
+!! autogen.sh. But be careful not to commit that to CVS
 
 2004-04-18 [jobi] 0.1.0devel33
 Added internationalisations stuff
@@ -2362,7 +2362,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves
    grayscale
 
 2004-04-06 [ts] 0.1.0devel31
-Added new plugin (grid_maker) to build arbitary sized graticules and add
+Added new plugin (grid_maker) to build arbitrary sized graticules and add
    them to the current map view.
 
 2004-04-05 [jobi] 0.1.0devel30

diff --git a/python/analysis/interpolation/NormVecDecorator.sip b/python/analysis/interpolation/NormVecDecorator.sip
@@ -26,7 +26,7 @@ class NormVecDecorator : TriDecorator
     bool estimateFirstDerivatives( QProgressDialog* d = 0 );
     /** Returns a pointer to the normal vector for the point with the number n*/
     Vector3D* getNormal( int n ) const;
-    /** Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', exept if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise*/
+    /** Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', except if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise*/
     bool getTriangle( double x, double y, Point3D* p1 /Out/, Vector3D* v1 /Out/, Point3D* p2 /Out/, Vector3D* v2 /Out/, Point3D* p3 /Out/, Vector3D* v3 /Out/ );
     /** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3)
      * @note not available in Python bindings

diff --git a/python/analysis/openstreetmap/qgsosmimport.sip b/python/analysis/openstreetmap/qgsosmimport.sip
@@ -3,7 +3,7 @@
  * @brief The QgsOSMXmlImport class imports OpenStreetMap XML format to our topological representation
  * in a SQLite database (see QgsOSMDatabase for details).
  *
- * How to use the classs:
+ * How to use the class:
  * 1. set input XML file name and output DB file name (in constructor or with respective functions)
  * 2. run import()
  * 3. check errorString() if the import failed

diff --git a/python/core/auth/qgsauthconfig.sip b/python/core/auth/qgsauthconfig.sip
@@ -121,7 +121,7 @@ class QgsAuthMethodConfig
      * against the config's uri() for auto-selecting authentication configs to use
      * @note Essentially strips the URL query variables, and by default, strips the path as well
      * @param accessurl A URL to process
-     * @param resource Ouput variable for result
+     * @param resource Output variable for result
      * @param withpath Whether to include the URI's path in output
      */
     static bool uriToResource( const QString &accessurl, QString *resource, bool withpath = false );

diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip
@@ -515,7 +515,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
     virtual void setVisibility( const bool visible );
 
     /** Returns whether the item should be excluded from composer exports and prints
-     * @param valueType controls whether the returned value is the user specified vaule,
+     * @param valueType controls whether the returned value is the user specified value,
      * or the current evaluated value (which may be affected by data driven settings).
      * @returns true if item should be excluded
      * @note added in version 2.5
@@ -629,7 +629,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
 
     /** Evaluates an item's bounding rect to consider data defined position and size of item
      * and reference point
-     * @param newRect target bouding rect for item
+     * @param newRect target bounding rect for item
      * @param resizeOnly set to true if the item is only being resized. If true then
      * the position of the returned rect will be adjusted to account for the item's
      * position mode

diff --git a/python/core/qgsnetworkaccessmanager.sip b/python/core/qgsnetworkaccessmanager.sip
@@ -57,7 +57,7 @@ class QgsNetworkAccessManager : QNetworkAccessManager
     //! Get QNetworkRequest::CacheLoadControl from name
     static QNetworkRequest::CacheLoadControl cacheLoadControlFromName( const QString &theName );
 
-    //! Setup the NAM according to the user's settings
+    //! Setup the NAM according to the user's settings #spellok
     void setupDefaultProxyAndCache();
 
     //! return whether the system proxy should be used

diff --git a/python/core/qgspoint.sip b/python/core/qgspoint.sip
@@ -241,7 +241,7 @@ class QgsPoint
     /** Calculates azimuth between this point and other one (clockwise in degree, starting from north) */
     double azimuth( const QgsPoint& other ) const;
 
-    /** Returns a new point which correponds to this point projected by a specified distance
+    /** Returns a new point which corresponds to this point projected by a specified distance
      * in a specified bearing.
      * @param distance distance to project
      * @param bearing angle to project in, clockwise in degrees starting from north

diff --git a/python/core/qgsrenderchecker.sip b/python/core/qgsrenderchecker.sip
@@ -80,7 +80,7 @@ class QgsRenderChecker
     bool runTest( const QString& theTestName, unsigned int theMismatchCount = 0 );
 
     /**
-     * Test using two arbitary images (map renderer will not be used)
+     * Test using two arbitrary images (map renderer will not be used)
      * @param theTestName - to be used as the basis for writing a file to
      * e.g. /tmp/theTestName.png
      * @param theMismatchCount - defaults to 0 - the number of pixels that
@@ -93,9 +93,9 @@ class QgsRenderChecker
     bool compareImages( const QString& theTestName, unsigned int theMismatchCount = 0, const QString& theRenderedImageFile = "" );
     /** Get a list of all the anomalies. An anomaly is a rendered difference
      * file where there is some red pixel content (indicating a render check
-     * mismatch), but where the output was still acceptible. If the render
+     * mismatch), but where the output was still acceptable. If the render
      * diff matches one of these anomalies we will still consider it to be
-     * acceptible.
+     * acceptable.
      * @return a bool indicating if the diff matched one of the anomaly files
      */
     bool isKnownAnomaly( const QString& theDiffImageFile );

diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
@@ -157,7 +157,7 @@ class QgsVectorDataProvider : QgsDataProvider
      * @param substring substring to match (case insensitive)
      * @param limit maxmum number of the values to return, or -1 to return all unique values
      * @param feedback optional feedback object for cancelling request
-     * @returns list of unique strings containg substring
+     * @returns list of unique strings containing substring
      */
     virtual QStringList uniqueStringsMatching( int index, const QString& substring, int limit = -1,
                                                QgsFeedback* feedback = nullptr ) const;

diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -1580,7 +1580,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
     /** Is emitted, when edited changes successfully have been written to the data provider */
     void editingStopped();
 
-    /** Is emitted, before changes are commited to the data provider */
+    /** Is emitted, before changes are committed to the data provider */
     void beforeCommitChanges();
 
     /** Is emitted, before changes are rolled back*/

diff --git a/python/core/qgsvectorlayerfeatureiterator.sip b/python/core/qgsvectorlayerfeatureiterator.sip
@@ -59,12 +59,12 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator
      */
     //void addVirtualAttributes( QgsFeature &f );
 
-    /** Update feature with uncommited attribute updates.
+    /** Update feature with uncommitted attribute updates.
      * @note not available in Python bindings
      */
     //void updateChangedAttributes( QgsFeature& f );
 
-    /** Update feature with uncommited geometry updates.
+    /** Update feature with uncommitted geometry updates.
      * @note not available in Python bindings
      */
     //void updateFeatureGeometry( QgsFeature& f );

diff --git a/python/core/qgsvectorlayertools.sip b/python/core/qgsvectorlayertools.sip
@@ -31,7 +31,7 @@ class QgsVectorLayerTools : QObject
     virtual bool startEditing( QgsVectorLayer* layer ) const = 0;
 
     /**
-     * Will be called, when an editing session is ended and the features should be commited.
+     * Will be called, when an editing session is ended and the features should be committed.
      * Appropriate dialogs should be shown like
      *
      * @param layer       The layer to commit
@@ -41,7 +41,7 @@ class QgsVectorLayerTools : QObject
     virtual bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const = 0;
 
     /**
-     * Should be called, when the features should be commited but the editing session is not ended.
+     * Should be called, when the features should be committed but the editing session is not ended.
      *
      * @param layer       The layer to commit
      * @return            True if successful

diff --git a/python/core/symbology-ng/qgscptcityarchive.sip b/python/core/symbology-ng/qgscptcityarchive.sip
@@ -315,7 +315,7 @@ class QgsCptCityBrowserModel : QAbstractItemModel
     // Refresh item specified by path
     void refresh( const QString& path );
 
-    // Refresh item childs
+    // Refresh item children
     void refresh( const QModelIndex &index = QModelIndex() );
 
     //! return index of a path