[GRASS-SVN] r59573 - in grass/branches/releasebranch_7_0: gui/wxpython/xml raster/r.stream.snap

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-04-04 15:22:47 -0700 (Fri, 04 Apr 2014)
New Revision: 59573

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
   grass/branches/releasebranch_7_0/raster/r.stream.snap/main.c
   grass/branches/releasebranch_7_0/raster/r.stream.snap/r.stream.snap.html
Log:
r.stream.*: streamline - river to streams; cosmetics (merge from trunk: r59572)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml	2014-04-04 22:18:49 UTC (rev 59572)
+++ grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml	2014-04-04 22:22:47 UTC (rev 59573)
@@ -861,22 +861,22 @@
         <label>Watershed basin creation</label>
       </module-item>
       <module-item name="r.stream.channel">
-        <label>River channel characteristics</label>
+        <label>Stream channel characteristics</label>
       </module-item>
       <module-item name="r.stream.distance">
-        <label>River distance and elevation characteristics</label>
+        <label>Stream distance and elevation characteristics</label>
       </module-item>
       <module-item name="r.stream.extract">
         <label>Extraction of stream networks</label>
       </module-item>
       <module-item name="r.stream.order">
-        <label>River ordering and hierarchy</label>
+        <label>Stream ordering and hierarchy</label>
       </module-item>
       <module-item name="r.stream.segment">
-        <label>River segment characteristics</label>
+        <label>Stream segment characteristics</label>
       </module-item>
       <module-item name="r.stream.slope">
-        <label>River elevation change</label>
+        <label>Stream elevation change</label>
       </module-item>
       <module-item name="r.stream.snap">
         <label>Position correction of water outlet point</label>

Modified: grass/branches/releasebranch_7_0/raster/r.stream.snap/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.stream.snap/main.c	2014-04-04 22:18:49 UTC (rev 59572)
+++ grass/branches/releasebranch_7_0/raster/r.stream.snap/main.c	2014-04-04 22:22:47 UTC (rev 59573)
@@ -44,7 +44,7 @@
     G_gisinit(argv[0]);
 
     module = G_define_module();
-    module->label = _("Snap point to modelled river network.");
+    module->label = _("Snap point to modelled stream network.");
     module->description = _("Input can be stream network, point vector map with outlets or outlet coordinates.");
     G_add_keyword(_("raster"));
     G_add_keyword(_("hydrology"));

Modified: grass/branches/releasebranch_7_0/raster/r.stream.snap/r.stream.snap.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.stream.snap/r.stream.snap.html	2014-04-04 22:18:49 UTC (rev 59572)
+++ grass/branches/releasebranch_7_0/raster/r.stream.snap/r.stream.snap.html	2014-04-04 22:22:47 UTC (rev 59573)
@@ -9,13 +9,13 @@
 <p>
 For outlets, the situation is clear. Points are snapped to nearest
 point which lies on the streamline. In situation where there can be a
-small tributuary nearer than main stream accumulation threshold shall
-be high enough to force the program ignoring this tributuary and snap
+small tributary nearer than main stream accumulation threshold shall
+be high enough to force the program ignoring this tributary and snap
 to the main stream. If there is no accumulation map, the points will
 be snapped to the nearest stream line, which in particular situations
 may be wrong. Because the <em>r.stream.*</em> modules are prepared to
 work with MFD accumulation maps, both stream network and accumulation
-map are neccessary to resolve the problem.
+map are necessary to resolve the problem.
 
 <p>
 While it is assumed that the accumulation map is a MFD map, if the