[GRASS-SVN] r69532 - in grass/branches/releasebranch_7_0: db/drivers/dbf db/drivers/mysql db/drivers/postgres general/g.parser gui/wxpython/gcp gui/wxpython/gmodeler gui/wxpython/mapwin lib/gis lib/init lib/rst/interp_float locale/po ps/ps.map raster/r.out.mat raster/r.reclass raster/r.statistics raster/r.surf.area raster3d/r3.in.v5d raster3d/r3.out.v5d scripts/db.droptable vector/v.label.sa vector/v.out.vtk vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Sep 19 03:30:49 PDT 2016
Author: martinl
Date: 2016-09-19 03:30:49 -0700 (Mon, 19 Sep 2016)
New Revision: 69532
Modified:
grass/branches/releasebranch_7_0/db/drivers/dbf/dbfexe.c
grass/branches/releasebranch_7_0/db/drivers/mysql/execute.c
grass/branches/releasebranch_7_0/db/drivers/postgres/execute.c
grass/branches/releasebranch_7_0/general/g.parser/g.parser.html
grass/branches/releasebranch_7_0/general/g.parser/test.pl
grass/branches/releasebranch_7_0/general/g.parser/test.py
grass/branches/releasebranch_7_0/general/g.parser/test.sh
grass/branches/releasebranch_7_0/gui/wxpython/gcp/g.gui.gcp.html
grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/g.gui.gmodeler.html
grass/branches/releasebranch_7_0/gui/wxpython/mapwin/base.py
grass/branches/releasebranch_7_0/lib/gis/gislib.dox
grass/branches/releasebranch_7_0/lib/gis/strings.c
grass/branches/releasebranch_7_0/lib/init/clean_temp.c
grass/branches/releasebranch_7_0/lib/init/variables.html
grass/branches/releasebranch_7_0/lib/rst/interp_float/interp2d.c
grass/branches/releasebranch_7_0/locale/po/grasslibs_ar.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_cs.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_de.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_el.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_es.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_fi.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_fr.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_it.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_ja.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_ko.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_lv.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_ml.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_pl.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_pt.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_pt_br.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_ro.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_ru.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_sl.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_th.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_tr.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_vi.po
grass/branches/releasebranch_7_0/locale/po/grasslibs_zh.po
grass/branches/releasebranch_7_0/ps/ps.map/ps.map.html
grass/branches/releasebranch_7_0/ps/ps.map/vector.h
grass/branches/releasebranch_7_0/raster/r.out.mat/main.c
grass/branches/releasebranch_7_0/raster/r.reclass/r.reclass.html
grass/branches/releasebranch_7_0/raster/r.statistics/r.statistics.html
grass/branches/releasebranch_7_0/raster/r.surf.area/r.surf.area.html
grass/branches/releasebranch_7_0/raster3d/r3.in.v5d/v5d.h
grass/branches/releasebranch_7_0/raster3d/r3.out.v5d/v5d.h
grass/branches/releasebranch_7_0/scripts/db.droptable/db.droptable.html
grass/branches/releasebranch_7_0/vector/v.label.sa/main.c
grass/branches/releasebranch_7_0/vector/v.out.vtk/v.out.vtk.html
grass/branches/releasebranch_7_0/vector/v.vol.rst/user3.c
grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html
Log:
Patch for spelling errors, prepared by sebastic (see #3163) (relbr70: merge r69528 from trunk)
Modified: grass/branches/releasebranch_7_0/db/drivers/dbf/dbfexe.c
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/dbf/dbfexe.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/db/drivers/dbf/dbfexe.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -113,7 +113,7 @@
ncols = st->nCol;
if (st->command == SQLP_INSERT || st->command == SQLP_SELECT
|| st->command == SQLP_UPDATE || st->command == SQLP_DROP_COLUMN) {
- if (ncols > 0) { /* colums were specified */
+ if (ncols > 0) { /* columns were specified */
cols = (int *)G_malloc(ncols * sizeof(int));
for (i = 0; i < ncols; i++) {
cols[i] = find_column(tab, st->Col[i].s);
Modified: grass/branches/releasebranch_7_0/db/drivers/mysql/execute.c
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/mysql/execute.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/db/drivers/mysql/execute.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -30,7 +30,7 @@
* escape ' by another ' and the string passed to the driver is \''
* MySQL converts \' to ' but second ' remains not escaped and
* result is error.
- * Because of this, all occurencies of \ in sql must be
+ * Because of this, all occurrences of \ in sql must be
* escaped by \ */
str = G_str_replace(db_get_string(sql), "\\", "\\\\");
Modified: grass/branches/releasebranch_7_0/db/drivers/postgres/execute.c
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/postgres/execute.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/db/drivers/postgres/execute.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -30,7 +30,7 @@
* text contains string \' GRASS modules escape ' by another ' and
* string passed to driver is \'' postgres takes \' as ' but
* second ' remains not escaped, result is error. Because of
- * this, all occurencies of \ in sql are escaped by \ */
+ * this, all occurrences of \ in sql are escaped by \ */
str = G_str_replace(db_get_string(sql), "\\", "\\\\");
G_debug(3, "db__driver_execute_immediate(): Escaped SQL: '%s'", str);
Modified: grass/branches/releasebranch_7_0/general/g.parser/g.parser.html
===================================================================
--- grass/branches/releasebranch_7_0/general/g.parser/g.parser.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/general/g.parser/g.parser.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -338,7 +338,7 @@
<div class="code"><pre>
#!/usr/bin/env python
-# g.parser demo script for python programing
+# g.parser demo script for python programming
#%module
#% description: g.parser test script (python)
@@ -402,7 +402,7 @@
<div class="code"><pre>
#!/bin/sh
-# g.parser demo script for shell programing
+# g.parser demo script for shell programming
#%module
#% description: g.parser test script (shell)
Modified: grass/branches/releasebranch_7_0/general/g.parser/test.pl
===================================================================
--- grass/branches/releasebranch_7_0/general/g.parser/test.pl 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/general/g.parser/test.pl 2016-09-19 10:30:49 UTC (rev 69532)
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
use strict;
-# g.parser demo script for perl programing
+# g.parser demo script for perl programming
#%module
#% description: g.parser test script (perl)
Modified: grass/branches/releasebranch_7_0/general/g.parser/test.py
===================================================================
--- grass/branches/releasebranch_7_0/general/g.parser/test.py 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/general/g.parser/test.py 2016-09-19 10:30:49 UTC (rev 69532)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# g.parser demo script for python programing
+# g.parser demo script for python programming
#%module
#% description: g.parser test script (python)
Modified: grass/branches/releasebranch_7_0/general/g.parser/test.sh
===================================================================
--- grass/branches/releasebranch_7_0/general/g.parser/test.sh 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/general/g.parser/test.sh 2016-09-19 10:30:49 UTC (rev 69532)
@@ -1,6 +1,6 @@
#!/bin/sh
-# g.parser demo script for shell programing
+# g.parser demo script for shell programming
#%module
#% description: g.parser test script (shell)
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gcp/g.gui.gcp.html
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gcp/g.gui.gcp.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gcp/g.gui.gcp.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -11,7 +11,7 @@
The <b>GCP Manager</b> provides an interactive graphical interface to
manage and analyze Ground Control Points. A backup copy of the initial
POINTS file is always maintained and updated only on request (Save GCPs
-to POINTS file). This guarantees that accidential changes are not
+to POINTS file). This guarantees that accidental changes are not
permanent and can be undone by reloading the Ground Control Points.
<p>
Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/g.gui.gmodeler.html
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/g.gui.gmodeler.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/g.gui.gmodeler.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -246,7 +246,7 @@
administrative region in Slovakia using <tt>precip</tt> raster data
from
<a href="https://grass.osgeo.org/uploads/grass/sampledata/slovakia3d_grass7.tar.gz">
-Slovakia precipitation dataset</a> and administration boudaries of Slovakia from
+Slovakia precipitation dataset</a> and administration boundaries of Slovakia from
<a href="https://www.geoportal.sk/sk/zbgis_smd/na-stiahnutie/">Slovak Geoportal</a>
(only with a few clicks).
Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapwin/base.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapwin/base.py 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapwin/base.py 2016-09-19 10:30:49 UTC (rev 69532)
@@ -207,7 +207,7 @@
Call event.Skip() in handler to allow default processing in MapWindow.
- If any error occures inside of handler, the handler is removed.
+ If any error occurs inside of handler, the handler is removed.
Before handler is unregistered it is called with
string value "unregistered" of event parameter.
Modified: grass/branches/releasebranch_7_0/lib/gis/gislib.dox
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/gislib.dox 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/lib/gis/gislib.dox 2016-09-19 10:30:49 UTC (rev 69532)
@@ -1135,7 +1135,7 @@
- G_strchg()
-Replace all occurencies of character in string with new.
+Replace all occurrences of character in string with new.
This next routine copies a string to allocated memory.
Modified: grass/branches/releasebranch_7_0/lib/gis/strings.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/strings.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/lib/gis/strings.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -148,7 +148,7 @@
}
/*!
- \brief Replace all occurencies of character in string bug with new
+ \brief Replace all occurrences of character in string bug with new
\param[in,out] bug base string
\param character character to replace
@@ -169,7 +169,7 @@
}
/*!
- \brief Replace all occurencies of old_str in buffer with new_str
+ \brief Replace all occurrences of old_str in buffer with new_str
Code example:
\code
Modified: grass/branches/releasebranch_7_0/lib/init/clean_temp.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/clean_temp.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/lib/init/clean_temp.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -61,7 +61,7 @@
G_snprintf(buf, BUF_MAX, "%s/%s", pathname,
cur_entry->d_name)) >= BUF_MAX)
G_fatal_error
- ("clean_temp: exceeded maximum pathname length %d, got %d, should'nt happen",
+ ("clean_temp: exceeded maximum pathname length %d, got %d, shouldn't happen",
BUF_MAX, pathlen);
if (stat(buf, &info) != 0) {
Modified: grass/branches/releasebranch_7_0/lib/init/variables.html
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/variables.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/lib/init/variables.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -235,7 +235,7 @@
path to bourne shell interpreter used to run shell scripts.</dd>
<dt>GRASS_SIGSEGV_ON_ERROR</dt>
- <dd>Raise SIGSEGV if an error occures]<br>
+ <dd>Raise SIGSEGV if an error occurs]<br>
This variable can be set for debugging purpose. The call
of G_fatal_error() will end in a segmentation violation. GDB can be used
to trace the source of the error.</dd>
Modified: grass/branches/releasebranch_7_0/lib/rst/interp_float/interp2d.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/rst/interp_float/interp2d.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/lib/rst/interp_float/interp2d.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -230,7 +230,7 @@
if (!once) {
once = 1;
G_warning(_("Overshoot - increase in tension suggested. "
- "Overshoot occures at (%d,%d) cell. "
+ "Overshoot occurs at (%d,%d) cell. "
"Z-value %f, zmin %f, zmax %f."),
l, k, zz, zmin, zmax);
}
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_ar.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_ar.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_ar.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7358,7 +7358,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_cs.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_cs.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_cs.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7427,7 +7427,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_de.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_de.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_de.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7409,7 +7409,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
"Overshoot - Erhöhung der Spannung empfohlen. Overshoot bei Zelle (%d,%d). Z-"
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_el.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_el.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_el.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7471,7 +7471,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_es.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_es.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_es.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -6970,7 +6970,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
-msgid "Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) cell. Z-value %f, zmin %f, zmax %f."
+msgid "Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) cell. Z-value %f, zmin %f, zmax %f."
msgstr "Sobrepico o rebasamiento- Se sugiere un aumento en la tensión. El sobrepico ocurre en las celdas (%d,%d). Valor-Z %f, zmin %f, zmax %f."
#: ../lib/rst/interp_float/resout2d.c:77
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_fi.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_fi.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_fi.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7048,7 +7048,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_fr.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_fr.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_fr.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7634,7 +7634,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
"Dépassement - augmentation de la tension suggérée. Le dépassement se produit "
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_it.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_it.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_it.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7539,7 +7539,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
"Overshoot - si suggerisce un aumento della tensione. L'overshoot avviene "
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_ja.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_ja.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_ja.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7423,7 +7423,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
"オーバーシュート - 張力が増加しています.オーバーシュートは次のところで起こっ"
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_ko.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_ko.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_ko.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7233,7 +7233,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_lv.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_lv.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_lv.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7317,7 +7317,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_ml.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_ml.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_ml.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7179,7 +7179,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_pl.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_pl.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_pl.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7377,7 +7377,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
"Przestrzelenie - zwiększenie parametru 'tension' może pomóc. Przestrzelenie "
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_pt.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_pt.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_pt.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7439,7 +7439,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
"Estimativa por excesso - aumento na tensão sugerida. Estimativa por excesso "
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_pt_br.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_pt_br.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_pt_br.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7424,7 +7424,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_ro.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_ro.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_ro.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7177,7 +7177,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_ru.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_ru.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_ru.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7443,7 +7443,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_sl.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_sl.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_sl.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7412,7 +7412,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_th.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_th.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_th.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7420,7 +7420,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_tr.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_tr.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_tr.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7360,7 +7360,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_vi.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_vi.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_vi.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7459,7 +7459,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/locale/po/grasslibs_zh.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grasslibs_zh.po 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/locale/po/grasslibs_zh.po 2016-09-19 10:30:49 UTC (rev 69532)
@@ -7433,7 +7433,7 @@
#: ../lib/rst/interp_float/interp2d.c:232
#, c-format
msgid ""
-"Overshoot - increase in tension suggested. Overshoot occures at (%d,%d) "
+"Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) "
"cell. Z-value %f, zmin %f, zmax %f."
msgstr ""
Modified: grass/branches/releasebranch_7_0/ps/ps.map/ps.map.html
===================================================================
--- grass/branches/releasebranch_7_0/ps/ps.map/ps.map.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/ps/ps.map/ps.map.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -1440,7 +1440,7 @@
<p><em>width</em> is the width in inches of the color symbol (for lines)
in front of the legend text. The default is 1/24 * fontsize inches.
<p><em>cols</em> is the number of columns to split the legend into. The
-default is one column. The maximum number of colums is 10, or equal
+default is one column. The maximum number of columns is 10, or equal
to the number of legend entries if there are less than 10 entries.
<p><em>span</em> is the column separation distance between the left edges of
two columns in a multicolumn legend. It is given in inches.
Modified: grass/branches/releasebranch_7_0/ps/ps.map/vector.h
===================================================================
--- grass/branches/releasebranch_7_0/ps/ps.map/vector.h 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/ps/ps.map/vector.h 2016-09-19 10:30:49 UTC (rev 69532)
@@ -102,7 +102,7 @@
int fontsize; /* legend font size */
char *font; /* legend font */
double width; /* width of legend symbols */
- int cols; /* number of colums */
+ int cols; /* number of columns */
PSCOLOR border; /* border color */
double span; /* column separation in inches */
LAYER *layer;
Modified: grass/branches/releasebranch_7_0/raster/r.out.mat/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.mat/main.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/raster/r.out.mat/main.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -216,7 +216,7 @@
fwrite(&format_block, sizeof(int), 1, fp1);
/* fprintf(stderr, "bounds data format is [%04ld]\n", format_block); */
- /* 4 byte number of rows , 4 byte number of colums */
+ /* 4 byte number of rows , 4 byte number of columns */
fwrite(&mrows, sizeof(int), 1, fp1);
fwrite(&ncols, sizeof(int), 1, fp1);
Modified: grass/branches/releasebranch_7_0/raster/r.reclass/r.reclass.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.reclass/r.reclass.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/raster/r.reclass/r.reclass.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -31,7 +31,7 @@
<p><em>r.reclass</em> only works on an <i>integer</i> input raster map; if the
input map is instead floating point data, you must multiply the input data by some
-factor to acheive whole number input data, otherwise <em>r.reclass</em> will round
+factor to achieve whole number input data, otherwise <em>r.reclass</em> will round
the raster values down to the next integer.
<p>Also note that although the user can generate a <em>r.reclass</em> map
Modified: grass/branches/releasebranch_7_0/raster/r.statistics/r.statistics.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.statistics/r.statistics.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/raster/r.statistics/r.statistics.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -29,7 +29,7 @@
The calculations will be performed on each area of data of the
cover layers which fall within each unique value, or category, of the base layer.
-<p>Setting the <em>-c</em> flag the category lables of the covering raster
+<p>Setting the <em>-c</em> flag the category labels of the covering raster
layer will be used. This is nice to avoid the GRASS limitation to integer
in raster maps because using category values floating point numbers can be
stored.
Modified: grass/branches/releasebranch_7_0/raster/r.surf.area/r.surf.area.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.surf.area/r.surf.area.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/raster/r.surf.area/r.surf.area.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -36,7 +36,7 @@
<p><em>r.surf.area</em> works best when the surface being evaluated
extends to the edges of the current region and the cell resolution is
small. Surfaces which are especially long and thin and have highly
-irregular boudaries will tend to have underestimated surface areas.
+irregular boundaries will tend to have underestimated surface areas.
Setting a high cell resolution (small area) will greatly reduce this
impact, but will cause longer processing times.
Modified: grass/branches/releasebranch_7_0/raster3d/r3.in.v5d/v5d.h
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.v5d/v5d.h 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.v5d/v5d.h 2016-09-19 10:30:49 UTC (rev 69532)
@@ -186,7 +186,7 @@
ProjArgs[0] = North bound, Y coordinate of grid row 0
ProjArgs[1] = West bound, X coordiante of grid column 0
ProjArgs[2] = Increment between rows
- ProjArgs[3] = Increment between colums
+ ProjArgs[3] = Increment between columns
NOTES: X coordinates increase to the right, Y increase upward.
NOTES: Coordinate system is right-handed.
ELSE IF Projection==1 THEN
Modified: grass/branches/releasebranch_7_0/raster3d/r3.out.v5d/v5d.h
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.v5d/v5d.h 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.v5d/v5d.h 2016-09-19 10:30:49 UTC (rev 69532)
@@ -186,7 +186,7 @@
ProjArgs[0] = North bound, Y coordinate of grid row 0
ProjArgs[1] = West bound, X coordiante of grid column 0
ProjArgs[2] = Increment between rows
- ProjArgs[3] = Increment between colums
+ ProjArgs[3] = Increment between columns
NOTES: X coordinates increase to the right, Y increase upward.
NOTES: Coordinate system is right-handed.
ELSE IF Projection==1 THEN
Modified: grass/branches/releasebranch_7_0/scripts/db.droptable/db.droptable.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/db.droptable/db.droptable.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/scripts/db.droptable/db.droptable.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -9,7 +9,7 @@
<em>db.droptable</em> is a front-end
to <em><a href="db.execute.html">db.execute</a></em> to allow easier
usage. To some extent it is verified if the table is connected to a
-vector map to avoid accidential table removal.
+vector map to avoid accidental table removal.
<h2>EXAMPLES</h2>
Modified: grass/branches/releasebranch_7_0/vector/v.label.sa/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.label.sa/main.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/vector/v.label.sa/main.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -168,7 +168,7 @@
label_candidate_overlap(labels, n_labels);
/* 3. position selection */
simulate_annealing(labels, n_labels, &p);
- /* write lables to file */
+ /* write labels to file */
fprintf(stderr, "Writing labels to file: ...");
labelf = G_fopen_new("paint/labels", p.labels->answer);
for (i = 0; i < n_labels; i++) {
Modified: grass/branches/releasebranch_7_0/vector/v.out.vtk/v.out.vtk.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.vtk/v.out.vtk.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/vector/v.out.vtk/v.out.vtk.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -29,7 +29,7 @@
Note that you can easily convert your 2d vectors into 3d vectors with v.drape.
<br>
<br>
-Because of the 32bit limits of OpenGL which is used by VTK, visualisation errors may occure if
+Because of the 32bit limits of OpenGL which is used by VTK, visualisation errors may occur if
the grass region contains coordinates greater than 1.000.000 and vector coordinates
with 0.01 - 0.001 meters precisison. For this reason, the flag "-c" was added. The coordinates are
transformed to smaller coordinates (by decreasing the coordinates with the region center).
Modified: grass/branches/releasebranch_7_0/vector/v.vol.rst/user3.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/user3.c 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/user3.c 2016-09-19 10:30:49 UTC (rev 69532)
@@ -520,7 +520,7 @@
fprintf(stderr,
"Overshoot -- increase in tension suggested.\n");
fprintf(stderr,
- "Overshoot occures at (%d,%d,%d) cell\n",
+ "Overshoot occurs at (%d,%d,%d) cell\n",
l, k, i);
fprintf(stderr,
"The w-value is %lf, wmin is %lf,wmax is %lf\n",
Modified: grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html 2016-09-19 10:30:10 UTC (rev 69531)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html 2016-09-19 10:30:49 UTC (rev 69532)
@@ -117,7 +117,7 @@
The module <a href="v.in.db.html">v.in.db</a> can be used to generate
a 3D vector map from a table containing x,y,z columns.
-Also, the input data should be in a projected coodinate system, such as
+Also, the input data should be in a projected coordinate system, such as
Univeral Transverse Mercator. The module does not appear to have support for
geographic (Lat/Long) coordinates as of May 2009.
More information about the grass-commit
mailing list