[GRASS-SVN] r67704 - in grass/branches/releasebranch_7_0: . general/g.proj gui/wxpython/lmgr imagery/i.landsat.acca lib/gis lib/imagery lib/ogsf lib/python/script lib/python/temporal lib/raster locale/po raster/r.mapcalc raster/r.neighbors raster/r.proj raster/r.resamp.stats raster/r.series raster/r.stream.extract raster/r.watershed/ram raster3d/r3.in.ascii raster3d/r3.neighbors scripts/r.in.aster vector/v.rectify vector/v.transform vector/v.vect.stats
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jan 29 01:56:07 PST 2016
Author: mlennert
Date: 2016-01-29 01:56:07 -0800 (Fri, 29 Jan 2016)
New Revision: 67704
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.proj/g.proj.html
grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
grass/branches/releasebranch_7_0/imagery/i.landsat.acca/i.landsat.acca.html
grass/branches/releasebranch_7_0/lib/gis/verbose.c
grass/branches/releasebranch_7_0/lib/imagery/iclass_statistics.c
grass/branches/releasebranch_7_0/lib/ogsf/gvld.c
grass/branches/releasebranch_7_0/lib/python/script/utils.py
grass/branches/releasebranch_7_0/lib/python/temporal/open_stds.py
grass/branches/releasebranch_7_0/lib/python/temporal/temporal_algebra.py
grass/branches/releasebranch_7_0/lib/raster/range.c
grass/branches/releasebranch_7_0/locale/po/grassmods_ar.po
grass/branches/releasebranch_7_0/locale/po/grassmods_cs.po
grass/branches/releasebranch_7_0/locale/po/grassmods_de.po
grass/branches/releasebranch_7_0/locale/po/grassmods_el.po
grass/branches/releasebranch_7_0/locale/po/grassmods_es.po
grass/branches/releasebranch_7_0/locale/po/grassmods_fi.po
grass/branches/releasebranch_7_0/locale/po/grassmods_fr.po
grass/branches/releasebranch_7_0/locale/po/grassmods_it.po
grass/branches/releasebranch_7_0/locale/po/grassmods_ja.po
grass/branches/releasebranch_7_0/locale/po/grassmods_ko.po
grass/branches/releasebranch_7_0/locale/po/grassmods_lv.po
grass/branches/releasebranch_7_0/locale/po/grassmods_pl.po
grass/branches/releasebranch_7_0/locale/po/grassmods_pt.po
grass/branches/releasebranch_7_0/locale/po/grassmods_pt_br.po
grass/branches/releasebranch_7_0/locale/po/grassmods_ro.po
grass/branches/releasebranch_7_0/locale/po/grassmods_ru.po
grass/branches/releasebranch_7_0/locale/po/grassmods_sl.po
grass/branches/releasebranch_7_0/locale/po/grassmods_th.po
grass/branches/releasebranch_7_0/locale/po/grassmods_tr.po
grass/branches/releasebranch_7_0/locale/po/grassmods_vi.po
grass/branches/releasebranch_7_0/locale/po/grassmods_zh.po
grass/branches/releasebranch_7_0/raster/r.mapcalc/map.c
grass/branches/releasebranch_7_0/raster/r.mapcalc/map3.c
grass/branches/releasebranch_7_0/raster/r.neighbors/main.c
grass/branches/releasebranch_7_0/raster/r.proj/r.proj.html
grass/branches/releasebranch_7_0/raster/r.resamp.stats/main.c
grass/branches/releasebranch_7_0/raster/r.series/main.c
grass/branches/releasebranch_7_0/raster/r.series/r.series.html
grass/branches/releasebranch_7_0/raster/r.stream.extract/r.stream.extract.html
grass/branches/releasebranch_7_0/raster/r.watershed/ram/init_vars.c
grass/branches/releasebranch_7_0/raster3d/r3.in.ascii/r3.in.ascii.html
grass/branches/releasebranch_7_0/raster3d/r3.neighbors/main.c
grass/branches/releasebranch_7_0/scripts/r.in.aster/r.in.aster.html
grass/branches/releasebranch_7_0/vector/v.rectify/v.rectify.html
grass/branches/releasebranch_7_0/vector/v.transform/main.c
grass/branches/releasebranch_7_0/vector/v.vect.stats/main.c
Log:
Various typos (backport r67703 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Added: svn:mergeinfo
+ /grass/trunk:65787,67516,67703
Modified: grass/branches/releasebranch_7_0/general/g.proj/g.proj.html
===================================================================
--- grass/branches/releasebranch_7_0/general/g.proj/g.proj.html 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/general/g.proj/g.proj.html 2016-01-29 09:56:07 UTC (rev 67704)
@@ -137,7 +137,7 @@
</pre></div>
<p>Create a new location with the co-ordinate system referred to by EPSG code
-4326 (Latitude-Longitude/WGS84), without explicitly specifiying datum
+4326 (Latitude-Longitude/WGS84), without explicitly specifying datum
transformation parameters:<br>
<div class="code"><pre>
Modified: grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py 2016-01-29 09:56:07 UTC (rev 67704)
@@ -1563,7 +1563,7 @@
The parameters of all handlers which are associated with module
and contained in menu/toolboxes must be event and cmd.
When called from menu event is always None and cmd is the
- associated command (list containing a module name and paremeters).
+ associated command (list containing a module name and parameters).
.. todo::
This documentation is actually documentation of some
Modified: grass/branches/releasebranch_7_0/imagery/i.landsat.acca/i.landsat.acca.html
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.landsat.acca/i.landsat.acca.html 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/imagery/i.landsat.acca/i.landsat.acca.html 2016-01-29 09:56:07 UTC (rev 67704)
@@ -23,7 +23,7 @@
Run the standard ACCA algorithm with filling of small cloud holes
(the <b>-f</b> flag): With per-band reflectance raster maps
named <tt>226_62.toar.1, 226_62.toar.2, </tt> [...] and LANDSAT-7
-thermal band <tt>226_62.toar.61</tt>, outputing to a new raster map
+thermal band <tt>226_62.toar.61</tt>, outputting to a new raster map
named <tt>226_62.acca</tt>:
<div class="code"><pre>
Modified: grass/branches/releasebranch_7_0/lib/gis/verbose.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/verbose.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/lib/gis/verbose.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -30,7 +30,7 @@
#define MAXLEVEL 3
/*! \brief Standard verbosity level */
#define STDLEVEL 2
-/*! \brief Minumum verbosity level (quiet) */
+/*! \brief Minimum verbosity level (quiet) */
#define MINLEVEL 0
static struct state {
Modified: grass/branches/releasebranch_7_0/lib/imagery/iclass_statistics.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/imagery/iclass_statistics.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/lib/imagery/iclass_statistics.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -723,7 +723,7 @@
\param statistics pointer to statistics structure
\param band band index
- \param[out] min minumum value
+ \param[out] min minimum value
\return 1 on success
\return 0 band index out of range
Modified: grass/branches/releasebranch_7_0/lib/ogsf/gvld.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/ogsf/gvld.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/lib/ogsf/gvld.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -240,7 +240,7 @@
nz[i] = 0;
}
- G_debug(5, " intialize OK");
+ G_debug(5, " initialize OK");
for (z = 0; z < depths - 1; z++) {
zc = z * zres;
@@ -695,7 +695,7 @@
for (i = 0; i < gvl->n_slices; i++) {
slice = gvl->slice[i];
- /* intialize correct coords */
+ /* initialize correct coords */
if (slice->dir == X) {
resx = gvl->yres;
resy = gvl->zres;
Modified: grass/branches/releasebranch_7_0/lib/python/script/utils.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/utils.py 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/lib/python/script/utils.py 2016-01-29 09:56:07 UTC (rev 67704)
@@ -148,6 +148,32 @@
self[key] = value
+def decode(string):
+ """Decode string with defualt locale
+
+ :param str string: the string to decode
+ """
+ enc = locale.getdefaultlocale()[1]
+ if enc:
+ if hasattr(string, 'decode'):
+ return string.decode(enc)
+
+ return string
+
+
+def encode(string):
+ """Encode string with defualt locale
+
+ :param str string: the string to encode
+ """
+ enc = locale.getdefaultlocale()[1]
+ if enc:
+ if hasattr(string, 'encode'):
+ return string.encode(enc)
+
+ return string
+
+
def parse_key_val(s, sep='=', dflt=None, val_type=None, vsep=None):
"""Parse a string into a dictionary, where entries are separated
by newlines and the key and value are separated by `sep` (default: `=`)
@@ -171,6 +197,10 @@
if not s:
return result
+ if isinstance(s, bytes):
+ sep = encode(sep)
+ vsep = encode(vsep) if vsep else vsep
+
if vsep:
lines = s.split(vsep)
try:
@@ -182,9 +212,9 @@
for line in lines:
kv = line.split(sep, 1)
- k = kv[0].strip()
+ k = decode(kv[0].strip())
if len(kv) > 1:
- v = kv[1].strip()
+ v = decode(kv[1].strip())
else:
v = dflt
@@ -196,30 +226,6 @@
return result
-def decode(string):
- """Decode string with defualt locale
-
- :param str string: the string to decode
- """
- enc = locale.getdefaultlocale()[1]
- if enc:
- return string.decode(enc)
-
- return string
-
-
-def encode(string):
- """Encode string with defualt locale
-
- :param str string: the string to encode
- """
- enc = locale.getdefaultlocale()[1]
- if enc:
- return string.encode(enc)
-
- return string
-
-
def get_num_suffix(number, max_number):
"""Returns formatted number with number of padding zeros
depending on maximum number, used for creating suffix for data series.
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/open_stds.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/open_stds.py 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/open_stds.py 2016-01-29 09:56:07 UTC (rev 67704)
@@ -25,7 +25,7 @@
def open_old_stds(name, type, dbif=None):
"""This function opens an existing space time dataset and return the
- created and intialized object of the specified type.
+ created and initialized object of the specified type.
This function will call exit() or raise a
grass.pygrass.messages.FatalError in case the type is wrong,
Modified: grass/branches/releasebranch_7_0/lib/python/temporal/temporal_algebra.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/temporal_algebra.py 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/temporal_algebra.py 2016-01-29 09:56:07 UTC (rev 67704)
@@ -2148,7 +2148,7 @@
t[0] = t[1]
def p_expr_strds_function(self, t):
- # Specifiy a explicitely a space time raster dataset
+ # Explicitly specify a space time raster dataset
# R = A : strds(B)
"""
expr : STRDS LPAREN stds RPAREN
@@ -2161,7 +2161,7 @@
print "Opening STRDS: ", t[0]
def p_expr_str3ds_function(self, t):
- # Specifiy a explicitely a space time raster dataset
+ # Explicitly specify a space time raster dataset
# R = A : str3ds(B)
"""
expr : STR3DS LPAREN stds RPAREN
@@ -2174,7 +2174,7 @@
print "Opening STR3DS: ", t[0]
def p_expr_stvds_function(self, t):
- # Specifiy a explicitely a space time vector dataset
+ # Explicitly specify a space time vector dataset
# R = A : stvds(B)
"""
expr : STVDS LPAREN stds RPAREN
Modified: grass/branches/releasebranch_7_0/lib/raster/range.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/raster/range.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/lib/raster/range.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -542,7 +542,7 @@
}
/*!
- * \brief Get minumum and maximum value from fp range
+ * \brief Get minimum and maximum value from fp range
*
* Extract the min/max from the range structure <i>range</i>. If the
* range structure has no defined min/max (first!=0) there will not be
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_ar.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_ar.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_ar.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34384,7 +34384,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "التوقيع ..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_cs.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_cs.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_cs.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34736,7 +34736,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Převádím prvky..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_de.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_de.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_de.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34798,7 +34798,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Transformiere Feature..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_el.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_el.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_el.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -33024,7 +33024,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Εγγραφή %s από %s..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_es.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_es.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_es.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34922,7 +34922,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Trasponiendo la matriz de valores propios..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_fi.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_fi.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_fi.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -31656,7 +31656,7 @@
msgstr ""
#: ../vector/v.transform/main.c:277
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr ""
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_fr.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_fr.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_fr.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -36550,7 +36550,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Rotation des données ... "
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_it.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_it.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_it.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34213,7 +34213,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Trasformazione degli elementi in corso..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_ja.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_ja.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_ja.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34198,7 +34198,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "フィーチャーを変換中、、、"
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_ko.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_ko.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_ko.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -33205,7 +33205,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "출력할 격자지도"
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_lv.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_lv.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_lv.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34168,7 +34168,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Drukā ... "
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_pl.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_pl.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_pl.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34290,7 +34290,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Wczytywanie danych..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_pt.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_pt.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_pt.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -35297,7 +35297,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Rotacionando dados ... "
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_pt_br.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_pt_br.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_pt_br.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -35216,7 +35216,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Rotacionando dados ... "
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_ro.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_ro.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_ro.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -32166,7 +32166,7 @@
msgstr ""
#: ../vector/v.transform/main.c:277
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr ""
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_ru.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_ru.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_ru.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34856,7 +34856,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Трансформирование объектов..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_sl.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_sl.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_sl.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34648,7 +34648,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Ri¹em ..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_th.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_th.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_th.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34479,7 +34479,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "กำลังอ่านข้อมูล ..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_tr.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_tr.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_tr.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -33837,7 +33837,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Veri okunuyor..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_vi.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_vi.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_vi.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34862,7 +34862,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "Đang chuyển đổi các đối tượng..."
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/locale/po/grassmods_zh.po
===================================================================
--- grass/branches/releasebranch_7_0/locale/po/grassmods_zh.po 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/locale/po/grassmods_zh.po 2016-01-29 09:56:07 UTC (rev 67704)
@@ -34563,7 +34563,7 @@
#: ../vector/v.transform/main.c:277
#, fuzzy
-msgid "Tranforming features..."
+msgid "Transforming features..."
msgstr "读取地图"
#: ../vector/v.transform/main.c:290
Modified: grass/branches/releasebranch_7_0/raster/r.mapcalc/map.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.mapcalc/map.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.mapcalc/map.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -307,7 +307,7 @@
* to compute the key and the index
*
* This uses the BTREE library to manage the tree itself
- * btree structure must already be intialized
+ * btree structure must already be initialized
* pcats structure must already contain category labels
*/
Modified: grass/branches/releasebranch_7_0/raster/r.mapcalc/map3.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.mapcalc/map3.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.mapcalc/map3.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -255,7 +255,7 @@
* to compute the key and the index
*
* This uses the BTREE library to manage the tree itself
- * btree structure must already be intialized
+ * btree structure must already be initialized
* pcats structure must already contain category labels
*/
Modified: grass/branches/releasebranch_7_0/raster/r.neighbors/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.neighbors/main.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.neighbors/main.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -56,7 +56,7 @@
static struct menu menu[] = {
{c_ave, w_ave, NO_CATS, 1, 1, T_FLOAT, "average", "average value"},
{c_median, w_median, NO_CATS, 1, 0, T_FLOAT, "median", "median value"},
- {c_mode, w_mode, NO_CATS, 1, 0, T_COPY, "mode", "most frequently occuring value"},
+ {c_mode, w_mode, NO_CATS, 1, 0, T_COPY, "mode", "most frequently occurring value"},
{c_min, NULL, NO_CATS, 1, 0, T_COPY, "minimum", "lowest value"},
{c_max, NULL, NO_CATS, 1, 0, T_COPY, "maximum", "highest value"},
{c_range, NULL, NO_CATS, 1, 0, T_COPY, "range", "range value"},
Modified: grass/branches/releasebranch_7_0/raster/r.proj/r.proj.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.proj/r.proj.html 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.proj/r.proj.html 2016-01-29 09:56:07 UTC (rev 67704)
@@ -316,6 +316,6 @@
Martin Schroeder, University of Heidelberg, Germany<br>
Man page text from S.J.D. Cox, AGCRC, CSIRO Exploration & Mining, Nedlands, WA<br>
Updated by <a href="mailto:morten at untamo.net">Morten Hulden</a><br>
-Datum tranformation support and cleanup by Paul Kelly
+Datum transformation support and cleanup by Paul Kelly
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/raster/r.resamp.stats/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.resamp.stats/main.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.resamp.stats/main.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -30,7 +30,7 @@
} menu[] = {
{c_ave, w_ave, "average", "average (mean) value"},
{c_median, w_median, "median", "median value"},
- {c_mode, w_mode, "mode", "most frequently occuring value"},
+ {c_mode, w_mode, "mode", "most frequently occurring value"},
{c_min, w_min, "minimum", "lowest value"},
{c_max, w_max, "maximum", "highest value"},
{c_quart1, w_quart1, "quart1", "first quartile"},
Modified: grass/branches/releasebranch_7_0/raster/r.series/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.series/main.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.series/main.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -32,7 +32,7 @@
{c_ave, 0, "average", "average value"},
{c_count, 1, "count", "count of non-NULL cells"},
{c_median, 0, "median", "median value"},
- {c_mode, 0, "mode", "most frequently occuring value"},
+ {c_mode, 0, "mode", "most frequently occurring value"},
{c_min, 0, "minimum", "lowest value"},
{c_minx, 1, "min_raster", "raster with lowest value"},
{c_max, 0, "maximum", "highest value"},
Modified: grass/branches/releasebranch_7_0/raster/r.series/r.series.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.series/r.series.html 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.series/r.series.html 2016-01-29 09:56:07 UTC (rev 67704)
@@ -9,7 +9,7 @@
<li>average: average value
<li>count: count of non-NULL cells
<li>median: median value
- <li>mode: most frequently occuring value
+ <li>mode: most frequently occurring value
<li>minimum: lowest value
<li>maximum: highest value
<li>range: range of values (max - min)
Modified: grass/branches/releasebranch_7_0/raster/r.stream.extract/r.stream.extract.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.stream.extract/r.stream.extract.html 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.stream.extract/r.stream.extract.html 2016-01-29 09:56:07 UTC (rev 67704)
@@ -25,7 +25,7 @@
depression map is provided.
<p>
-Option <b>threshold</b> defines the minumum (optionally modifed) flow
+Option <b>threshold</b> defines the minimum (optionally modifed) flow
accumulation value that will initiate a new stream. If Montgomery's
method for channel initiation is used, the cell value of the
accumulation input map is multiplied by <tt>(tan(local
Modified: grass/branches/releasebranch_7_0/raster/r.watershed/ram/init_vars.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.watershed/ram/init_vars.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster/r.watershed/ram/init_vars.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -178,7 +178,7 @@
ele_scale = 10000;
/* read elevation input and mark NULL/masked cells */
- /* intialize accumulation and drainage direction */
+ /* initialize accumulation and drainage direction */
MASK_flag = 0;
do_points = nrows * ncols;
for (r = 0; r < nrows; r++) {
Modified: grass/branches/releasebranch_7_0/raster3d/r3.in.ascii/r3.in.ascii.html
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.ascii/r3.in.ascii.html 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.ascii/r3.in.ascii.html 2016-01-29 09:56:07 UTC (rev 67704)
@@ -46,7 +46,7 @@
The version option is self explaining. The order option specifies the row
and depth order of the data in the input file.
The supported row/depth ordering is documented in the <em>r3.out.ascii</em>
-manual page. The order of the data in the input file does not specifiy the
+manual page. The order of the data in the input file does not specify the
data order in the generated output 3D raster map which is in any case
<em>north -> south, west -> east, bottom -> top</em> order.
So dependent on the order information the data is automatically imported
Modified: grass/branches/releasebranch_7_0/raster3d/r3.neighbors/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.neighbors/main.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/raster3d/r3.neighbors/main.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -42,7 +42,7 @@
{
c_ave, "average", "average value"}, {
c_median, "median", "median value"}, {
- c_mode, "mode", "most frequently occuring value"}, {
+ c_mode, "mode", "most frequently occurring value"}, {
c_min, "minimum", "lowest value"}, {
c_max, "maximum", "highest value"}, {
c_range, "range", "range value"}, {
Modified: grass/branches/releasebranch_7_0/scripts/r.in.aster/r.in.aster.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.in.aster/r.in.aster.html 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/scripts/r.in.aster/r.in.aster.html 2016-01-29 09:56:07 UTC (rev 67704)
@@ -7,7 +7,7 @@
line. In either case, the user must specify an <b>input</b> *.hdf file name,
the <b>type</b> of processing used, the image <b>band</b> to import, and an
<b>output</b> GRASS raster map name.
-<p>The <b>type</b> paremeter can take values of L1A, L1B, or DEM.
+<p>The <b>type</b> parameter can take values of L1A, L1B, or DEM.
<p>The <b>band</b> parameter can take values of 1, 2, 3n, 3b, 4-14
Modified: grass/branches/releasebranch_7_0/vector/v.rectify/v.rectify.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.rectify/v.rectify.html 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/vector/v.rectify/v.rectify.html 2016-01-29 09:56:07 UTC (rev 67704)
@@ -9,7 +9,7 @@
<p>
The <em>-o</em> flag enforces orthogonal rotation (currently for 3D only)
where the axes remain orthogonal to each other, e.g. a cube with right
-angles remains a cube with right angles after tranformation. This is not
+angles remains a cube with right angles after transformation. This is not
guaranteed even with affine (1<sup>st</sup> order) 3D transformation.
<p>
Modified: grass/branches/releasebranch_7_0/vector/v.transform/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.transform/main.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/vector/v.transform/main.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -274,7 +274,7 @@
ztozero = 0;
/* do the transformation */
- G_important_message(_("Tranforming features..."));
+ G_important_message(_("Transforming features..."));
transform_digit_file(&Old, &New,
ztozero, swap_flag->answer, trans_params,
columns_name, field);
Modified: grass/branches/releasebranch_7_0/vector/v.vect.stats/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vect.stats/main.c 2016-01-29 09:29:57 UTC (rev 67703)
+++ grass/branches/releasebranch_7_0/vector/v.vect.stats/main.c 2016-01-29 09:56:07 UTC (rev 67704)
@@ -39,7 +39,7 @@
{c_sum, 0, "sum", "sum of values"},
{c_ave, 1, "average", "average value"},
{c_median, 0, "median", "median value"},
- {c_mode, 0, "mode", "most frequently occuring value"},
+ {c_mode, 0, "mode", "most frequently occurring value"},
{c_min, 0, "minimum", "lowest value"},
{c_minx, 0, "min_cat", "category number of lowest value"},
{c_max, 0, "maximum", "highest value"},
More information about the grass-commit
mailing list