This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository grass.
commit b77b8e7ce4d48b65c17c21d727d774501a6c6936 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue Nov 3 12:18:47 2015 +0100 Drop various-typos.patch, applied upstream. --- debian/changelog | 1 + debian/patches/series | 1 - debian/patches/various-typos.patch | 669 ------------------------------------- 3 files changed, 1 insertion(+), 670 deletions(-) diff --git a/debian/changelog b/debian/changelog index 834ba6b..344bc79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ grass (7.0.2~rc2-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate. * Use desktop file in favor of menu file per CTTE #741573. + * Drop various-typos.patch, applied upstream. -- Bas Couwenberg <sebas...@debian.org> Tue, 03 Nov 2015 12:11:52 +0100 diff --git a/debian/patches/series b/debian/patches/series index 8c61877..64733d8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,4 @@ instdir no-fail-html.patch desktop.patch appstream.patch -various-typos.patch ctte-741573.patch diff --git a/debian/patches/various-typos.patch b/debian/patches/various-typos.patch deleted file mode 100644 index 2f75b51..0000000 --- a/debian/patches/various-typos.patch +++ /dev/null @@ -1,669 +0,0 @@ -Description: Fix various typos. - 'allows to <verb>' -> 'allows <verb>ing' - 'Ouput' -> 'Output' - 'bellow' -> 'below' -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://trac.osgeo.org/grass/ticket/2776 -Applied-Upstream: https://trac.osgeo.org/grass/changeset/66568 - ---- a/gui/wxpython/docs/wxGUI.iscatt.html -+++ b/gui/wxpython/docs/wxGUI.iscatt.html -@@ -5,7 +5,7 @@ - - <b>Interactive Scatter Plot Tool</b> allows analyzing group of raster - maps. The tool is integrated into <em><a href="wxGUI.iclass.html"> --Supervised Classification Tool</a></em> (see the screen shot bellow). -+Supervised Classification Tool</a></em> (see the screen shot below). - Also it is possible to launch it from Map Display Window (<tt>Analyze map - → Interactive Scatter Plot Tool</tt>). - ---- a/gui/wxpython/iscatt/controllers.py -+++ b/gui/wxpython/iscatt/controllers.py -@@ -228,7 +228,7 @@ class ScattsManager: - message=_("Number of cells (rows*cols) <%d> in current region is " - "higher than recommended threshold <%d>.\n" - "It is strongly advised to reduce number of cells " -- "in current region bellow recommend threshold.\n " -+ "in current region below recommend threshold.\n " - "It can be done by <g.region> command.\n\n" - "Do you want to continue using " - "Interactive Scatter Plot Tool with this region?" -@@ -314,7 +314,7 @@ class ScattsManager: - message=_("Multiple of bands ranges <%s:%d * %s:%d = %d> " - "is higher than recommended limit <%d>.\n" - "It is strongly advised to reduce range extend of bands" -- "(e. g. using r.rescale) bellow recommended threshold.\n\n" -+ "(e. g. using r.rescale) below recommended threshold.\n\n" - "Do you really want to add this scatter plot?" - % (b_1_name, b_1_i['range'], b_1_name, b_2_i['range'], - mrange, WARN_SCATT_SIZE)), ---- a/lib/gis/parser_standard_options.c -+++ b/lib/gis/parser_standard_options.c -@@ -25,7 +25,7 @@ - parameter <i>opt</i>. - - Valid parameters are defined by the STD_OPT enum in the file gis.h. -- A list of valid parameter values sorted to groups is bellow. -+ A list of valid parameter values sorted to groups is below. - - This function allocates memory for the Option structure and returns a - pointer to this memory. -@@ -889,7 +889,7 @@ struct Option *G_define_standard_option( - \brief Create standardised Flag structure. - - This function will create a standardised Flag structure defined by -- parameter <i>flag</i>. A list of valid parameters bellow. It -+ parameter <i>flag</i>. A list of valid parameters below. It - allocates memory for the Flag structure and returns a pointer to - this memory. - ---- a/lib/init/grass7.html -+++ b/lib/init/grass7.html -@@ -223,7 +223,7 @@ script. The script file must have its ex - <dt><b>grass70 -text</b> - <dd> Start GRASS using the text-based user interface. Appropriate - location and mapset must be set by environmental variables (see --examples bellow) otherwise taken from the last GRASS session.</dd> -+examples below) otherwise taken from the last GRASS session.</dd> - - <dt><b>grass70 -gtext</b> - <dd> Start GRASS using the text-based user interface. The user will be ---- a/lib/vector/Vlib/dgraph.h -+++ b/lib/vector/Vlib/dgraph.h -@@ -16,7 +16,7 @@ struct pg_vertex { - double x; /* coordinates */ - double y; - int ecount; /* number of neighbours */ -- int eallocated; /* size of the array bellow */ -+ int eallocated; /* size of the array below */ - struct pg_edge **edges; /* array of pointers */ - double *angles; /* precalculated angles with Ox */ - }; ---- a/lib/vector/Vlib/write_nat.c -+++ b/lib/vector/Vlib/write_nat.c -@@ -427,7 +427,7 @@ int V2_restore_line_nat(struct Map_info - return V2__add_line_to_topo_nat(Map, offset, type, Points, Cats, line, NULL) > 0 ? 0 : -1; - } - --/*** static or internal subroutines bellow ****/ -+/*** static or internal subroutines below ****/ - - /*! - \brief Writes feature at the given offset or at the end of the file ---- a/lib/vector/vectorlib.dox -+++ b/lib/vector/vectorlib.dox -@@ -322,7 +322,7 @@ parcels might have two different categor - - \subsection vlibFeatureTypes Feature types - --Feature types are defined in include/vect_dig_defines.h, see the list bellow: -+Feature types are defined in include/vect_dig_defines.h, see the list below: - - - GV_POINT - - GV_LINE ---- a/lib/vector/vectorlib_lists.dox -+++ b/lib/vector/vectorlib_lists.dox -@@ -7,7 +7,7 @@ by GRASS Development Team (http://grass. - \section vlibStructures List of vector library data structures - - All data structure used by the vector library are defined in --include/vect/dig_structs.h. See the lists bellow. -+include/vect/dig_structs.h. See the lists below. - - \subsection vlibStructuresMajor Major - ---- a/lib/vector/vectorlib_pg.dox -+++ b/lib/vector/vectorlib_pg.dox -@@ -22,7 +22,7 @@ page</a> for more info. - - \section vlibFn List of functions - --Note that the functions listed bellow are lower level subroutines, in -+Note that the functions listed below are lower level subroutines, in - other word these functions are not considered to be part of public - API. They are internally used by the vector library when accessing - PostGIS data. The programmer should use higher level functions ---- a/locale/po/grasswxpy_cs.po -+++ b/locale/po/grasswxpy_cs.po -@@ -18569,7 +18569,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18606,7 +18606,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_de.po -+++ b/locale/po/grasswxpy_de.po -@@ -18394,7 +18394,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18431,7 +18431,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_el.po -+++ b/locale/po/grasswxpy_el.po -@@ -17395,7 +17395,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -17432,7 +17432,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_es.po -+++ b/locale/po/grasswxpy_es.po -@@ -18764,7 +18764,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18801,7 +18801,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_fi.po -+++ b/locale/po/grasswxpy_fi.po -@@ -16914,7 +16914,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -16950,7 +16950,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_fr.po -+++ b/locale/po/grasswxpy_fr.po -@@ -18181,7 +18181,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18230,7 +18230,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_id.po -+++ b/locale/po/grasswxpy_id.po -@@ -18990,7 +18990,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -19027,7 +19027,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_it.po -+++ b/locale/po/grasswxpy_it.po -@@ -17663,7 +17663,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -17710,7 +17710,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_ja.po -+++ b/locale/po/grasswxpy_ja.po -@@ -18340,7 +18340,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18377,7 +18377,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_ko.po -+++ b/locale/po/grasswxpy_ko.po -@@ -16905,7 +16905,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -16941,7 +16941,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_lv.po -+++ b/locale/po/grasswxpy_lv.po -@@ -17265,7 +17265,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -17301,7 +17301,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_ml.po -+++ b/locale/po/grasswxpy_ml.po -@@ -17934,7 +17934,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -17971,7 +17971,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_pl.po -+++ b/locale/po/grasswxpy_pl.po -@@ -17914,7 +17914,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -17951,7 +17951,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_pt.po -+++ b/locale/po/grasswxpy_pt.po -@@ -19236,7 +19236,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -19273,7 +19273,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_pt_br.po -+++ b/locale/po/grasswxpy_pt_br.po -@@ -19742,7 +19742,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -19779,7 +19779,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_ro.po -+++ b/locale/po/grasswxpy_ro.po -@@ -18480,7 +18480,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18517,7 +18517,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_ru.po -+++ b/locale/po/grasswxpy_ru.po -@@ -18885,7 +18885,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18922,7 +18922,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_th.po -+++ b/locale/po/grasswxpy_th.po -@@ -18141,7 +18141,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18178,7 +18178,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_tr.po -+++ b/locale/po/grasswxpy_tr.po -@@ -18777,7 +18777,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18814,7 +18814,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_vi.po -+++ b/locale/po/grasswxpy_vi.po -@@ -18949,7 +18949,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18986,7 +18986,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/locale/po/grasswxpy_zh.po -+++ b/locale/po/grasswxpy_zh.po -@@ -18155,7 +18155,7 @@ msgstr "" - msgid "" - "Number of cells (rows*cols) <%d> in current region is higher than " - "recommended threshold <%d>.\n" --"It is strongly advised to reduce number of cells in current region bellow " -+"It is strongly advised to reduce number of cells in current region below " - "recommend threshold.\n" - " It can be done by <g.region> command.\n" - "\n" -@@ -18197,7 +18197,7 @@ msgid "" - "Multiple of bands ranges <%s:%d * %s:%d = %d> is higher than recommended " - "limit <%d>.\n" - "It is strongly advised to reduce range extend of bands(e. g. using r." --"rescale) bellow recommended threshold.\n" -+"rescale) below recommended threshold.\n" - "\n" - "Do you really want to add this scatter plot?" - msgstr "" ---- a/mswindows/env.bat -+++ b/mswindows/env.bat -@@ -3,7 +3,7 @@ REM Environmental variables for GRASS st - REM - - REM Default prompt: cmd.exe --REM To enable bash prompt please uncomment the line bellow -+REM To enable bash prompt please uncomment the line below - REM set GRASS_SH=%GISBASE%\msys\bin\sh.exe - - set GRASS_PYTHON=%GISBASE%\extrabin\python.exe ---- a/mswindows/osgeo4w/env.bat.tmpl -+++ b/mswindows/osgeo4w/env.bat.tmpl -@@ -4,7 +4,7 @@ REM - - set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-@VERSION@ - REM Default prompt: cmd.exe --REM To enable bash prompt please uncomment the line bellow -+REM To enable bash prompt please uncomment the line below - REM set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe - - set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python.exe ---- a/scripts/r.in.wms/srs.py -+++ b/scripts/r.in.wms/srs.py -@@ -9,7 +9,7 @@ List of classes: - This program is free software under the GNU General Public License - (>=v2). Read the file COPYING that comes with GRASS for details. - --@author Stepan Turek <stepan.turek seznam.cz> (Based on code from OWSLib - Copyright bellow) -+@author Stepan Turek <stepan.turek seznam.cz> (Based on code from OWSLib - Copyright below) - """ - # -*- coding: ISO-8859-15 -*- - # ============================================================================= ---- a/scripts/v.import/v.import.py -+++ b/scripts/v.import/v.import.py -@@ -45,7 +45,7 @@ - #% type: string - #% options: input,region - #% answer: input --#% description: Ouput vector map extent -+#% description: Output vector map extent - #% descriptions: input;extent of input map;region;extent of current region - #% guisection: Output - #%end ---- a/temporal/t.rast.aggregate/t.rast.aggregate.html -+++ b/temporal/t.rast.aggregate/t.rast.aggregate.html -@@ -53,7 +53,7 @@ available for aggregation computation. I - specified parallel processes (<em>nprocs</em>) and the number of - intervals to aggregate. - <p> --The flag <b>-s</b> allows to store a date as map name suffix rather than -+The flag <b>-s</b> allows storing a date as map name suffix rather than - using consecutive numbering. See the examples below for details. - - <h2>EXAMPLES</h2> ---- a/vector/v.in.ogr/v.in.ogr.html -+++ b/vector/v.in.ogr/v.in.ogr.html -@@ -134,7 +134,7 @@ LDID/codepage setting from the .dbf file - string fields to UTF-8. LDID "87 / 0x57" is treated as - ISO8859_1 which may not be appropriate for many - languages. Unfortunately it is not clear what other values may be --appropriate (see example bellow). To change encoding the user can set -+appropriate (see example below). To change encoding the user can set - up <tt>SHAPE_ENCODING</tt> environmental variable or simply to define - encoding value using <b>encoding</b> parameter. Note that recoding - support is new for GDAL/OGR 1.9.0. -@@ -154,7 +154,7 @@ Starting with GDAL 1.11 the library supp - in OGR. By default <em>v.in.ogr</em> reads all geometry columns from - given layer. The user can choose desired geometry column - by <b>geometry</b> option, --see <a href="#multiple-geometry-columns">example bellow</a>. -+see <a href="#multiple-geometry-columns">example below</a>. - - <h2>EXAMPLES</h2> - -@@ -297,7 +297,7 @@ In our example layer "Okresy" - "GeneralizovanaHranice". By default <em>v.in.ogr</em> reads data from - all three geometry columns. The user can specify desired geometry - column by <b>geometry</b> option, in this case the module will read --geometry only from the specified geometry column. In the example bellow, -+geometry only from the specified geometry column. In the example below, - the output vector map will contain only geometry saved in - "OriginalniHranice" geometry column. - ---- a/vector/v.out.postgis/v.out.postgis.html -+++ b/vector/v.out.postgis/v.out.postgis.html -@@ -133,7 +133,7 @@ v.out.postgis input=urbanarea output="PG - </pre></div> - - GRASS areas are converted into polygons, isles into holes. We can --check the number or created polygons by simple SQL query bellow. -+check the number or created polygons by simple SQL query below. - - <div class="code"><pre> - db.select driver=pg database=grass \ -@@ -175,7 +175,7 @@ v.out.postgis input=bridges output="PG:d - - <h3>Export data with creation options</h3> - --Example bellow demonstrates how to define name for geometry column and -+Example below demonstrates how to define name for geometry column and - disable building spatial index. Spatial reference system is defined - by <tt>srid</tt> identifier which corresponds in this case with EPSG - 3358 (North Carolina dataset). -@@ -221,7 +221,7 @@ by <em><a href="v.info.html">v.info</a>< - <em>v.out.postgis</em> allows ignoring attributes when exporting - vector features by specifying <b>-t</b> flag. - --Command bellow exports vector features without attributes. The feature -+Command below exports vector features without attributes. The feature - will contain only two columns, the fid and geometry column. - - <div class="code"><pre> ---- a/vector/v.select/v.select.html -+++ b/vector/v.select/v.select.html -@@ -236,7 +236,7 @@ v.select with CONTAINS operator: selecte - This operator additionally requires the <b>relate</b> parameter (in other - GIS called 'ST_Relate'). - --This operator allows to calculate the -+This operator allows calculating the - <a href="https://en.wikipedia.org/wiki/DE-9IM">Dimensionally Extended nine-Intersection Model (DE-9IM)</a>. - - In the following one example: Select polygon with 'TOUCHES' operator -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel