[Git][debian-gis-team/grass][ubuntugis/focal] 8 commits: Mark spelling-errors.patch as Applied-Upstream.

Martin Landa gitlab at salsa.debian.org
Mon Oct 5 18:01:13 BST 2020 


Martin Landa pushed to branch ubuntugis/focal at Debian GIS Project / grass


Commits:
9c0cb89e by Bas Couwenberg at 2020-09-27T19:10:48+02:00
Mark spelling-errors.patch as Applied-Upstream.

- - - - -
50b6356a by Bas Couwenberg at 2020-10-05T09:08:19+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."

This reverts commit d722df9ee5f6bc960ccdfeaf72452555a371dc55.

- - - - -
6af62105 by Bas Couwenberg at 2020-10-05T09:08:55+02:00
New upstream version 7.8.4
- - - - -
e75e3d55 by Bas Couwenberg at 2020-10-05T09:12:21+02:00
Update upstream source from tag 'upstream/7.8.4'

Update to upstream version '7.8.4'
with Debian dir e61010876b8f7a6bd07e5e296df87aa65d182415
- - - - -
9bbbfef9 by Bas Couwenberg at 2020-10-05T09:16:30+02:00
New upstream release.

- - - - -
4b367caa by Bas Couwenberg at 2020-10-05T09:20:09+02:00
Drop spelling-errors.patch, applied upstream.

- - - - -
ab0dfa43 by Bas Couwenberg at 2020-10-05T09:20:21+02:00
Set distribution to unstable.

- - - - -
1d88499c by Martin Landa at 2020-10-05T18:45:47+02:00
Rebuild 7.8.4 for focal

- - - - -


15 changed files:

