Spelling check: Replace analyse by analyze

DelazJ · 3nids · commit 450eb7c24a99 · 2017-07-02T22:28:50.000+02:00
diff --git a/python/plugins/db_manager/db_plugins/oracle/connector.py b/python/plugins/db_manager/db_plugins/oracle/connector.py
@@ -719,7 +719,7 @@ def getTableType(self, table):
         res = self._fetchall(c)
         c.close()
 
-        # Analyse return values
+        # Analyze return values
         if not res:
             return False
         else:
diff --git a/python/plugins/processing/algs/saga/description/ZonalGridStatistics.txt b/python/plugins/processing/algs/saga/description/ZonalGridStatistics.txt
@@ -2,7 +2,7 @@ Zonal Grid Statistics
 statistics_grid
 ParameterRaster|ZONES|Zone Grid|False
 ParameterMultipleInput|CATLIST|Categorial Grids|3|True
-ParameterMultipleInput|STATLIST|Grids to analyse|3|True
+ParameterMultipleInput|STATLIST|Grids to analyze|3|True
 ParameterRaster|ASPECT|Aspect|True
 ParameterBoolean|SHORTNAMES|Short Field Names|True
 OutputTable|OUTTAB|Zonal Statistics
diff --git a/resources/cpt-city-qgis-min/saga/DESC.xml b/resources/cpt-city-qgis-min/saga/DESC.xml
@@ -3,7 +3,7 @@
   <dir>saga</dir>
   <name>SAGA preset color tables</name>
   <full>
-    SAGA, the system for automated geoscientific analyses, is a
+    SAGA, the system for automated geoscientific analyzes, is a
     sophisticated, portable and open source GUI-driven GIS which
     includes a number of preset color tables.
   </full>
diff --git a/scripts/spell_check/spell_test.sh b/scripts/spell_check/spell_test.sh
@@ -6,7 +6,7 @@ echo "Spell check"
 cd $(git rev-parse --show-toplevel)
 
 if [[ ! -z  $TRAVIS_PULL_REQUEST_BRANCH  ]]; then
-  # if on a PR, just analyse the changed files
+  # if on a PR, just analyze the changed files
   echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
   FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' )
   export PATH=${HOME}/osgeo4travis/bin:${PATH}
diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat
@@ -460,7 +460,7 @@ analagous:analogous
 analitic:analytic
 analogeous:analogous
 analysator:analyzer
-analysies:analyses
+analysies:analyzes
 anarchim:anarchism
 anarchistm:anarchism
 anbd:and
diff --git a/scripts/verify-indentation.sh b/scripts/verify-indentation.sh
@@ -20,7 +20,7 @@ ASTYLEDIFF=/tmp/astyle.diff
 
 
 if [[ ! -z  $TRAVIS_PULL_REQUEST_BRANCH  ]]; then
-  # if on a PR, just analyse the changed files
+  # if on a PR, just analyze the changed files
   echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
   FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' )
 elif [[ ! -z  $TRAVIS_COMMIT_RANGE  ]]; then
diff --git a/src/app/qgssnappinglayertreemodel.cpp b/src/app/qgssnappinglayertreemodel.cpp
@@ -375,7 +375,7 @@ QVariant QgsSnappingLayerTreeModel::data( const QModelIndex &idx, int role ) con
       }
       else
       {
-        // i.e. this is a group, analyse its children
+        // i.e. this is a group, analyze its children
         bool hasChecked = false, hasUnchecked = false;
         int n;
         for ( n = 0; !hasChecked || !hasUnchecked; n++ )
diff --git a/src/core/gps/tok.c b/src/core/gps/tok.c
@@ -133,7 +133,7 @@ int nmea_printf( char *buff, int buff_sz, const char *format, ... )
 }
 
 /**
- * \brief Analyse string (specificate for NMEA sentences)
+ * \brief Analyze string (specificate for NMEA sentences)
  */
 int nmea_scanf( const char *buff, int buff_sz, const char *format, ... )
 {
diff --git a/src/ui/qgspgnewconnectionbase.ui b/src/ui/qgspgnewconnectionbase.ui
@@ -265,7 +265,7 @@
 &lt;body&gt;
 &lt;p&gt;When the layer is setup various metadata is required for the PostGIS table. This includes information such as the table row count, geometry type and spatial extents of the data in the geometry column. If the table contains a large number of rows determining this metadata is time consuming.&lt;/p&gt;
 &lt;p&gt;By activating this option the following fast table metadata operations are done:&lt;/p&gt;
-&lt;p&gt;1) Row count is determined from table statistics obtained from running the PostgreSQL table analyse function.&lt;/p&gt;
+&lt;p&gt;1) Row count is determined from table statistics obtained from running the PostgreSQL table analyze function.&lt;/p&gt;
 &lt;p&gt;2) Table extents are always determined with the estimated_extent PostGIS function even if a layer filter is applied.&lt;/p&gt;
 &lt;p&gt;3) If the table geometry type is unknown and is not exclusively taken from the geometry_columns table, then it is determined from the first 100 non-null geometry rows in the table.&lt;/p&gt;
 &lt;/body&gt;

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ QVariant QgsSnappingLayerTreeModel::data( const QModelIndex &idx, int role ) con`
`375`	`375`	`}`
`376`	`376`	`else`
`377`	`377`	`{`
`378`		`- // i.e. this is a group, analyse its children`
	`378`	`+ // i.e. this is a group, analyze its children`
`379`	`379`	`bool hasChecked = false, hasUnchecked = false;`
`380`	`380`	`int n;`
`381`	`381`	`for ( n = 0; !hasChecked \|\| !hasUnchecked; n++ )`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ int nmea_printf( char buff, int buff_sz, const char format, ... )`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/**`
`136`		`- * \brief Analyse string (specificate for NMEA sentences)`
	`136`	`+ * \brief Analyze string (specificate for NMEA sentences)`
`137`	`137`	`*/`
`138`	`138`	`int nmea_scanf( const char buff, int buff_sz, const char format, ... )`
`139`	`139`	`{`