[grass] 04/07: Drop spelling error patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Sun Oct 2 21:27:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository grass.
commit b3c9fe04614872cf301deb7a6c93e35afc142647
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Oct 2 22:26:38 2016 +0200
Drop spelling error patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/series | 2 -
debian/patches/spelling-errors.patch | 17 -
debian/patches/spelling-errors2.patch | 578 ----------------------------------
4 files changed, 1 insertion(+), 597 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 79a0213..3a8e070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
grass (7.0.5-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop spelling error patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Sun, 02 Oct 2016 22:23:44 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 301023b..468ac73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ pager
instdir
no-fail-html.patch
appstream.patch
-spelling-errors.patch
-spelling-errors2.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 82330d3..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix spelling errors.
- allows to <verb> -> allows <verb>ing
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/3163
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/69533
-
---- a/gui/wxpython/gmodeler/g.gui.gmodeler.html
-+++ b/gui/wxpython/gmodeler/g.gui.gmodeler.html
-@@ -82,7 +82,7 @@ color="red">16</font>) Show manual and l
- There is also lower menu bar in Graphical modeler dialog where one can
- manage model items, see commands, add or manage model variables,
- define default values and descriptions. Python editor dialog window
--allows to see performation written in Python code. Rightmost tab of
-+allows seeing performation written in Python code. Rightmost tab of
- bottom menu is automatically triggered when model is activated and
- shows all the steps of running GRASS modeler modules. In case of some
- errors in calculation process, it is written at that place.
diff --git a/debian/patches/spelling-errors2.patch b/debian/patches/spelling-errors2.patch
deleted file mode 100644
index d7b8674..0000000
--- a/debian/patches/spelling-errors2.patch
+++ /dev/null
@@ -1,578 +0,0 @@
-Description: Fix spelling errors.
- * accidential -> accidental
- * boudaries -> boundaries
- * programing -> programming
- * colums -> columns
- * acheive -> achieve
- * lables -> labels
- * occure -> occur
- * should'nt -> shouldn't
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/3163
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/69532
-
---- a/gui/wxpython/gcp/g.gui.gcp.html
-+++ b/gui/wxpython/gcp/g.gui.gcp.html
-@@ -11,7 +11,7 @@ Ground Control Points. It is available f
- 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>
---- a/scripts/db.droptable/db.droptable.html
-+++ b/scripts/db.droptable/db.droptable.html
-@@ -9,7 +9,7 @@ the action to be taken is printed.
- <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>
-
---- a/gui/wxpython/gmodeler/g.gui.gmodeler.html
-+++ b/gui/wxpython/gmodeler/g.gui.gmodeler.html
-@@ -246,7 +246,7 @@ used to calculate (let's say) average pr
- 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).
-
---- a/raster/r.surf.area/r.surf.area.html
-+++ b/raster/r.surf.area/r.surf.area.html
-@@ -36,7 +36,7 @@ cellarea</tt>)</li>
- <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.
-
---- a/general/g.parser/g.parser.html
-+++ b/general/g.parser/g.parser.html
-@@ -338,7 +338,7 @@ Parameters:
- <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 @@ if __name__ == "__main__":
- <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)
---- a/general/g.parser/test.pl
-+++ b/general/g.parser/test.pl
-@@ -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)
---- a/general/g.parser/test.py
-+++ b/general/g.parser/test.py
-@@ -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)
---- a/general/g.parser/test.sh
-+++ b/general/g.parser/test.sh
-@@ -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)
---- a/db/drivers/dbf/dbfexe.c
-+++ b/db/drivers/dbf/dbfexe.c
-@@ -113,7 +113,7 @@ int execute(char *sql, cursor * c)
- 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);
---- a/ps/ps.map/ps.map.html
-+++ b/ps/ps.map/ps.map.html
-@@ -1440,7 +1440,7 @@ the map, starting <em>x</em> inches from
- <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.
---- a/ps/ps.map/vector.h
-+++ b/ps/ps.map/vector.h
-@@ -102,7 +102,7 @@ struct vector
- 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;
---- a/raster/r.out.mat/main.c
-+++ b/raster/r.out.mat/main.c
-@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
- 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);
-
---- a/raster3d/r3.in.v5d/v5d.h
-+++ b/raster3d/r3.in.v5d/v5d.h
-@@ -186,7 +186,7 @@ typedef struct
- 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
---- a/raster3d/r3.out.v5d/v5d.h
-+++ b/raster3d/r3.out.v5d/v5d.h
-@@ -186,7 +186,7 @@ typedef struct
- 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
---- a/raster/r.reclass/r.reclass.html
-+++ b/raster/r.reclass/r.reclass.html
-@@ -31,7 +31,7 @@ raster map has been created.
-
- <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
---- a/raster/r.statistics/r.statistics.html
-+++ b/raster/r.statistics/r.statistics.html
-@@ -29,7 +29,7 @@ The available methods are the following
-
- 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.
---- a/vector/v.label.sa/main.c
-+++ b/vector/v.label.sa/main.c
-@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
- 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++) {
---- a/db/drivers/mysql/execute.c
-+++ b/db/drivers/mysql/execute.c
-@@ -30,7 +30,7 @@ int db__driver_execute_immediate(dbStrin
- * 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), "\\", "\\\\");
-
---- a/db/drivers/postgres/execute.c
-+++ b/db/drivers/postgres/execute.c
-@@ -30,7 +30,7 @@ int db__driver_execute_immediate(dbStrin
- * 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);
---- a/gui/wxpython/mapwin/base.py
-+++ b/gui/wxpython/mapwin/base.py
-@@ -207,7 +207,7 @@ class MapWindowBase(object):
-
- 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.
---- a/lib/gis/gislib.dox
-+++ b/lib/gis/gislib.dox
-@@ -1135,7 +1135,7 @@ The next routines replaces character(s)
-
- - 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.
-
---- a/lib/gis/strings.c
-+++ b/lib/gis/strings.c
-@@ -148,7 +148,7 @@ char *G_store_lower(const char *s)
- }
-
- /*!
-- \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 @@ char *G_strchg(char *bug, char character
- }
-
- /*!
-- \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
---- a/lib/init/variables.html
-+++ b/lib/init/variables.html
-@@ -235,7 +235,7 @@ PERMANENT
- 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>
---- a/lib/rst/interp_float/interp2d.c
-+++ b/lib/rst/interp_float/interp2d.c
-@@ -230,7 +230,7 @@ int IL_grid_calc_2d(struct interp_params
- 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);
- }
---- a/locale/po/grasslibs_ar.po
-+++ b/locale/po/grasslibs_ar.po
-@@ -7358,7 +7358,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_cs.po
-+++ b/locale/po/grasslibs_cs.po
-@@ -7427,7 +7427,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_de.po
-+++ b/locale/po/grasslibs_de.po
-@@ -7409,7 +7409,7 @@ msgstr "Ändern Sie zunächst die Spalte
- #: ../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-"
---- a/locale/po/grasslibs_el.po
-+++ b/locale/po/grasslibs_el.po
-@@ -7471,7 +7471,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_es.po
-+++ b/locale/po/grasslibs_es.po
-@@ -6970,7 +6970,7 @@ msgstr "Primero cambie su número de col
-
- #: ../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
---- a/locale/po/grasslibs_fi.po
-+++ b/locale/po/grasslibs_fi.po
-@@ -7048,7 +7048,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_fr.po
-+++ b/locale/po/grasslibs_fr.po
-@@ -7634,7 +7634,7 @@ msgstr "Commencez par changer le nombre
- #: ../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 "
---- a/locale/po/grasslibs_it.po
-+++ b/locale/po/grasslibs_it.po
-@@ -7539,7 +7539,7 @@ msgstr "Prima cambiare il numero delle c
- #: ../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 "
---- a/locale/po/grasslibs_ja.po
-+++ b/locale/po/grasslibs_ja.po
-@@ -7423,7 +7423,7 @@ msgstr "最初にnsizcにカラムの番
- #: ../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 ""
- "オーバーシュート - 張力が増加しています.オーバーシュートは次のところで起こっ"
---- a/locale/po/grasslibs_ko.po
-+++ b/locale/po/grasslibs_ko.po
-@@ -7233,7 +7233,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_lv.po
-+++ b/locale/po/grasslibs_lv.po
-@@ -7317,7 +7317,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_ml.po
-+++ b/locale/po/grasslibs_ml.po
-@@ -7179,7 +7179,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_pl.po
-+++ b/locale/po/grasslibs_pl.po
-@@ -7377,7 +7377,7 @@ msgstr "Najpierw ustaw liczbę kolumn zg
- #: ../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 "
---- a/locale/po/grasslibs_pt.po
-+++ b/locale/po/grasslibs_pt.po
-@@ -7439,7 +7439,7 @@ msgstr "Altere primeiro os n�mero das su
- #: ../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 "
---- a/locale/po/grasslibs_pt_br.po
-+++ b/locale/po/grasslibs_pt_br.po
-@@ -7424,7 +7424,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_ro.po
-+++ b/locale/po/grasslibs_ro.po
-@@ -7177,7 +7177,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_ru.po
-+++ b/locale/po/grasslibs_ru.po
-@@ -7443,7 +7443,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_sl.po
-+++ b/locale/po/grasslibs_sl.po
-@@ -7412,7 +7412,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_th.po
-+++ b/locale/po/grasslibs_th.po
-@@ -7420,7 +7420,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_tr.po
-+++ b/locale/po/grasslibs_tr.po
-@@ -7360,7 +7360,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_vi.po
-+++ b/locale/po/grasslibs_vi.po
-@@ -7459,7 +7459,7 @@ msgstr ""
- #: ../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 ""
-
---- a/locale/po/grasslibs_zh.po
-+++ b/locale/po/grasslibs_zh.po
-@@ -7433,7 +7433,7 @@ msgstr ""
- #: ../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 ""
-
---- a/vector/v.out.vtk/v.out.vtk.html
-+++ b/vector/v.out.vtk/v.out.vtk.html
-@@ -29,7 +29,7 @@ will be exported.
- 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).
---- a/vector/v.vol.rst/user3.c
-+++ b/vector/v.vol.rst/user3.c
-@@ -520,7 +520,7 @@ COGRR1(double x_or, double y_or, double
- 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",
---- a/vector/v.vol.rst/v.vol.rst.html
-+++ b/vector/v.vol.rst/v.vol.rst.html
-@@ -117,7 +117,7 @@ The vector points map must be a 3D vecto
- 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.
-
---- a/lib/init/clean_temp.c
-+++ b/lib/init/clean_temp.c
-@@ -61,7 +61,7 @@ void clean_dir(const char *pathname, uid
- 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) {
--
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