Skip to content

Commit

Permalink
Spelling check: Replace analyse by analyze
Browse files Browse the repository at this point in the history
  • Loading branch information
DelazJ authored and 3nids committed Jul 2, 2017
1 parent 8d6af77 commit 450eb7c
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion python/plugins/db_manager/db_plugins/oracle/connector.py
Expand Up @@ -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:
Expand Down
Expand Up @@ -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
2 changes: 1 addition & 1 deletion resources/cpt-city-qgis-min/saga/DESC.xml
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion scripts/spell_check/spell_test.sh
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion scripts/spell_check/spelling.dat
Expand Up @@ -460,7 +460,7 @@ analagous:analogous
analitic:analytic
analogeous:analogous
analysator:analyzer
analysies:analyses
analysies:analyzes
anarchim:anarchism
anarchistm:anarchism
anbd:and
Expand Down
2 changes: 1 addition & 1 deletion scripts/verify-indentation.sh
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgssnappinglayertreemodel.cpp
Expand Up @@ -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++ )
Expand Down
2 changes: 1 addition & 1 deletion src/core/gps/tok.c
Expand Up @@ -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, ... )
{
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgspgnewconnectionbase.ui
Expand Up @@ -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;
Expand Down

0 comments on commit 450eb7c

Please sign in to comment.