[grass] 05/08: Drop patches applied upstream.
Bas Couwenberg
sebastic at debian.org
Tue Jan 9 08:40:31 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository grass.
commit cff2ca46c1f43b16765199bc11f4bc8d275931dc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jan 9 07:54:26 2018 +0100
Drop patches applied upstream.
---
debian/changelog | 1 +
debian/patches/appstream.patch | 15 -
debian/patches/series | 2 -
debian/patches/spelling-errors.patch | 1084 ----------------------------------
4 files changed, 1 insertion(+), 1101 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index df2b3f6..811510a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ grass (7.4.0~rc2-1) UNRELEASED; urgency=medium
* Add overrides for dependency-on-python-version-marked-for-end-of-life.
* Bump Standards-Version to 4.1.2, no changes.
* Update copyright years for copyright holders.
+ * Drop patches applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Tue, 09 Jan 2018 07:48:15 +0100
diff --git a/debian/patches/appstream.patch b/debian/patches/appstream.patch
deleted file mode 100644
index 493ca78..0000000
--- a/debian/patches/appstream.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix desktop filename.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/gui/icons/grass.appdata.xml
-+++ b/gui/icons/grass.appdata.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2014 Richard Hughes <richard at hughsie.com> -->
- <component type="desktop">
-- <id>grass.desktop</id>
-+ <id>grass74.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0+</project_license>
- <summary>GRASS GIS, the Open Source Geographic Information System</summary>
diff --git a/debian/patches/series b/debian/patches/series
index 74dbebd..02a59cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
pager
instdir
no-fail-html.patch
-appstream.patch
jquery.patch
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 963c35d..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,1084 +0,0 @@
-Description: Fix spelling errors.
- * complet -> complete
- * meaningfull -> meaningful
- * allows to -> allows <verb>ing
- * refered -> referred
- * bandwith -> bandwidth
- * treshold -> threshold
- * begining -> beginning
- * neigbourhood -> neighbourhood
- * lenght -> length
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/3447
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/71760
-
---- a/vector/v.net.steiner/main.c
-+++ b/vector/v.net.steiner/main.c
-@@ -595,7 +595,7 @@ int main(int argc, char **argv)
- /* Calculate true costs, which may be lower than MST if steiner points were not used */
-
- if (nsp < nterms - 2) {
-- G_message(_("Spanning tree costs on complet graph = %f\n"
-+ G_message(_("Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"),
- cost);
- }
---- a/locale/po/grassmods_ar.po
-+++ b/locale/po/grassmods_ar.po
-@@ -34944,7 +34944,7 @@ msgstr "الخريطة الراستري�
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_cs.po
-+++ b/locale/po/grassmods_cs.po
-@@ -31280,7 +31280,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_de.po
-+++ b/locale/po/grassmods_de.po
-@@ -31250,7 +31250,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_el.po
-+++ b/locale/po/grassmods_el.po
-@@ -31117,7 +31117,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_es.po
-+++ b/locale/po/grassmods_es.po
-@@ -31263,7 +31263,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_fi.po
-+++ b/locale/po/grassmods_fi.po
-@@ -31091,7 +31091,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_fr.po
-+++ b/locale/po/grassmods_fr.po
-@@ -31211,7 +31211,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_it.po
-+++ b/locale/po/grassmods_it.po
-@@ -31201,7 +31201,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_ja.po
-+++ b/locale/po/grassmods_ja.po
-@@ -31163,7 +31163,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_ko.po
-+++ b/locale/po/grassmods_ko.po
-@@ -31997,7 +31997,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_lv.po
-+++ b/locale/po/grassmods_lv.po
-@@ -32485,7 +32485,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_pl.po
-+++ b/locale/po/grassmods_pl.po
-@@ -31235,7 +31235,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_pt.po
-+++ b/locale/po/grassmods_pt.po
-@@ -31144,7 +31144,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_ro.po
-+++ b/locale/po/grassmods_ro.po
-@@ -31165,7 +31165,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_ru.po
-+++ b/locale/po/grassmods_ru.po
-@@ -31219,7 +31219,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_sl.po
-+++ b/locale/po/grassmods_sl.po
-@@ -35209,7 +35209,7 @@ msgstr "Rastrski sloj začetnih točk"
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_th.po
-+++ b/locale/po/grassmods_th.po
-@@ -31066,7 +31066,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_tr.po
-+++ b/locale/po/grassmods_tr.po
-@@ -31140,7 +31140,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_vi.po
-+++ b/locale/po/grassmods_vi.po
-@@ -31065,7 +31065,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_zh.po
-+++ b/locale/po/grassmods_zh.po
-@@ -31075,7 +31075,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/lib/db/sqlp/sqlp.l
-+++ b/lib/db/sqlp/sqlp.l
-@@ -252,7 +252,7 @@ int my_yyinput(char *buf, int max_size)
- /**********************************************************************
- * yyerror
- *
-- * This should be called just before failing. It formats a meaningfull
-+ * This should be called just before failing. It formats a meaningful
- * message and deposits it in a useful place.
- *
- **********************************************************************/
---- a/lib/gpde/n_les_assemble.c
-+++ b/lib/gpde/n_les_assemble.c
-@@ -761,7 +761,7 @@ N_les *N_assemble_les_2d_param(int les_t
- * \brief Integrate Dirichlet or Transmission boundary conditions into the les (2s)
- *
- * Dirichlet and Transmission boundary conditions will be integrated into
-- * the provided linear equation system. This is meaningfull if
-+ * the provided linear equation system. This is meaningful if
- * the les was created with #N_assemble_les_2d_dirichlet, because in
- * this case Dirichlet boundary conditions are not automatically included.
- *
-@@ -1214,7 +1214,7 @@ N_les *N_assemble_les_3d_param(int les_t
- * \brief Integrate Dirichlet or Transmission boundary conditions into the les (3d)
- *
- * Dirichlet and Transmission boundary conditions will be integrated into
-- * the provided linear equation system. This is meaningfull if
-+ * the provided linear equation system. This is meaningful if
- * the les was created with #N_assemble_les_2d_dirichlet, because in
- * this case Dirichlet boundary conditions are not automatically included.
- *
---- a/raster/r.terraflow/main.cpp
-+++ b/raster/r.terraflow/main.cpp
-@@ -125,7 +125,7 @@ parse_args(int argc, char *argv[]) {
- d8cut->label = _("Routing using SFD (D8) direction");
- d8cut->description =
- _("If flow accumulation is larger than this value it is routed using "
-- "SFD (D8) direction (meaningfull only for MFD flow). "
-+ "SFD (D8) direction (meaningful only for MFD flow). "
- "If no answer is given it defaults to infinity.");
-
- /* main memory */
---- a/locale/po/grassmods_id_ID.po
-+++ b/locale/po/grassmods_id_ID.po
-@@ -17996,7 +17996,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_ml.po
-+++ b/locale/po/grassmods_ml.po
-@@ -18060,7 +18060,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_pt_BR.po
-+++ b/locale/po/grassmods_pt_BR.po
-@@ -31146,7 +31146,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_si.po
-+++ b/locale/po/grassmods_si.po
-@@ -18060,7 +18060,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/locale/po/grassmods_uk.po
-+++ b/locale/po/grassmods_uk.po
-@@ -18124,7 +18124,7 @@ msgstr ""
- #: ../vector/v.net.steiner/main.c:598
- #, c-format
- msgid ""
--"Spanning tree costs on complet graph = %f\n"
-+"Spanning tree costs on complete graph = %f\n"
- "(may be higher than resulting Steiner tree costs!!!)"
- msgstr ""
-
---- a/temporal/t.rast.accdetect/t.rast.accdetect.html
-+++ b/temporal/t.rast.accdetect/t.rast.accdetect.html
-@@ -24,7 +24,7 @@ The <b>minimum</b> and <b>maximum</b> va
- process can be set either by using space time raster datasets or
- by using fixed values for all raster cells and time steps.
- <p>
--Using space time raster datasets allows to specify minimum and maximum
-+Using space time raster datasets allows specifying minimum and maximum
- values for each raster cell and each time step. For example, we want to
- detect the germination (minimum value) and harvesting (maximum value)
- dates for different crops in Germany using the growing-degree-day (GDD)
---- a/imagery/i.segment/i.segment.html
-+++ b/imagery/i.segment/i.segment.html
-@@ -1,6 +1,6 @@
- <h2>DESCRIPTION</h2>
- Image segmentation or object recognition is the process of grouping
--similar pixels into unique segments, also refered to as objects.
-+similar pixels into unique segments, also referred to as objects.
- Boundary and region based algorithms are described in the literature,
- currently a region growing and merging algorithm is implemented. Each
- object found during the segmentation process is given a unique ID and
-@@ -126,7 +126,7 @@ than 1 will add one additional pass to t
- final pass, the threshold is ignored for any segments smaller then
- the set size, thus forcing very small segments to merge with their
- most similar neighbor. A minimum segment size larger than 1 is
--recommended when using adaptive bandwith selected with the <b>-a</b>
-+recommended when using adaptive bandwidth selected with the <b>-a</b>
- flag.
-
- <h2>EXAMPLES</h2>
---- a/imagery/i.segment/cluster.c
-+++ b/imagery/i.segment/cluster.c
-@@ -150,7 +150,7 @@ CELL cluster_bands(struct globals *globa
- hspec2ad = hspec2;
-
- if (globals->ms_adaptive) {
-- /* adapt initial range bandwith */
-+ /* adapt initial range bandwidth */
-
- mwrow1 = row - radiusc;
- mwrow2 = mwrow1 + mwnrows;
---- a/imagery/i.segment/mean_shift.c
-+++ b/imagery/i.segment/mean_shift.c
-@@ -193,7 +193,7 @@ int mean_shift(struct globals *globals)
- }
- if (do_adaptive) {
- /* bandwidth is now standard deviation for adaptive bandwidth
-- * using a gaussian function with range bandwith used as
-+ * using a gaussian function with range bandwidth used as
- * bandwidth for the gaussian function
- * the aim is to produce similar but improved results with
- * adaptive bandwidth
-@@ -289,7 +289,7 @@ int mean_shift(struct globals *globals)
- hspecad2 = hspec2;
-
- if (do_adaptive) {
-- /* adapt initial range bandwith */
-+ /* adapt initial range bandwidth */
-
- ka2 = hspec2; /* OTB: conductance parameter */
-
---- a/lib/gmath/solvers_direct.c
-+++ b/lib/gmath/solvers_direct.c
-@@ -120,17 +120,17 @@ int G_math_solver_lu(double **A, double
- * \param A double **
- * \param x double *
- * \param b double *
-- * \param bandwith int -- the bandwith of the band matrix, if unsure set to rows
-+ * \param bandwidth int -- the bandwidth of the band matrix, if unsure set to rows
- * \param rows int
- * \return int -- 1 success
- * */
--int G_math_solver_cholesky(double **A, double *x, double *b, int bandwith,
-+int G_math_solver_cholesky(double **A, double *x, double *b, int bandwidth,
- int rows)
- {
-
- G_message(_("Starting cholesky decomposition solver"));
-
-- if (G_math_cholesky_decomposition(A, rows, bandwith) != 1) {
-+ if (G_math_cholesky_decomposition(A, rows, bandwidth) != 1) {
- G_warning(_("Unable to solve the linear equation system"));
- return -2;
- }
-@@ -206,18 +206,18 @@ void G_math_lu_decomposition(double **A,
-
- /*!
- * \brief cholesky decomposition for symmetric, positiv definite matrices
-- * with bandwith optimization
-+ * with bandwidth optimization
- *
- * The provided matrix will be overwritten with the lower and
- * upper triangle matrix A = LL^T
- *
- * \param A double **
- * \param rows int
-- * \param bandwith int -- the bandwith of the matrix (0 > bandwith <= cols)
-+ * \param bandwidth int -- the bandwidth of the matrix (0 > bandwidth <= cols)
- * \return void
- *
- * */
--int G_math_cholesky_decomposition(double **A, int rows, int bandwith)
-+int G_math_cholesky_decomposition(double **A, int rows, int bandwidth)
- {
-
- int i = 0, j = 0, k = 0;
-@@ -228,10 +228,10 @@ int G_math_cholesky_decomposition(double
-
- int colsize;
-
-- if (bandwith <= 0)
-- bandwith = rows;
-+ if (bandwidth <= 0)
-+ bandwidth = rows;
-
-- colsize = bandwith;
-+ colsize = bandwidth;
-
- for (k = 0; k < rows; k++) {
- #pragma omp parallel for schedule (static) private(i, j, sum_2) shared(A, k) reduction(+:sum_1)
-@@ -246,11 +246,11 @@ int G_math_cholesky_decomposition(double
- A[k][k] = sqrt(A[k][k] - sum_1);
- sum_1 = 0.0;
-
-- if ((k + bandwith) > rows) {
-+ if ((k + bandwidth) > rows) {
- colsize = rows;
- }
- else {
-- colsize = k + bandwith;
-+ colsize = k + bandwidth;
- }
-
- #pragma omp parallel for schedule (static) private(i, j, sum_2) shared(A, k, sum_1, colsize)
---- a/lib/gmath/test/test_gmath_lib.h
-+++ b/lib/gmath/test/test_gmath_lib.h
-@@ -41,7 +41,7 @@ typedef struct
- int cols; /*number of cols */
- int quad; /*is the matrix quadratic (1-quadratic, 0 not)*/
- int type; /*the type of the les, normal == 0, sparse == 1 */
-- int bandwith; /*the bandwith of the matrix (0 < bandwidth <= cols)*/
-+ int bandwidth; /*the bandwidth of the matrix (0 < bandwidth <= cols)*/
- int symm; /*0 if matrix unsymmetric, 1 if symmetric*/
- } G_math_les;
-
-@@ -55,7 +55,7 @@ typedef struct
- int cols; /*number of cols */
- int quad; /*is the matrix quadratic (1-quadratic, 0 not)*/
- int type; /*the type of the les, normal == 0, sparse == 1 */
-- int bandwith; /*the bandwith of the matrix (0 < bandwidth <= cols)*/
-+ int bandwidth; /*the bandwidth of the matrix (0 < bandwidth <= cols)*/
- int symm; /*0 if matrix unsymmetric, 1 if symmetric*/
- } G_math_f_les;
-
---- a/lib/gmath/test/test_tools_les.c
-+++ b/lib/gmath/test/test_tools_les.c
-@@ -205,7 +205,7 @@ G_math_les *G_math_alloc_les_param(int r
- les->rows = rows;
- les->cols = cols;
- les->symm = 0;
-- les->bandwith = cols;
-+ les->bandwidth = cols;
- if (rows == cols)
- les->quad = 1;
- else
-@@ -268,7 +268,7 @@ G_math_f_les *G_math_alloc_f_les_param(i
- les->rows = rows;
- les->cols = cols;
- les->symm = 0;
-- les->bandwith = cols;
-+ les->bandwidth = cols;
- if (rows == cols)
- les->quad = 1;
- else
---- a/gui/wxpython/iscatt/dialogs.py
-+++ b/gui/wxpython/iscatt/dialogs.py
-@@ -369,7 +369,7 @@ class SettingsDialog(wx.Dialog):
- col[0], col[1], col[2], 255))
-
- self.sizeSetts = {
-- "snap_tresh": ["selection", _("Snapping treshold in pixels:")],
-+ "snap_tresh": ["selection", _("Snapping threshold in pixels:")],
- "sel_area_opacty": ["selection", _("Selected area opacity:")]
- }
-
---- a/gui/wxpython/iscatt/plots.py
-+++ b/gui/wxpython/iscatt/plots.py
-@@ -765,7 +765,7 @@ class PolygonDrawer:
- self.line.set_visible(vis) # don't use the pol visibility state
-
- def get_ind_under_point(self, event):
-- 'get the index of the vertex under point if within treshold'
-+ 'get the index of the vertex under point if within threshold'
-
- # display coords
- xy = np.asarray(self.pol.xy)
---- a/gui/wxpython/vnet/dialogs.py
-+++ b/gui/wxpython/vnet/dialogs.py
-@@ -1279,7 +1279,7 @@ class SettingsDialog(wx.Dialog):
- "line_width": ["res_style", _("Line width:")],
- "point_size": ["point_symbol", _("Point size:")],
- "point_width": ["point_symbol", _("Point width:")],
-- "snap_tresh": ["other", _("Snapping treshold in pixels:")],
-+ "snap_tresh": ["other", _("Snapping threshold in pixels:")],
- "max_hist_steps": ["other", _("Maximum number of results in history:")]
- }
-
---- a/locale/po/grasswxpy_cs.po
-+++ b/locale/po/grasswxpy_cs.po
-@@ -8832,7 +8832,7 @@ msgid "Point width:"
- msgstr "Šířka bodu:"
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr "Práh pro přichycení v pixelech:"
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_de.po
-+++ b/locale/po/grasswxpy_de.po
-@@ -8874,7 +8874,7 @@ msgid "Point width:"
- msgstr "Punktbreite:"
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_el.po
-+++ b/locale/po/grasswxpy_el.po
-@@ -8746,7 +8746,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_es.po
-+++ b/locale/po/grasswxpy_es.po
-@@ -8938,7 +8938,7 @@ msgid "Point width:"
- msgstr "Anchura del punto:"
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_fi.po
-+++ b/locale/po/grasswxpy_fi.po
-@@ -8735,7 +8735,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_fr.po
-+++ b/locale/po/grasswxpy_fr.po
-@@ -8949,7 +8949,7 @@ msgid "Point width:"
- msgstr "Épaisseur du point :"
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr "Seuil de magnétisme en pixels :"
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
-@@ -18044,7 +18044,7 @@ msgstr "Version SVN :"
- msgid "Build Platform"
- msgstr "Plateforme"
-
--msgid "Row lenght of sampling frame"
-+msgid "Row length of sampling frame"
- msgstr "Nombre de lignes du cadre d'échantillonage"
-
- #~ msgid "Creates a raster map from LAS LiDAR points using univariate statistics."
---- a/locale/po/grasswxpy_id.po
-+++ b/locale/po/grasswxpy_id.po
-@@ -9908,7 +9908,7 @@ msgstr "Lebar garis"
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
- #, fuzzy
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr "Batas snapping"
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_id_ID.po
-+++ b/locale/po/grasswxpy_id_ID.po
-@@ -1924,7 +1924,7 @@ msgid "Selected area color:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:372 ../gui/wxpython/vnet/dialogs.py:1282
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:373
---- a/locale/po/grasswxpy_it.po
-+++ b/locale/po/grasswxpy_it.po
-@@ -8915,7 +8915,7 @@ msgid "Point width:"
- msgstr "Grandezza del punto:"
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr "Soglia di snap in pixels:"
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_ja.po
-+++ b/locale/po/grasswxpy_ja.po
-@@ -8856,7 +8856,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_ko.po
-+++ b/locale/po/grasswxpy_ko.po
-@@ -9165,7 +9165,7 @@ msgid "Selected area color:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:372 ../gui/wxpython/vnet/dialogs.py:1282
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:373
---- a/locale/po/grasswxpy_lv.po
-+++ b/locale/po/grasswxpy_lv.po
-@@ -12379,7 +12379,7 @@ msgid "Selected area color:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:372 ../gui/wxpython/vnet/dialogs.py:1282
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:373
---- a/locale/po/grasswxpy_ml.po
-+++ b/locale/po/grasswxpy_ml.po
-@@ -8768,7 +8768,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_pl.po
-+++ b/locale/po/grasswxpy_pl.po
-@@ -8845,7 +8845,7 @@ msgid "Point width:"
- msgstr "Szerokość punktu:"
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr "Próg przyciągania w pikselach:"
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_pt.po
-+++ b/locale/po/grasswxpy_pt.po
-@@ -8751,7 +8751,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_pt_BR.po
-+++ b/locale/po/grasswxpy_pt_BR.po
-@@ -8767,7 +8767,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_ro.po
-+++ b/locale/po/grasswxpy_ro.po
-@@ -8868,7 +8868,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_ru.po
-+++ b/locale/po/grasswxpy_ru.po
-@@ -8752,7 +8752,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_si.po
-+++ b/locale/po/grasswxpy_si.po
-@@ -1924,7 +1924,7 @@ msgid "Selected area color:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:372 ../gui/wxpython/vnet/dialogs.py:1282
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:373
---- a/locale/po/grasswxpy_th.po
-+++ b/locale/po/grasswxpy_th.po
-@@ -8734,7 +8734,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_tr.po
-+++ b/locale/po/grasswxpy_tr.po
-@@ -8760,7 +8760,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_uk.po
-+++ b/locale/po/grasswxpy_uk.po
-@@ -1924,7 +1924,7 @@ msgid "Selected area color:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:372 ../gui/wxpython/vnet/dialogs.py:1282
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/iscatt/dialogs.py:373
---- a/locale/po/grasswxpy_vi.po
-+++ b/locale/po/grasswxpy_vi.po
-@@ -8737,7 +8737,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/locale/po/grasswxpy_zh.po
-+++ b/locale/po/grasswxpy_zh.po
-@@ -8776,7 +8776,7 @@ msgid "Point width:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1282 ../gui/wxpython/iscatt/dialogs.py:372
--msgid "Snapping treshold in pixels:"
-+msgid "Snapping threshold in pixels:"
- msgstr ""
-
- #: ../gui/wxpython/vnet/dialogs.py:1283
---- a/raster/r.geomorphon/main.c
-+++ b/raster/r.geomorphon/main.c
-@@ -81,7 +81,7 @@ int main(int argc, char **argv)
- *opt_output[io_size],
- *par_search_radius,
- *par_skip_radius,
-- *par_flat_treshold,
-+ *par_flat_threshold,
- *par_flat_distance,
- *par_multi_prefix, *par_multi_step, *par_multi_start;
- struct Flag *flag_units, *flag_extended;
-@@ -133,12 +133,12 @@ int main(int argc, char **argv)
- par_skip_radius->required = YES;
- par_skip_radius->description = _("Inner search radius");
-
-- par_flat_treshold = G_define_option();
-- par_flat_treshold->key = "flat";
-- par_flat_treshold->type = TYPE_DOUBLE;
-- par_flat_treshold->answer = "1";
-- par_flat_treshold->required = YES;
-- par_flat_treshold->description = _("Flatenss treshold (degrees)");
-+ par_flat_threshold = G_define_option();
-+ par_flat_threshold->key = "flat";
-+ par_flat_threshold->type = TYPE_DOUBLE;
-+ par_flat_threshold->answer = "1";
-+ par_flat_threshold->required = YES;
-+ par_flat_threshold->description = _("Flatenss threshold (degrees)");
-
- par_flat_distance = G_define_option();
- par_flat_distance->key = "dist";
-@@ -239,9 +239,9 @@ int main(int argc, char **argv)
- skip_distance = (meters) ? skip_radius : ns_resolution * skip_cells;
-
- /* flatness parameters */
-- flat_threshold = atof(par_flat_treshold->answer);
-+ flat_threshold = atof(par_flat_threshold->answer);
- if (flat_threshold <= 0.)
-- G_fatal_error(_("Flatenss treshold must be grater than 0"));
-+ G_fatal_error(_("Flatenss threshold must be grater than 0"));
- flat_threshold = DEGREE2RAD(flat_threshold);
-
- flat_distance = atof(par_flat_distance->answer);
---- a/raster/r.geomorphon/pattern.c
-+++ b/raster/r.geomorphon/pattern.c
-@@ -88,7 +88,7 @@ int calc_pattern(PATTERN * pattern, int
- /* original paper version */
- /* zenith_angle=PI2-zenith_angle;
- nadir_angle=PI2+nadir_angle;
-- if(fabs(zenith_angle-nadir_angle) > flat_treshold) {
-+ if(fabs(zenith_angle-nadir_angle) > flat_threshold) {
- if((nadir_angle-zenith_angle) > 0) {
- patterns->pattern[i]=1;
- patterns->elevation[i]=nadir_height;
---- a/gui/wxpython/gmodeler/frame.py
-+++ b/gui/wxpython/gmodeler/frame.py
-@@ -1397,7 +1397,7 @@ class ModelEvtHandler(ogl.ShapeEvtHandle
- dlg.Destroy()
-
- def OnBeginDragLeft(self, x, y, keys=0, attachment=0):
-- """Drag shape (begining)"""
-+ """Drag shape (beginning)"""
- self.frame.ModelChanged()
- if self._previousHandler:
- self._previousHandler.OnBeginDragLeft(x, y, keys, attachment)
---- a/gui/wxpython/gui_core/goutput.py
-+++ b/gui/wxpython/gui_core/goutput.py
-@@ -572,7 +572,7 @@ class GStc(stc.StyledTextCtrl):
- self.SetUndoCollection(True)
- self.SetReadOnly(True)
-
-- # remember position of line begining (used for '\r')
-+ # remember position of line beginning (used for '\r')
- self.linePos = -1
-
- #
---- a/imagery/i.smap/multialloc.c
-+++ b/imagery/i.smap/multialloc.c
-@@ -71,7 +71,7 @@ char *multialloc(size_t s, /* individual
- *s1 = (t += sizeof(char **) * *(q + 1));
- s1++;
- }
-- r = (char **)r[0]; /* step through to begining of next
-+ r = (char **)r[0]; /* step through to beginning of next
- * dimension array */
- }
- max *= (*q); /* max is total number of elements in the
---- a/include/iostream/embuffer.h
-+++ b/include/iostream/embuffer.h
-@@ -225,7 +225,7 @@ private:
-
- //the buffers can be depleted to fill the internal pq;
- //keep an array which counts, for each stream, how many elements
-- //have been deleted (implicitely from the begining of stream)
-+ //have been deleted (implicitely from the beginning of stream)
- long* deleted;
-
- //nb of items in each substream; this can be found out by calling
-@@ -376,7 +376,7 @@ public:
- // several buffers pointing to the same stream.
-
- // stream is assumed sorted; bos = how many elements are deleted
-- // from the begining of stream;
-+ // from the beginning of stream;
-
- // return the number of items actually inserted
- long insert(AMI_STREAM<T>* str,
-@@ -1132,7 +1132,7 @@ long em_buffer<T,Key>::insert(T* a, long
- stream.
-
- stream is assume stream is sorted; bos = how many elements must be
-- skipped (were deleted) from the begining fo stream;
-+ skipped (were deleted) from the beginning fo stream;
-
- return the number of items actually inserted */
- template<class T, class Key>
---- a/raster/r.geomorphon/geom.c
-+++ b/raster/r.geomorphon/geom.c
-@@ -184,7 +184,7 @@ int radial2cartesian(PATTERN * pattern)
- {
- /* this function converts radial coordinates of geomorphon
- * (assuming center as 0,0) to cartezian coordinates
-- * with the begining in the central cell of geomorphon */
-+ * with the beginning in the central cell of geomorphon */
- int i;
-
- for (i = 0; i < 8; ++i)
---- a/raster/r.geomorphon/r.geomorphon.html
-+++ b/raster/r.geomorphon/r.geomorphon.html
-@@ -62,7 +62,7 @@ especially with low resolution DEMS.
- <DT><b>search</b></DT>
- <DD>Determines length on the geodesic distances in all eight directions where line-of-sight is calculated. To speed up calculation is determines only these cells which centers falls into the distance</DD>
- <DT><b>skip</b></DT>
--<DD>Determines length on the geodesic distances at the beginning of calculation all eight directions where line-of-sight is yet calculated. To speed up calculation this distance is always recalculated into number of cell which are skipped at the begining of every line-of-sight and is equal in all direction. This parameter eliminates forms of very small extend, smaller than skip parameter.</DD>
-+<DD>Determines length on the geodesic distances at the beginning of calculation all eight directions where line-of-sight is yet calculated. To speed up calculation this distance is always recalculated into number of cell which are skipped at the beginning of every line-of-sight and is equal in all direction. This parameter eliminates forms of very small extend, smaller than skip parameter.</DD>
- <DT><b>flat</b></DT>
- <DD>The difference (in degrees) between zenith and nadir line-of-sight which indicate flat direction. If higher threshold produce more flat maps. If resolution of the map is low (more than 1 km per cell) threshold should be very small (much smaller than 1 degree) because on such distance 1 degree of difference means several meters of high difference.</DD>
- <DT><b>dist</b></DT>
-@@ -84,9 +84,9 @@ especially with low resolution DEMS.
- <DT><b>intensity</b></DT>
- <DD>returns avarage difference between central cell of geomorphon and eight cells in visibility neighbourhood. This parameter shows local (as is visible) exposition/abasment of the form in the terrain</DD>
- <DT><b>range</b></DT>
--<DD>returns difference between minimum and maximum values of visibility neigbourhood.</DD>
-+<DD>returns difference between minimum and maximum values of visibility neighbourhood.</DD>
- <DT><b>variance</b></DT>
--<DD>returns variance (difference between particular values and mean value) ofvisibility neigbourhood.</DD>
-+<DD>returns variance (difference between particular values and mean value) ofvisibility neighbourhood.</DD>
- <DT><b>extend</b></DT>
- <DD>returns area of the polygon created by the 8 points where line-of-sight cuts the terrain (see image in description section).</DD>
- <DT><b>azimuth</b></DT>
-@@ -94,7 +94,7 @@ especially with low resolution DEMS.
- <DT><b>elongation</b></DT>
- <DD>returns proportion between sides of the bounding box rectangle calculated for geomorphon rotated to fit lest square line.</DD>
- <DT><b>width</b></DT>
--<DD>returns lenght of the shorter side of the bounding box rectangle calculated for geomorphon rotated to fit lest square line.</DD>
-+<DD>returns length of the shorter side of the bounding box rectangle calculated for geomorphon rotated to fit lest square line.</DD>
-
-
- <h2>NOTES</h2>
---- a/man/build_keywords.py
-+++ b/man/build_keywords.py
-@@ -91,16 +91,16 @@ for key in sortedKeys:
- keywordsfile.write("</dl>\n")
- # create toc
- toc = '<div class="toc">\n<h4 class="toc">Table of contents</h4><p class="toc">'
--test_lenght = 0
-+test_length = 0
- all_keys = len(char_list.keys())
- for k in sorted(char_list.keys()):
-- test_lenght += 1
-+ test_length += 1
- # toc += '<li><a href="#%s" class="toc">%s</a></li>' % (char_list[k], k)
-- if test_lenght % 4 == 0 and not test_lenght == all_keys:
-+ if test_length % 4 == 0 and not test_length == all_keys:
- toc += '\n<a href="#%s" class="toc">%s</a>, ' % (char_list[k], k)
-- elif test_lenght % 4 == 0 and test_lenght == all_keys:
-+ elif test_length % 4 == 0 and test_length == all_keys:
- toc += '\n<a href="#%s" class="toc">%s</a>' % (char_list[k], k)
-- elif test_lenght == all_keys:
-+ elif test_length == all_keys:
- toc += '<a href="#%s" class="toc">%s</a>' % (char_list[k], k)
- else:
- toc += '<a href="#%s" class="toc">%s</a>, ' % (char_list[k], k)
---- a/imagery/i.ortho.photo/lib/elev.c
-+++ b/imagery/i.ortho.photo/lib/elev.c
-@@ -67,22 +67,22 @@ int I_get_group_elev(char *group, char *
- }
-
- err=fgets(buf, IN_BUF, fd);
-- if(err==NULL) G_fatal_error(_("Unable to read elevation paramter file"));
-+ if(err==NULL) G_fatal_error(_("Unable to read elevation parameter file"));
- sscanf(buf, "elevation layer :%s\n", elev);
- err=fgets(buf, IN_BUF, fd);
-- if(err==NULL) G_fatal_error(_("Unable to read elevation paramter file"));
-+ if(err==NULL) G_fatal_error(_("Unable to read elevation parameter file"));
- sscanf(buf, "mapset elevation:%s\n", mapset_elev);
- err=fgets(buf, IN_BUF, fd);
-- if(err==NULL) G_fatal_error(_("Unable to read elevation paramter file"));
-+ if(err==NULL) G_fatal_error(_("Unable to read elevation parameter file"));
- sscanf(buf, "location :%s\n", tl);
- err=fgets(buf, IN_BUF, fd);
-- if(err==NULL) G_fatal_error(_("Unable to read elevation paramter file"));
-+ if(err==NULL) G_fatal_error(_("Unable to read elevation parameter file"));
- sscanf(buf, "math expression :%s\n", math_exp);
- err=fgets(buf, IN_BUF, fd);
-- if(err==NULL) G_fatal_error(_("Unable to read elevation paramter file"));
-+ if(err==NULL) G_fatal_error(_("Unable to read elevation parameter file"));
- sscanf(buf, "units :%s\n", units);
- err=fgets(buf, IN_BUF, fd);
-- if(err==NULL) G_fatal_error(_("Unable to read elevation paramter file"));
-+ if(err==NULL) G_fatal_error(_("Unable to read elevation parameter file"));
- sscanf(buf, "no data values :%s\n", nd);
- fclose(fd);
-
---- a/raster/r.mapcalc/r.mapcalc.html
-+++ b/raster/r.mapcalc/r.mapcalc.html
-@@ -75,7 +75,7 @@ and in the history file for <em>result</
- is <a href="t.rast.algebra.html">t.rast.algebra</a>.
- The <em>region</em> option of <em>r.mapcalc</em>
- was implemented to address this requirement.
-- It allows to compute and use a region based on
-+ It allows computing and using a region based on
- all raster maps in an expression. Three modes are supported:
- </p>
- <ul>
---- a/temporal/temporalintro.html
-+++ b/temporal/temporalintro.html
-@@ -139,11 +139,11 @@ Maps registered in a space-time raster d
- methods to list maps and uses SQL queries to determine how these maps
- are selected and sorted. Subsets of space-time raster datasets can be
- extracted with <a href="t.rast.extract.html">t.rast.extract</a> that
--allows to perform additional mapcalc operations on the selected raster
-+allows performing additional mapcalc operations on the selected raster
- maps.
- <p>
- Several modules in the temporal framework have a <em>where</em> option.
--This option allows to perform different selections of maps registered
-+This option allows performing different selections of maps registered
- in the temporal database and in space-time datasets. The columns that
- can be used to perform these selections are: <i>id, name, creator,
- mapset, temporal_type, creation_time, start_time, end_time, north,
-@@ -172,8 +172,8 @@ datasets. It provides three modules to p
- different approaches. To aggregate a space-time raster dataset using a
- temporal granularity like 4 months, 7 days and so on, use
- <a href="t.rast.aggregate.html">t.rast.aggregate</a>. The module
--<a href="t.rast.aggregate.ds.html">t.rast.aggregate.ds</a> allows to
--aggregate a space-time raster dataset using the time intervals of the
-+<a href="t.rast.aggregate.ds.html">t.rast.aggregate.ds</a> allows
-+aggregating a space-time raster dataset using the time intervals of the
- maps of another space-time dataset (raster, 3D raster and vector). A
- simple interface to <a href="r.series.html">r.series</a> is the module
- <a href="t.rast.series.html">t.rast.series</a> that processes the whole
---- a/vector/v.external/v.external.html
-+++ b/vector/v.external/v.external.html
-@@ -31,7 +31,7 @@ features, instead vector data should be
- or <em>v.in.ogr</em> to get true topology support. Importantly, point
- cloud data which do not have topology, can be linked with <em>v.external</em>
- as long as there are no attributes attached to these point cloud data, or
--if the format of the point cloud data has a key column that allows to link
-+if the format of the point cloud data has a key column that allows linking
- vector geometries to attributes.
-
- <p>See <em><a href="v.db.connect.html">v.db.connect</a></em> for an
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git
More information about the Pkg-grass-devel
mailing list