- debian/changelog
- debian/patches/series
- − debian/patches/spelling-errors.patch
- doc/howto_release.md
- docker/alpine/Dockerfile_alpine
- include/VERSION
- locale/po/grasslibs_fr.po
- locale/po/grasswxpy_es.po
- locale/po/grasswxpy_fr.po
- locale/po/grasswxpy_hu.po
- locale/po/grasswxpy_it.po
- locale/po/grasswxpy_ko.po
- locale/po/grasswxpy_zh.po
- raster/r.geomorphon/main.c
- raster/rasterintro.html


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+grass (7.8.4-1~focal1) focal; urgency=medium
+
+  * Rebuild for focal.
+
+ -- Martin Landa <landa.martin at gmail.com>  Mon, 05 Oct 2020 18:44:30 +0200
+
+grass (7.8.4-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Drop spelling-errors.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Oct 2020 09:20:10 +0200
+
 grass (7.8.4~rc1-1~exp1~focal1) focal; urgency=medium
 
   * Rebuild for focal.


=====================================
debian/patches/series
=====================================
@@ -2,4 +2,3 @@ pager
 instdir
 no-fail-html.patch
 jquery.patch
-spelling-errors.patch


=====================================
debian/patches/spelling-errors.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Fix spelling errors.
- * extented -> extended
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/OSGeo/grass/pull/992
-
---- a/raster/rasterintro.html
-+++ b/raster/rasterintro.html
-@@ -201,7 +201,7 @@ Univariate statistics (<a href="r.univar
- reports are also available (<a href="r.report.html">r.report</a>,<a
- href="r.stats.html">r.stats</a>, <a href="r.volume.html">r.volume</a>).
- 
--Since <a href="r.univar.html">r.univar</a> may be slow for extented
-+Since <a href="r.univar.html">r.univar</a> may be slow for extended
- statistics these can be calculated using
- <a href="r.stats.quantile.html">r.stats.quantile</a>. Without a zones input
- raster, the <a href="r.quantile.html">r.quantile</a> module will be significantly


=====================================
doc/howto_release.md
=====================================
@@ -84,6 +84,7 @@ find . -name '*.o'    | xargs rm
 find . -name '*.pyc'  | xargs rm
 find . -name 'OBJ.*'  | xargs rm -r
 find . -name '__pycache__' | xargs rm -r
+rm -f lib/python/ctypes/ctypesgencore/parser/lextab.py
 rm -f gui/wxpython/menustrings.py gui/wxpython/build_ext.pyc \
   gui/wxpython/xml/menudata.xml gui/wxpython/xml/module_tree_menudata.xml
 chmod -R a+r *
@@ -214,10 +215,12 @@ git fetch --all --prune && git checkout releasebranch_7_8 && \
 
 ### Upload source code tarball to OSGeo servers
 
+Note: grasslxd only reachable via jumphost - https://wiki.osgeo.org/wiki/SAC_Service_Status#GRASS_GIS_server
+
 ```bash
 # Store the source tarball (twice) in (use scp -p FILES grass:):
-SERVER1=grass.osgeo.org
-SERVER1DIR=/var/www/grass/grass-cms/grass$MAJOR$MINOR/source/
+SERVER1=grasslxd
+SERVER1DIR=/var/www/code_and_data/grass$MAJOR$MINOR/source/
 SERVER2=upload.osgeo.org
 SERVER2DIR=/osgeo/download/grass/grass$MAJOR$MINOR/source/
 echo $SERVER1:$SERVER1DIR
@@ -270,7 +273,26 @@ TODO: git tags
 
 #### Write announcement and publish it
 
-- store in trac:
+To easily generate the entries for the trac Wiki release pages, use a `git log` approach:
+
+- List of latest changes (example, get from GitHub release page)
+   - https://github.com/OSGeo/grass/compare/releasebranch_7_8@%7B05-05-20%7D...releasebranch_7_8@%7B09-26-20%7D
+- identify start and end commit hash
+- extract entries from oneline git log and prepare for trac Wiki copy-paste:
+
+```
+#START=76d5988
+#END=8a81328
+##git log --oneline | sed -n "+^$START+,+^$END+p;+^$END+q"
+
+# verify
+git log --oneline | sed -n '/^76d5988/,/^8a81328/p;/^8a81328/q' | tac
+
+# prepare for trac Wiki release page
+git log --oneline | sed -n '/^76d5988/,/^8a81328/p;/^8a81328/q' | cut -d' ' -f2- | sed 's+^+ * G78:+g' | sort -u
+```
+
+- store entries in trac, by section:
     - <https://trac.osgeo.org/grass/wiki/Release/7.8.x-News>
     - <https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures78>  <- add content
       of major changes only
@@ -278,9 +300,9 @@ TODO: git tags
 - ~~store in Web as announces/announce_grass$MAJOR$MINOR$RELEASE.html <- how?
   with protected PHP upload page?~~ (dropped since CMS)
 
-#### Only when new major release
+#### Only in case of new major release
 
-- update cronjob 'cron_grass_HEAD_src_snapshot.sh' on grass.osgeo.org to next
+- update cronjob '[cron_grass_HEAD_src_snapshot.sh](https://github.com/OSGeo/grass-addons/tree/master/tools/cronjobs_osgeo_lxd)' on grass.osgeo.org to next
   but one release tag for the differences
 - wiki updates, only when new major release:
     - {{cmd|xxxx}} macro: <https://grasswiki.osgeo.org/wiki/Template:Cmd>


=====================================
docker/alpine/Dockerfile_alpine
=====================================
@@ -21,6 +21,7 @@ ENV PACKAGES="\
       flex \
       freetype \
       gdal \
+      gdal-tools \
       gettext \
       geos \
       gnutls \


=====================================
include/VERSION
=====================================
@@ -1,4 +1,4 @@
 7
 8
-4RC1
+4
 2020


=====================================
locale/po/grasslibs_fr.po
=====================================
@@ -10380,3 +10380,6 @@ msgstr "options : arch, build, compilateur, path, révision, révision_svn, vers
 
 #~ msgid "Name <%s> is not SQL compliant. Must start with a letter."
 #~ msgstr "Le nom <%s> n'est pas compatible avec le SQL. Il doit commencer par une lettre."
+
+#~ msgid "Maximum memory to be used (in MB)"
+#~ msgstr "Maximum de mémoire à utiliser (en MB)"


=====================================
locale/po/grasswxpy_es.po
=====================================
@@ -4549,7 +4549,7 @@ msgstr "Cerrar todas las ventanas de visualización de mapas"
 
 #: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1054
 msgid "Simplified raster import with reprojection"
-msgstr "Importación simplificada de mapas ráster con reproyección"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:38 ../gui/wxpython/menustrings.py:40
 #: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:1057
@@ -4560,7 +4560,7 @@ msgstr "Importa datos ráster a un mapa ráster de GRASS utilizando la librería
 
 #: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1056
 msgid "Import of common raster formats"
-msgstr "Importación de formatos ráster comunes"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1058
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:42
@@ -4699,7 +4699,7 @@ msgstr "Desempaquetar mapa ráster"
 
 #: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1080
 msgid "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a raster map"
-msgstr "Importa un archivo ráster específico de GRASS (empaquetado con r.pack) como un mapa ráster"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:290
 #: ../gui/wxpython/menustrings.py:1081 ../gui/wxpython/menustrings.py:1230
@@ -4721,7 +4721,7 @@ msgstr "Reproyecta un mapa ráster de una Localización dada a la Localización
 
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1084
 msgid "Simplified vector import with reprojection"
-msgstr "Importación simplificada de mapas vectoriales con reproyección"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:70
 #: ../gui/wxpython/menustrings.py:1085 ../gui/wxpython/menustrings.py:1087
@@ -4732,7 +4732,7 @@ msgstr "Importa datos vectriales a mapa vectorial de GRASS usando la librería O
 
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1086
 msgid "Import of common vector formats"
-msgstr "Importación de formatos vectoriales comunes"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:1088
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:72
@@ -4826,7 +4826,7 @@ msgstr "Desempaquetar mapa vectorial"
 
 #: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1104
 msgid "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a vector map"
-msgstr "Importa un archivo vectorial específico de GRASS (empaquetado con v.pack) como un mapa vectorial"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:88 ../gui/wxpython/menustrings.py:570
 #: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1510
@@ -5105,7 +5105,7 @@ msgstr "Exportar mapa vectorial"
 
 #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:1148
 msgid "Exports a vector map layer to any of the supported OGR vector formats. By default a vector map layer is exported to OGC GeoPackage format."
-msgstr "Exporta un mapa vectorial en cualquier formato soportado por OGR. Los mapas vectoriales se exportan por defecto en el formato GeoPackage."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1149
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:133
@@ -5139,7 +5139,7 @@ msgstr "Exportar a PostGIS"
 
 #: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1154
 msgid "Exports a vector map layer to PostGIS feature table."
-msgstr "Exporta una capa de mapa vectorial a tabla de elemetos PostGIS."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1156
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:139
@@ -5578,11 +5578,11 @@ msgstr "Lanza un archivo script."
 
 #: ../gui/wxpython/menustrings.py:209
 msgid "Simple Python Editor"
-msgstr "Editor Simple para Python"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:210
 msgid "Launches Simple Python Editor."
-msgstr "Inicia el Editor Simple para Python"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:211
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:209
@@ -5644,11 +5644,11 @@ msgstr "Mostrar la región usando latitud y longitud"
 
 #: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:1198
 msgid "Show current region extent in Map Display"
-msgstr "Mostrar la extensión de la región actual en el Map Display"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1199
 msgid "Shows the extent of the computational region in Map Display."
-msgstr "Muestra la extensión de la región computacional en el Map Display."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1200
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:219
@@ -6518,11 +6518,11 @@ msgstr "Genera capas de mapa ráster de pendiente, aspecto (orientación), curva
 
 #: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1318
 msgid "Landforms"
-msgstr "Formas del terreno"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1319
 msgid "Calculates geomorphons (terrain forms) and associated geometry using machine vision approach."
-msgstr "Calcula geomorfones (formas del terreno) y geometrías asociadas usando machine vision."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1320
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:374
@@ -8117,7 +8117,7 @@ msgstr "Asignar subredes"
 
 #: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1596
 msgid "Allocates subnets for nearest centers. Center node must be opened (costs >= 0). Costs of center node are used in calculation."
-msgstr "Asigna subredes a los centros más cercanos. El nodo central debe estar abierto (costes> = 0). Los costos del nodo central son utilizados para el cálculo."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1597
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:651
@@ -8127,7 +8127,7 @@ msgstr "Dividir red"
 
 #: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1598
 msgid "Splits subnets for nearest centers by cost isolines. Splits net to bands between cost isolines (direction from center). Center node must be opened (costs >= 0). Costs of center node are used in calculation."
-msgstr "Divide las subredes para los centros más cercanos por isolíneas de costo. Divide la red en bandas ubicadas entre los costos de isolines (Con dirección desde el centro). El nodo central debe estar abierto (costes> = 0). Los costos del nodo central se utilizarán en el cálculo."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1599
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:653
@@ -8296,11 +8296,11 @@ msgstr "Superponer mapas vectoriales"
 
 #: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1626
 msgid "Clip vector maps"
-msgstr "Recortar mapas vectoriales"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1627
 msgid "Extracts features of input map which overlay features of clip map."
-msgstr "Extrae características del mapa de entrada que se superponen con el mapa de corte."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1629
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:681
@@ -8473,7 +8473,7 @@ msgstr "Diagrama de Voronoi / polígonos de Thiessen"
 
 #: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1658
 msgid "Creates a Voronoi diagram constrained to the extents of the current region from an input vector map containing points or centroids."
-msgstr "Crea un diagrama Voronoi limitado a la extensión de la región actual a partir de un mapa vectorial de entrada que contiene puntos o centroides."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1659
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:711
@@ -8597,7 +8597,7 @@ msgstr "Calcula estadísticas univariante de la columna de la tabla seleccionada
 
 #: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1686
 msgid "Vector map profiling tool"
-msgstr "Herramienta de elaboración de perfiles de mapas vectoriales"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:747 ../gui/wxpython/menustrings.py:1687
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:737
@@ -9002,23 +9002,23 @@ msgstr "Calcula la corrección topográfica de la reflectancia."
 
 #: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1756
 msgid "Orthophoto tools"
-msgstr "Herramientas para ortofotos"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1757
 msgid "Manage GCPs for 3D correction"
-msgstr "Gestionar Los puntos de control en el terreno (GCP's), para corrección 3D."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1758
 msgid "Georectifies a map and allows managing GCP for 3D correction."
-msgstr "Geo-rectifica un mapa y permite gestionar los GCP para corrección 3D."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1759
 msgid "Corrects scanning distortions"
-msgstr "Corrige distorsiones de escaneo"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1760
 msgid "Corrects scanning distortions of a scanned aerial photo."
-msgstr "Corrige distorsiones de escaneo en fotos aéreas escaneadas."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1761
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:806
@@ -9834,7 +9834,7 @@ msgstr "Registrar mapas en conjunto de datos"
 
 #: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1905
 msgid "Assigns timestamps and registers raster, vector and raster3d maps in a space time dataset."
-msgstr "Asigna estampa temporal y registra mapas de tipo ráster, vectorial y ráster 3D en un conjunto de datos espacio temporal."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1906
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:951


=====================================
locale/po/grasswxpy_fr.po
=====================================
@@ -4548,7 +4548,7 @@ msgstr "Fermer tous les fenêtres d'affichage de cartes"
 
 #: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1054
 msgid "Simplified raster import with reprojection"
-msgstr "Import raster simplifié avec reprojection"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:38 ../gui/wxpython/menustrings.py:40
 #: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:1057
@@ -4559,7 +4559,7 @@ msgstr "Importer des données raster en utilisant la librairie GDAL."
 
 #: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1056
 msgid "Import of common raster formats"
-msgstr "Import de raster de formats communs"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1058
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:42
@@ -4698,7 +4698,7 @@ msgstr "Dépaqueter une carte raster"
 
 #: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1080
 msgid "Imports a GRASS GIS specific raster archive file (packed with r.pack) as a raster map"
-msgstr "Importe un fichier d'archive raster GRASS (empaqueté avec r.pack) en tant que carte raster"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:290
 #: ../gui/wxpython/menustrings.py:1081 ../gui/wxpython/menustrings.py:1230
@@ -4720,7 +4720,7 @@ msgstr "Reprojeter une carte raster depuis un secteur donné vers le secteur cou
 
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1084
 msgid "Simplified vector import with reprojection"
-msgstr "Import vecteur simplifié avec reprojection"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:70
 #: ../gui/wxpython/menustrings.py:1085 ../gui/wxpython/menustrings.py:1087
@@ -4731,7 +4731,7 @@ msgstr "Importer des cartes vecteur en utilisant la librairie OGR."
 
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1086
 msgid "Import of common vector formats"
-msgstr "Import de vecteur de formats communs"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:1088
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:72
@@ -4825,7 +4825,7 @@ msgstr "Dépaqueter une carte vecteur"
 
 #: ../gui/wxpython/menustrings.py:87 ../gui/wxpython/menustrings.py:1104
 msgid "Imports a GRASS GIS specific vector archive file (packed with v.pack) as a vector map"
-msgstr "Importe un fichier vecteur d'archive GRASS (empaqueté avec r.pack) en tant que carte vecteur"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:88 ../gui/wxpython/menustrings.py:570
 #: ../gui/wxpython/menustrings.py:1105 ../gui/wxpython/menustrings.py:1510
@@ -5104,7 +5104,7 @@ msgstr "Exporter une carte vecteur"
 
 #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:1148
 msgid "Exports a vector map layer to any of the supported OGR vector formats. By default a vector map layer is exported to OGC GeoPackage format."
-msgstr "Exporter une carte vecteur vers un des formats vecteurs supportés par OGR. Par défaut une carte vecteur est exportée vers le format OGC GeoPackage."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1149
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:133
@@ -5138,7 +5138,7 @@ msgstr "Export PostGIS"
 
 #: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1154
 msgid "Exports a vector map layer to PostGIS feature table."
-msgstr "Exporter une carte vecteur vers une table PostGIS."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1156
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:139
@@ -5577,11 +5577,11 @@ msgstr "Lancer un fichier de script."
 
 #: ../gui/wxpython/menustrings.py:209
 msgid "Simple Python Editor"
-msgstr "Éditeur Python simple"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:210
 msgid "Launches Simple Python Editor."
-msgstr "Lancer l'éditeur Python simple."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:211
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:209
@@ -5643,11 +5643,11 @@ msgstr "Afficher la région en latitude et longitude"
 
 #: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:1198
 msgid "Show current region extent in Map Display"
-msgstr "Afficher l'emprise de la région courante dans l'affichage de cartes"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1199
 msgid "Shows the extent of the computational region in Map Display."
-msgstr "Afficher l'emprise de la région de calcul dans l'affichage de cartes"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1200
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:219
@@ -6517,11 +6517,11 @@ msgstr "Générer des cartes raster de pente, exposition, courbure et dérivées
 
 #: ../gui/wxpython/menustrings.py:378 ../gui/wxpython/menustrings.py:1318
 msgid "Landforms"
-msgstr "Relief"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:379 ../gui/wxpython/menustrings.py:1319
 msgid "Calculates geomorphons (terrain forms) and associated geometry using machine vision approach."
-msgstr "Calculer la morphologie (forme du terrain) et les géométries associées à l'aide d'une approche de vision machine."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:380 ../gui/wxpython/menustrings.py:1320
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:374
@@ -8116,7 +8116,7 @@ msgstr "Allouer des sous-réseaux"
 
 #: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1596
 msgid "Allocates subnets for nearest centers. Center node must be opened (costs >= 0). Costs of center node are used in calculation."
-msgstr "Allouer les sous-réseaux pour le centre le plus proche. Le noeud centrql doit être ouvert (coûts >=0). Les coûts du noeud central sont utilisés dans les calculs."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1597
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:651
@@ -8126,7 +8126,7 @@ msgstr "Diviser le réseau"
 
 #: ../gui/wxpython/menustrings.py:658 ../gui/wxpython/menustrings.py:1598
 msgid "Splits subnets for nearest centers by cost isolines. Splits net to bands between cost isolines (direction from center). Center node must be opened (costs >= 0). Costs of center node are used in calculation."
-msgstr "Découper les sous-réseaux pour les centres les plus proches par coûts d'isolignes. Coupe le réseau en bandes entre les isolignes de coût (direction depuis le centre). Le noeud central doît être ouvert (coûts >=0). Les coûts du noeud central sont utilisés dans les calculs."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:659 ../gui/wxpython/menustrings.py:1599
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:653
@@ -8295,11 +8295,11 @@ msgstr "Superposer des cartes vectorielles"
 
 #: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1626
 msgid "Clip vector maps"
-msgstr "rogner les cartes vecteur"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1627
 msgid "Extracts features of input map which overlay features of clip map."
-msgstr "Extraire les entités de la carte d'entrée qui chevauchent les entités de la carte de sélection."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:689 ../gui/wxpython/menustrings.py:1629
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:681
@@ -8472,7 +8472,7 @@ msgstr "Diagramme de Voronoï/polygones de Thiessen"
 
 #: ../gui/wxpython/menustrings.py:718 ../gui/wxpython/menustrings.py:1658
 msgid "Creates a Voronoi diagram constrained to the extents of the current region from an input vector map containing points or centroids."
-msgstr "Créer un diagramme de Voronoi contraint dans l'emprise de la région courante depuis une carte vecteur d'entrée contenant des points ou centroïdes."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:719 ../gui/wxpython/menustrings.py:1659
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:711
@@ -8596,7 +8596,7 @@ msgstr "Calcule les statistiques univariées sur la colonne sélectionnée."
 
 #: ../gui/wxpython/menustrings.py:746 ../gui/wxpython/menustrings.py:1686
 msgid "Vector map profiling tool"
-msgstr "Outil de profilage de la carte vecteur"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:747 ../gui/wxpython/menustrings.py:1687
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:737
@@ -9001,23 +9001,23 @@ msgstr "Calcule les corrections topologiques de la réflectance."
 
 #: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1756
 msgid "Orthophoto tools"
-msgstr "Outils d'orthophoto"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1757
 msgid "Manage GCPs for 3D correction"
-msgstr "Gérer les points de correction 3D"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:818 ../gui/wxpython/menustrings.py:1758
 msgid "Georectifies a map and allows managing GCP for 3D correction."
-msgstr "Géorectifie une carte et permet de gérdr les points de correction 3D."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1759
 msgid "Corrects scanning distortions"
-msgstr "Corrige les distorsions de scan"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1760
 msgid "Corrects scanning distortions of a scanned aerial photo."
-msgstr "Corrige les distortions de scan d'une photo aérienne scannée."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:821 ../gui/wxpython/menustrings.py:1761
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:806
@@ -9833,7 +9833,7 @@ msgstr "Référencer des cartes dans les jeux de données"
 
 #: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1905
 msgid "Assigns timestamps and registers raster, vector and raster3d maps in a space time dataset."
-msgstr "Assigne les dates et référence les cartes raster, vecteur et raster3d dans un jeu de données temporel."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1906
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:951
@@ -21122,13 +21122,13 @@ msgid "Converts LAS LiDAR point clouds to a GRASS vector map with libLAS."
 msgstr "Convertir des nuages de points LIDAR LAS vers une carte vecteur GRASS avec libLAS"
 
 msgid "Simplified raster map calculator"
-msgstr "Calculatrice raster simplifiée"
+msgstr ""
 
 msgid "Calculates a new raster map from a simple r.mapcalc expression."
-msgstr "Calculer une nouvelle carte raster depuis une expression r.mapcalc simple."
+msgstr ""
 
 msgid "Raster map calculator."
-msgstr "Calculatrice raster."
+msgstr ""
 
 msgid "Animation already axists"
 msgstr "L'animation existe déjà"


=====================================
locale/po/grasswxpy_hu.po
=====================================
@@ -5464,11 +5464,11 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:209
 msgid "Simple Python Editor"
-msgstr "Egyszerű Python szerkesztő"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:210
 msgid "Launches Simple Python Editor."
-msgstr "Egyszerű Python szerkesztő indítása."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:211
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:209
@@ -8182,7 +8182,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:686 ../gui/wxpython/menustrings.py:1626
 msgid "Clip vector maps"
-msgstr "Vektor térkép vágás"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:687 ../gui/wxpython/menustrings.py:1627
 msgid "Extracts features of input map which overlay features of clip map."
@@ -8888,7 +8888,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1756
 msgid "Orthophoto tools"
-msgstr "Ortofotó eszközök"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1757
 msgid "Manage GCPs for 3D correction"
@@ -8900,7 +8900,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:819 ../gui/wxpython/menustrings.py:1759
 msgid "Corrects scanning distortions"
-msgstr "Szkennelési torzítás korrekciója"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:820 ../gui/wxpython/menustrings.py:1760
 msgid "Corrects scanning distortions of a scanned aerial photo."


=====================================
locale/po/grasswxpy_it.po
=====================================
@@ -4545,7 +4545,7 @@ msgstr "Importa dati raster in una mappa raster di GRASS usando la libreria GDAL
 
 #: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1056
 msgid "Import of common raster formats"
-msgstr "Importa formati raster comuni"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1058
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:42
@@ -4717,7 +4717,7 @@ msgstr "Importa dati raster in una mappa vettoriale di GRASS usando la libreria
 
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1086
 msgid "Import of common vector formats"
-msgstr "Importa formati vettoriali comuni"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:1088
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:72
@@ -5090,7 +5090,7 @@ msgstr "Esporta mappa vettoriale"
 
 #: ../gui/wxpython/menustrings.py:131 ../gui/wxpython/menustrings.py:1148
 msgid "Exports a vector map layer to any of the supported OGR vector formats. By default a vector map layer is exported to OGC GeoPackage format."
-msgstr "Esporta una mappa vettoriale in qualsiasi dei formati vettoriali supportati da OGR. Di default una mappa vettoriale è esportata nel formato OGC GeoPackage."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:132 ../gui/wxpython/menustrings.py:1149
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:133
@@ -5124,7 +5124,7 @@ msgstr "Esporta PostGIS"
 
 #: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1154
 msgid "Exports a vector map layer to PostGIS feature table."
-msgstr "Esporta una mappa vettoriale in una tabella di PostGIS."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1156
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:139
@@ -5563,11 +5563,11 @@ msgstr "Lancia script"
 
 #: ../gui/wxpython/menustrings.py:209
 msgid "Simple Python Editor"
-msgstr "Semplice editor Python"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:210
 msgid "Launches Simple Python Editor."
-msgstr "Apre l'editor semplice di Python"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:211
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:209
@@ -5629,11 +5629,11 @@ msgstr "Mostra region usando latitudine e longitudine"
 
 #: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:1198
 msgid "Show current region extent in Map Display"
-msgstr "Mostra l'estensione della region corrente nel Map Display"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1199
 msgid "Shows the extent of the computational region in Map Display."
-msgstr "Mostra l'estensione della region computazionale nel Map Display"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1200
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:219
@@ -8987,7 +8987,7 @@ msgstr "Calcola la correzione topografica della riflettanza."
 
 #: ../gui/wxpython/menustrings.py:816 ../gui/wxpython/menustrings.py:1756
 msgid "Orthophoto tools"
-msgstr "Strument ortofoto"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:817 ../gui/wxpython/menustrings.py:1757
 msgid "Manage GCPs for 3D correction"


=====================================
locale/po/grasswxpy_ko.po
=====================================
@@ -4440,7 +4440,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:37 ../gui/wxpython/menustrings.py:1054
 msgid "Simplified raster import with reprojection"
-msgstr "재투영과 동시에 단순화된 래스터 가져오기"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:38 ../gui/wxpython/menustrings.py:40
 #: ../gui/wxpython/menustrings.py:1055 ../gui/wxpython/menustrings.py:1057
@@ -4451,7 +4451,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:39 ../gui/wxpython/menustrings.py:1056
 msgid "Import of common raster formats"
-msgstr "일반적인 래스터 서식 가져오기"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:41 ../gui/wxpython/menustrings.py:1058
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:42
@@ -4612,7 +4612,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1084
 msgid "Simplified vector import with reprojection"
-msgstr "재투영과 동시에 단순화된 벡터 가져오기"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:68 ../gui/wxpython/menustrings.py:70
 #: ../gui/wxpython/menustrings.py:1085 ../gui/wxpython/menustrings.py:1087
@@ -4623,7 +4623,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1086
 msgid "Import of common vector formats"
-msgstr "일반적인 벡터 서식 가져오기"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:71 ../gui/wxpython/menustrings.py:1088
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:72
@@ -5535,11 +5535,11 @@ msgstr "위도 및 경도를 이용한 영역 보기"
 
 #: ../gui/wxpython/menustrings.py:221 ../gui/wxpython/menustrings.py:1198
 msgid "Show current region extent in Map Display"
-msgstr "지도 디스플레이 내 현재 영역의 범위 보기"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:222 ../gui/wxpython/menustrings.py:1199
 msgid "Shows the extent of the computational region in Map Display."
-msgstr "지도 디스플레이 내 계산 영역의 범위를 보여 줍니다."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:223 ../gui/wxpython/menustrings.py:1200
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:219
@@ -8008,7 +8008,7 @@ msgstr "서브넷 할당"
 
 #: ../gui/wxpython/menustrings.py:656 ../gui/wxpython/menustrings.py:1596
 msgid "Allocates subnets for nearest centers. Center node must be opened (costs >= 0). Costs of center node are used in calculation."
-msgstr "최근접 중심을 위한 서브넷을 할당합니다. 중심 교점이 열려 있어야 합니다 (비용 >= 0). 중심 교점의 비용은 계산에 사용됩니다."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:657 ../gui/wxpython/menustrings.py:1597
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:651
@@ -9725,7 +9725,7 @@ msgstr ""
 
 #: ../gui/wxpython/menustrings.py:965 ../gui/wxpython/menustrings.py:1905
 msgid "Assigns timestamps and registers raster, vector and raster3d maps in a space time dataset."
-msgstr "타임스탬프를 할당하고 시공간 자료세트 안에 래스터, 벡터, 그리고 3차원 래스터 지도를 등록합니다."
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:966 ../gui/wxpython/menustrings.py:1906
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:951


=====================================
locale/po/grasswxpy_zh.po
=====================================
@@ -5025,7 +5025,7 @@ msgstr "导出为PostGIS格式数据"
 
 #: ../gui/wxpython/menustrings.py:137 ../gui/wxpython/menustrings.py:1154
 msgid "Exports a vector map layer to PostGIS feature table."
-msgstr "将矢量地图导出为PostGIS格式数据。"
+msgstr ""
 
 #: ../gui/wxpython/menustrings.py:139 ../gui/wxpython/menustrings.py:1156
 #: ../gui/wxpython/image2target/ii2t_menustrings.py:139


=====================================
raster/r.geomorphon/main.c
=====================================
@@ -494,7 +494,7 @@ int main(int argc, char **argv)
     if (multires) {
 	PATTERN *multi_patterns;
 	MULTI multiple_output[5];	/* ten form maps + all forms */
-	char *postfixes[] = { "scale_300", "scale_100", "scale_50", "scale_20" "scale_10" };	/* in pixels */
+	char *postfixes[] = { "scale_300", "scale_100", "scale_50", "scale_20", "scale_10" };	/* in pixels */
 	num_of_steps = 5;
 	multi_patterns = G_malloc(num_of_steps * sizeof(PATTERN));
 	/* prepare outputs */


=====================================
raster/rasterintro.html
=====================================
@@ -201,7 +201,7 @@ Univariate statistics (<a href="r.univar.html">r.univar</a>) and
 reports are also available (<a href="r.report.html">r.report</a>,<a
 href="r.stats.html">r.stats</a>, <a href="r.volume.html">r.volume</a>).
 
-Since <a href="r.univar.html">r.univar</a> may be slow for extented
+Since <a href="r.univar.html">r.univar</a> may be slow for extended
 statistics these can be calculated using
 <a href="r.stats.quantile.html">r.stats.quantile</a>. Without a zones input
 raster, the <a href="r.quantile.html">r.quantile</a> module will be significantly



View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/compare/310b19dd18fdcd18d33982c50755e8e21aa8974c...1d88499c0aafeb78496edb47da0a0ac70f87a75e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/compare/310b19dd18fdcd18d33982c50755e8e21aa8974c...1d88499c0aafeb78496edb47da0a0ac70f87a75e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20201005/558c113d/attachment-0001.html>

More information about the Pkg-grass-devel mailing list