diff --git a/.flake8 b/.flake8 index 306a11fe02b..90686370f67 100644 --- a/.flake8 +++ b/.flake8 @@ -24,7 +24,6 @@ per-file-ignores = doc/python/m.distance.py: E501 gui/scripts/d.wms.py: E501 gui/wxpython/image2target/g.gui.image2target.py: E501 - gui/wxpython/modules/*: F841, E722 gui/wxpython/nviz/*: E266, E722, F403, F405 gui/wxpython/photo2image/*: F841, E722, E265 gui/wxpython/photo2image/g.gui.photo2image.py: E501, F841 @@ -66,7 +65,6 @@ per-file-ignores = # TODO: Is this really needed? python/grass/pygrass/vector/__init__.py: E402 python/grass/pygrass/raster/__init__.py: E402 - python/grass/gunittest/invoker.py: E721 python/grass/pygrass/vector/__init__.py: E402 python/grass/pygrass/modules/interface/*.py: F401 python/grass/pygrass/modules/grid/*.py: F401 @@ -82,13 +80,11 @@ per-file-ignores = python/grass/temporal/temporal_granularity.py: E722 python/grass/temporal/temporal_raster_base_algebra.py: E722 python/grass/temporal/temporal_topology_dataset_connector.py: E722 - python/grass/temporal/univar_statistics.py: E231 # Current benchmarks/tests are changing sys.path before import. # Possibly, a different approach should be taken there anyway. python/grass/pygrass/tests/benchmark.py: E402, F401, F821 # Configuration file for Sphinx: # Ignoring import/code mix and line length. - python/grass/docs/conf.py: E402 # Files not managed by Black python/grass/imaging/images2gif.py: E226 # Unused imports in init files @@ -118,8 +114,7 @@ per-file-ignores = scripts/*/*.py: E501 temporal/t.rast.to.vect/t.rast.to.vect.py: E501 temporal/t.vect.algebra/t.vect.algebra.py: E501 - # ## used (##% key: r etc) - temporal/t.rast.what/t.rast.what.py: E265, E266, E501 + temporal/t.rast.what/t.rast.what.py: E501 # Line too long (esp. module interface definitions) temporal/*/*.py: E501 diff --git a/CHANGES b/CHANGES index 32af42cc50f..13abffbb905 100644 --- a/CHANGES +++ b/CHANGES @@ -22,6 +22,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -62,6 +63,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main CHANGES in GRASS GIS 8.x ======= CHANGES in GRASS GIS 8.x compared to GRASS GIS 7.x @@ -103,6 +106,7 @@ List of releases: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -318,6 +322,8 @@ List of releases: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main CHANGES in GRASS GIS 8.x https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures80 @@ -331,6 +337,7 @@ List of releases: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD @@ -360,6 +367,9 @@ List of releases: >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= CHANGES in GRASS GIS 8.x https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures80 @@ -374,6 +384,7 @@ List of releases: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -392,6 +403,8 @@ List of releases: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - GitHub list: https://github.com/OSGeo/grass/releases - Overview list: https://trac.osgeo.org/grass/wiki/Release - History: https://grass.osgeo.org/home/history/releases/ (starting 1984!) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1323e09a943..6431e4f76a7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -138,6 +138,7 @@ You can use your favorite tools to change source code or other files <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -179,6 +180,8 @@ You can use your favorite tools to change source code or other files >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main in the local copy of the code. When making changes, please follow the [Programming Style Guide](./doc/development/style_guide.md). @@ -214,6 +217,7 @@ to your code. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -262,6 +266,10 @@ to your code. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main in the local copy of the code. When making changes, please follow Submitting Guidelines at . @@ -319,6 +327,7 @@ to your code. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -467,6 +476,8 @@ to your code. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ### Committing diff --git a/Dockerfile b/Dockerfile index 0fb9c8b5a04..06b3b4b1b61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" @@ -52,12 +53,17 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # syntax=docker/dockerfile:1.10@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5 ======= ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -72,6 +78,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main >>>>>>> main ======= @@ -86,6 +93,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # syntax=docker/dockerfile:1.8@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd ======= ======= @@ -98,6 +107,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # syntax=docker/dockerfile:1.8@sha256:d6d396f3780b1dd56a3acbc975f57bd2fc501989b50164c41387c42d04e780d0 <<<<<<< HEAD <<<<<<< HEAD @@ -161,6 +171,9 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" # syntax=docker/dockerfile:1.8@sha256:d6d396f3780b1dd56a3acbc975f57bd2fc501989b50164c41387c42d04e780d0 >>>>>>> osgeo-main ======= +# syntax=docker/dockerfile:1.8@sha256:d6d396f3780b1dd56a3acbc975f57bd2fc501989b50164c41387c42d04e780d0 +>>>>>>> osgeo-main +======= ======= >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -174,6 +187,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -219,13 +233,18 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile. # Changes to this file must be copied over to the other file. ARG GUI=without -FROM ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe as common_start +FROM ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 as common_start LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Stefan Blumentrath" ======= @@ -247,6 +266,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -276,6 +296,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" @@ -294,6 +316,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -336,6 +359,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LABEL maintainer="tawalika@mundialis.de,neteler@mundialis.de,weinmann@mundialis.de" ENV DEBIAN_FRONTEND noninteractive @@ -357,6 +382,7 @@ ENV DEBIAN_FRONTEND noninteractive <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # define versions to be used # https://github.com/PDAL/PDAL/releases ARG PDAL_VERSION=2.4.3 @@ -404,6 +430,8 @@ ARG LAZ_PERF_VERSION=3.2.0 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main SHELL ["/bin/bash", "-c"] WORKDIR /tmp @@ -441,6 +469,7 @@ RUN apt-get update && apt-get upgrade -y && \ bzip2 \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # define versions to be used # https://github.com/PDAL/PDAL/releases @@ -650,6 +679,8 @@ RUN apt-get update && apt-get upgrade -y && \ >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cmake \ <<<<<<< HEAD @@ -657,6 +688,9 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -682,6 +716,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -722,6 +757,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main geos-bin \ git \ @@ -789,6 +826,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -857,6 +895,10 @@ RUN apt-get update && apt-get upgrade -y && \ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main git \ language-pack-en-base \ @@ -923,6 +965,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1013,6 +1056,11 @@ RUN apt-get update && apt-get upgrade -y && \ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main unzip \ vim \ @@ -1035,6 +1083,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1075,6 +1124,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main zlib1g \ " @@ -1278,6 +1329,7 @@ WORKDIR /src/grass_build <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1346,6 +1398,10 @@ WORKDIR /src/grass_build ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main zlib1g-dev @@ -1437,6 +1493,7 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1528,6 +1585,11 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Set environmental variables for GRASS GIS compilation, without debug symbols # Set gcc/g++ environmental variables for GRASS GIS compilation, without debug symbols ENV MYCFLAGS "-O2 -std=gnu99 -m64" @@ -1558,6 +1620,7 @@ RUN make distclean || echo "nothing to clean" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD RUN /src/grass_build/configure \ --with-cxx \ --enable-largefile \ @@ -1621,6 +1684,8 @@ RUN /src/grass_build/configure \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main RUN ./configure $GRASS_CONFIG \ && make -j $NUMTHREADS \ && make install && ldconfig \ @@ -1661,6 +1726,7 @@ RUN if [ ! -e /usr/local/bin/grass ] ; then ln -s /usr/local/bin/grass* /usr/loc <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)) ======= >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)) @@ -1739,6 +1805,11 @@ RUN if [ ! -e /usr/local/bin/grass ] ; then ln -s /usr/local/bin/grass* /usr/loc ======= >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)) >>>>>>> osgeo-main +======= +>>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)) +======= +>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)) +>>>>>>> osgeo-main # Leave build stage FROM grass_gis as grass_gis_final @@ -1803,6 +1874,7 @@ VOLUME /grassdb <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2010,6 +2082,10 @@ CMD ["$GRASSBIN", "--version"] CMD ["$GRASSBIN", "--version"] ======= >>>>>>> osgeo-main +======= +CMD ["$GRASSBIN", "--version"] +======= +>>>>>>> osgeo-main CMD ["bash", "-c", "$GRASSBIN", "--version"] ======= RUN /src/grass_build/configure \ @@ -2067,6 +2143,9 @@ RUN /src/grass_build/configure \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -2155,6 +2234,7 @@ VOLUME /grassdb <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -2178,6 +2258,8 @@ VOLUME /grassdb ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704)) @@ -2191,6 +2273,7 @@ VOLUME /grassdb <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -2242,3 +2325,5 @@ VOLUME /grassdb >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main diff --git a/INSTALL b/INSTALL index 119b0a84ee2..46241432431 100644 --- a/INSTALL +++ b/INSTALL @@ -82,6 +82,7 @@ explains the options used to disable the compilation of non-mandatory <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 59b367cd2d (WMS: replace broken URLs with alternative WMS (#1635)) ======= @@ -110,6 +111,8 @@ explains the options used to disable the compilation of non-mandatory >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS modules. See REQUIREMENTS.html for details on dependencies. Detailed Wiki notes for various operating systems (MS-Windows, GNU/Linux distributions, FreeBSD, AIX, etc) are available at: @@ -126,6 +129,7 @@ https://grasswiki.osgeo.org/wiki/Compile_and_Install <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -166,6 +170,8 @@ GRASS modules. See REQUIREMENTS.html for details. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main First step of the compilation (-g for debugging, or -O2 for optimization): @@ -207,6 +213,7 @@ Next step is the compilation itself: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD make ======= @@ -267,6 +274,9 @@ https://grasswiki.osgeo.org/wiki/Compile_and_Install ======= make >>>>>>> osgeo-main +======= + make +>>>>>>> osgeo-main Note for Solaris users (see also Wiki page above): diff --git a/INSTALL.md b/INSTALL.md index 88142cba26c..341a3852bd9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -32,6 +32,7 @@ Please read _all_ text below. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -73,6 +74,8 @@ Please read _all_ text below. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - (K) SUPPORT - (L) GRASS GIS PROGRAMMER'S MANUAL - (M) CONTRIBUTING CODE AND PATCHES @@ -91,6 +94,7 @@ Please read _all_ text below. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -160,6 +164,10 @@ Please read _all_ text below. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main - (K) LARGE FILE SUPPORT (for raster maps) - (L) SUPPORT - (M) GRASS GIS PROGRAMMER'S MANUAL @@ -182,6 +190,7 @@ Please read _all_ text below. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -273,6 +282,11 @@ Please read _all_ text below. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## PREREQUISITES @@ -302,6 +316,7 @@ which have to be installed before installing/compiling GRASS: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -391,6 +406,11 @@ For links to the software, see [REQUIREMENTS.md](REQUIREMENTS.md) in this directory. ======= >>>>>>> osgeo-main +======= +For links to the software, see [REQUIREMENTS.md](REQUIREMENTS.md) in this +directory. +======= +>>>>>>> osgeo-main For links to the software, see ./REQUIREMENTS.html in this directory: >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -416,6 +436,7 @@ directory. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -445,6 +466,8 @@ directory. ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= For links to the software, see ./REQUIREMENTS.html in this directory: ======= @@ -466,6 +489,7 @@ directory. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -557,6 +581,8 @@ directory: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Installation order: @@ -603,6 +629,7 @@ from <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Further instructions at ======= <<<<<<< HEAD @@ -640,6 +667,8 @@ Further instructions at ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= Further instructions at >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -659,6 +688,7 @@ Further instructions at <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -710,6 +740,8 @@ Further instructions at >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## (B) COMPILATION @@ -747,6 +779,7 @@ explains the options used to disable the compilation of non-mandatory <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -822,6 +855,10 @@ GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencie GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencies. ======= >>>>>>> osgeo-main +======= +GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencies. +======= +>>>>>>> osgeo-main GRASS modules. See REQUIREMENTS.html for details on dependencies. >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -844,6 +881,7 @@ GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencie <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -873,6 +911,8 @@ GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencie ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= GRASS modules. See REQUIREMENTS.html for details on dependencies. ======= GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencies. @@ -892,6 +932,7 @@ GRASS modules. See [REQUIREMENTS.md](REQUIREMENTS.md) for details on dependencie <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -976,6 +1017,8 @@ GRASS modules. See REQUIREMENTS.html for details on dependencies. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Detailed Wiki notes for various operating systems (MS-Windows, GNU/Linux distributions, FreeBSD, AIX, etc) are available at: @@ -1070,6 +1113,7 @@ make install <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1162,6 +1206,11 @@ make install ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main To fully enable 64bit library usage for GRASS on 64bit platforms, the following additional parameters are recommended/required: @@ -1191,6 +1240,7 @@ See also CODE OPTIMIZATION below. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1282,6 +1332,11 @@ See also CODE OPTIMIZATION below. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## (D) INSTALLATION (first time) After compilation, the resulting code is stored in the directory @@ -1427,6 +1482,7 @@ CFLAGS="-mcpu=pentium4" # Intel Pentium4 processor <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1516,6 +1572,11 @@ CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ -minline-all-stringops" # Intel XEON 64bit processor ======= >>>>>>> osgeo-main +======= +CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ + -minline-all-stringops" # Intel XEON 64bit processor +======= +>>>>>>> osgeo-main CFLAGS="-O2 -msse -msse2 -mfpmath=sse -minline-all-stringops" # Intel XEON 64bit processor >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1539,6 +1600,7 @@ CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1568,6 +1630,8 @@ CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= CFLAGS="-O2 -msse -msse2 -mfpmath=sse -minline-all-stringops" # Intel XEON 64bit processor ======= CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ @@ -1588,6 +1652,7 @@ CFLAGS="-O2 -msse -msse2 -mfpmath=sse \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1675,6 +1740,8 @@ CFLAGS="-O2 -msse -msse2 -mfpmath=sse -minline-all-stringops" # Intel XEON 64bit >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main CFLAGS="-mtune=nocona -m64 -minline-all-stringops" # Intel Pentium 64bit processor ``` @@ -1733,6 +1800,7 @@ See also the file `./doc/debugging.txt` and the Wiki page <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1768,6 +1836,8 @@ See also the file `./doc/debugging.txt` and the Wiki page >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## (K) SUPPORT ======= ======= @@ -1786,6 +1856,7 @@ See also the file `./doc/debugging.txt` and the Wiki page <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1834,6 +1905,8 @@ See also the file `./doc/debugging.txt` and the Wiki page >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## (K) LARGE FILE SUPPORT (for raster maps) GRASS GIS includes improved support for reading and writing large files @@ -1870,6 +1943,7 @@ See also <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1961,6 +2035,11 @@ See also ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Note that this code is still actively being developed and errors inevitably turn up. If you find a bug, please report it to the GRASS bug tracking system @@ -1986,6 +2065,7 @@ developers mailing list. See <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ## (M) GRASS PROGRAMMER'S MANUAL ======= <<<<<<< HEAD @@ -2028,6 +2108,8 @@ developers mailing list. See >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## (L) GRASS PROGRAMMER'S MANUAL ======= ## (M) GRASS PROGRAMMER'S MANUAL @@ -2046,6 +2128,7 @@ developers mailing list. See <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ## (M) GRASS PROGRAMMER'S MANUAL >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2129,6 +2212,11 @@ developers mailing list. See ## (M) GRASS PROGRAMMER'S MANUAL >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +## (M) GRASS PROGRAMMER'S MANUAL +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main The Programmer's manual is generated from the source code. This requires the installation of @@ -2218,6 +2306,9 @@ make pdfdocs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2239,6 +2330,7 @@ make pdfdocs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ## (N) CONTRIBUTING CODE AND PATCHES >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2322,6 +2414,11 @@ make pdfdocs ## (N) CONTRIBUTING CODE AND PATCHES >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +## (N) CONTRIBUTING CODE AND PATCHES +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Please see @@ -2432,6 +2529,9 @@ Please see ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2456,6 +2556,7 @@ Please see <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2547,6 +2648,11 @@ Please see ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## Authors Markus Neteler and the GRASS Development Team diff --git a/Makefile b/Makefile index cf0a9593cb2..0dc42c346ce 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team @@ -92,6 +93,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # COPYRIGHT: (C) 2002-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2002-2022 by the GRASS Development Team @@ -111,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -134,6 +138,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # COPYRIGHT: (C) 2002-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -153,6 +159,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -257,6 +264,11 @@ # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) >>>>>>> osgeo-main +======= +======= +# COPYRIGHT: (C) 2002-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> osgeo-main # # This program is free software under the GNU General Public # License (>=v2). Read the file COPYING that comes with GRASS @@ -322,6 +334,7 @@ SUBDIRS = $(DIRS) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -397,6 +410,8 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.html cont ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main FILES = AUTHORS CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv ======= ======= @@ -420,6 +435,9 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.html cont >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -440,6 +458,7 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contri <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -473,6 +492,10 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contri ======= >>>>>>> osgeo-main ======= +>>>>>>> 10cb905c76 (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> osgeo-main +======= FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.html contributors.csv contributors_extra.csv translators.csv ======= FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contributors.csv contributors_extra.csv translators.csv @@ -492,6 +515,7 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.md contri <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -578,6 +602,9 @@ FILES = AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL.md REQUIREMENTS.html cont ======= >>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main FILES_DST = $(patsubst %,$(ARCH_DISTDIR)/%,$(FILES)) default: diff --git a/NEWS b/NEWS index 697e14b374e..7bf60b21c9d 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,7 @@ GRASS GIS 8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -95,6 +96,10 @@ GRASS GIS 8 o https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures82 ======= >>>>>>> osgeo-main +======= + o https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures82 +======= +>>>>>>> osgeo-main >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -118,6 +123,7 @@ GRASS GIS 8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -214,6 +220,8 @@ GRASS GIS 8 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS GIS 7 o https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures78 diff --git a/README.md b/README.md index 4152a7a1772..875cc63fa71 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [![CentOS](https://github.com/OSGeo/grass/workflows/CentOS/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3ACentOS) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5176030.svg)](https://doi.org/10.5281/zenodo.5176030) [![Join the chat at https://gitter.im/grassgis/community](https://badges.gitter.im/grassgis/community.svg)](https://gitter.im/grassgis/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) @@ -67,6 +68,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/OSGeo/grass/badge)](https://securityscorecards.dev/viewer/?uri=github.com/OSGeo/grass) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/2470/badge)](https://www.bestpractices.dev/projects/2470) [![Coverity](https://scan.coverity.com/projects/1038/badge.svg)](https://scan.coverity.com/projects/grass) @@ -93,6 +96,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # GRASS GIS Repository >>>>>>> 0b33f0923a (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) @@ -159,6 +163,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # GRASS GIS Repository >>>>>>> 0b33f0923a (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) @@ -175,6 +181,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> bbd009e3f8 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= ======= @@ -198,6 +205,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5176030.svg)](https://doi.org/10.5281/zenodo.5176030) [![Join the chat at https://gitter.im/grassgis/community](https://badges.gitter.im/grassgis/community.svg)](https://gitter.im/grassgis/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) @@ -215,6 +224,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -238,6 +248,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= [![CentOS](https://github.com/OSGeo/grass/workflows/CentOS/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3ACentOS) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5176030.svg)](https://doi.org/10.5281/zenodo.5176030) @@ -254,6 +266,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -335,6 +348,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## Description @@ -367,6 +382,7 @@ visualization. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -511,6 +527,13 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +Launch this repository in Binder and experiment with GRASS's Python API in +Jupyter Notebooks by clicking the button below: +======= +>>>>>>> osgeo-main Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= Launch this repository in Binder and experiment with GRASS's Python API in @@ -531,6 +554,7 @@ Jupyter Notebooks by clicking the button below: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -566,6 +590,8 @@ Jupyter Notebooks by clicking the button below: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/OSGeo/grass/main?labpath=doc%2Fnotebooks%2Fjupyter_example.ipynb) @@ -585,6 +611,7 @@ Jupyter Notebooks by clicking the button below: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: @@ -640,6 +667,11 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyt >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: +>>>>>>> osgeo-main [![Binder](https://camo.githubusercontent.com/581c077bdbc6ca6899c86d0acc6145ae85e9d80e6f805a1071793dbe48917982/68747470733a2f2f6d7962696e6465722e6f72672f62616467655f6c6f676f2e737667)](https://mybinder.org/v2/gh/OSGeo/grass/main?urlpath=lab%2Ftree%2Fdoc%2Fnotebooks%2Fjupyter_example.ipynb) @@ -662,6 +694,7 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -704,6 +737,8 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyt >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= ## Contributing @@ -720,6 +755,7 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyt <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -828,6 +864,8 @@ Launch this repository in Binder and experiment with GRASS's Python API in Jupyt >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main In general: you don't really need write access as you can simply open a [pull request](https://github.com/OSGeo/grass/pulls) to contribute to @@ -861,6 +899,7 @@ GRASS GIS. See [CONTRIBUTING file](CONTRIBUTING.md) for more details. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -918,6 +957,8 @@ GRASS GIS. See [CONTRIBUTING file](CONTRIBUTING.md) for more details. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are detailed [compile instructions](https://grasswiki.osgeo.org/wiki/Compile_and_Install) in the Wiki. @@ -940,6 +981,7 @@ in the Wiki. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -971,6 +1013,8 @@ in the Wiki. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are detailed [compile instructions](https://grasswiki.osgeo.org/wiki/Compile_and_Install) in the Wiki. >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -990,6 +1034,7 @@ Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are det <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are detailed [compile instructions](https://grasswiki.osgeo.org/wiki/Compile_and_Install) in the Wiki. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -1026,6 +1071,8 @@ Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are det ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are detailed [compile instructions](https://grasswiki.osgeo.org/wiki/Compile_and_Install) in the Wiki. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= @@ -1047,6 +1094,7 @@ in the Wiki. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1075,6 +1123,8 @@ in the Wiki. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -1093,6 +1143,7 @@ in the Wiki. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1156,6 +1207,8 @@ Yes, you should really read [INSTALL.md](INSTALL.md). In addition, there are det >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## Docker @@ -1189,6 +1242,7 @@ containing the source code): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1276,6 +1330,10 @@ containing the source code): ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +>>>>>>> osgeo-main A. Docker image **without graphical user interface - wxGUI**. ======= @@ -1306,6 +1364,7 @@ docker build -t grassgis . <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1352,6 +1411,8 @@ docker build -t grassgis . >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ``` docker build -t grassgis80 . <<<<<<< HEAD @@ -1376,6 +1437,7 @@ docker build -t grassgis . <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1405,6 +1467,8 @@ docker build -t grassgis . ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ```bash docker build -t grassgis . >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1422,6 +1486,7 @@ docker build -t grassgis . <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1497,6 +1562,8 @@ docker build -t grassgis80 . >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ``` A test run (assuming you have the existing GRASS GIS test location; it can be @@ -1530,6 +1597,7 @@ docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1604,6 +1672,10 @@ docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \ ======= --env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \ ======= +>>>>>>> osgeo-main +======= + --env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \ +======= >>>>>>> osgeo-main --env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \ >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -1627,6 +1699,7 @@ docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= --env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1751,6 +1824,11 @@ docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \ ======= --env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + --env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main --exec g.region -p @@ -1780,6 +1858,7 @@ docker run -it --rm --user=$(id -u):$(id -g) \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1842,6 +1921,8 @@ docker run -it --rm --user=$(id -u):$(id -g) \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis \ grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p @@ -1863,6 +1944,7 @@ Note that the first `grassgis` is the name of the image while the second <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1899,6 +1981,8 @@ Note that the first `grassgis` is the name of the image while the second >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis80 \ grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p @@ -1920,6 +2004,7 @@ Note that the first `grassgis80` is the name of the image while the second <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -1948,6 +2033,8 @@ Note that the first `grassgis80` is the name of the image while the second >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis80 \ grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p @@ -1969,6 +2056,7 @@ Note that the first `grassgis80` is the name of the image while the second <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1997,6 +2085,8 @@ Note that the first `grassgis80` is the name of the image while the second >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis \ grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p @@ -2018,6 +2108,7 @@ Note that the first `grassgis` is the name of the image while the second <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2046,6 +2137,8 @@ Note that the first `grassgis` is the name of the image while the second >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis \ grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p @@ -2067,6 +2160,7 @@ Note that the first `grassgis` is the name of the image while the second <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2121,6 +2215,8 @@ Note that the first `grassgis` is the name of the image while the second >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main `grass` is the name of the executable. To run the tests (again assuming local location): @@ -2152,6 +2248,7 @@ docker run -it --rm --user=$(id -u):$(id -g) \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2226,6 +2323,10 @@ docker run -it --rm --user=$(id -u):$(id -g) \ ======= grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \ ======= +>>>>>>> osgeo-main +======= + grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \ +======= >>>>>>> osgeo-main grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \ >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -2249,6 +2350,7 @@ docker run -it --rm --user=$(id -u):$(id -g) \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2373,6 +2475,11 @@ docker run -it --rm --user=$(id -u):$(id -g) \ ======= grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main python -m grass.gunittest.main \ --location nc_basic_spm_grass7 --location-type nc @@ -2421,6 +2528,7 @@ make distclean <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2461,6 +2569,8 @@ make distclean ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## Further documents @@ -2486,6 +2596,7 @@ make distclean <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -2514,6 +2625,8 @@ make distclean >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main [![GRASS contributors](https://contrib.rocks/image?repo=OSGeo/grass "GRASS contributors")](https://github.com/OSGeo/grass/graphs/contributors) ======= ======= @@ -2530,6 +2643,7 @@ make distclean <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2573,6 +2687,8 @@ make distclean >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main You can generate locally the [GRASS GIS Programmer's Manual](https://grass.osgeo.org/programming8/). This needs doxygen () and optionally @@ -2624,6 +2740,7 @@ make pdfdocs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -2647,6 +2764,8 @@ make pdfdocs ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2664,6 +2783,7 @@ make pdfdocs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2718,3 +2838,5 @@ make pdfdocs >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main diff --git a/REQUIREMENTS.html b/REQUIREMENTS.html index 089e3ae1aaa..71299cf8091 100644 --- a/REQUIREMENTS.html +++ b/REQUIREMENTS.html @@ -17,6 +17,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -38,6 +39,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main REQUIREMENTS to compile GRASS GIS 8 @@ -57,6 +60,7 @@

REQUIREMENTS to compile GRASS GIS 8

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= REQUIREMENTS to compile GRASS GIS 7 ======= @@ -130,6 +134,8 @@

REQUIREMENTS to compile GRASS GIS 8

>>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main A workstation running some flavor of UNIX including GNU/Linux, Solaris, IRIX, BSD, Mac OSX, Cygwin or MinGW (on Win32/Win64). Ideally, you should have at least 800 MB of @@ -152,6 +158,7 @@

REQUIREMENTS to compile GRASS GIS 8

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD To enable and disable features please read the INSTALL.md file. ======= To enable and disable features please read the INSTALL file. @@ -203,6 +210,9 @@

REQUIREMENTS to compile GRASS GIS 8

======= To enable and disable features please read the INSTALL.md file. >>>>>>> osgeo-main +======= +To enable and disable features please read the INSTALL.md file. +>>>>>>> osgeo-main

General requirements:

@@ -255,6 +265,7 @@

General requirements:

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
  • Python >= 3.7 (for temporal framework, scripts, wxGUI, and ctypes interface)
    =======
  • Python >= 3.6 (for temporal framework, scripts, wxGUI, and ctypes interface)
    @@ -306,6 +317,9 @@

    General requirements:

    =======
  • Python >= 3.7 (for temporal framework, scripts, wxGUI, and ctypes interface)
    >>>>>>> osgeo-main +======= +
  • Python >= 3.7 (for temporal framework, scripts, wxGUI, and ctypes interface)
    +>>>>>>> osgeo-main https://www.python.org
    • @@ -478,6 +492,7 @@

    Optional packages:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -515,6 +530,8 @@

    Optional packages:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    Note:

    @@ -551,6 +568,7 @@

    Note:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -573,6 +591,8 @@

    Note:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main © GRASS Development Team 1997-2023

    Please report bugs here: @@ -587,6 +607,7 @@

    Note:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -656,5 +677,7 @@

    Note:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md index a12bf0c62ac..235904d753d 100644 --- a/REQUIREMENTS.md +++ b/REQUIREMENTS.md @@ -82,6 +82,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -123,6 +124,8 @@ Note: also the respective development packages (commonly named `xxx-dev` or >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - **LIBSVM** (for SVM classification modules `i.svm.train` and `i.svm.predict`) [https://www.csie.ntu.edu.tw/~cjlin/libsvm/](https://www.csie.ntu.edu.tw/~cjlin/libsvm/) ======= @@ -141,6 +144,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -210,6 +214,10 @@ Note: also the respective development packages (commonly named `xxx-dev` or ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main - **libtiff** (for `r.out.tiff`), usually already installed. [https://gitlab.com/libtiff/libtiff](https://gitlab.com/libtiff/libtiff) - **readline** for extra command prompt functionality @@ -232,6 +240,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -273,6 +282,8 @@ Note: also the respective development packages (commonly named `xxx-dev` or >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - **PDAL** ( for LAS import modules `r.in.pdal` and `v.in.pdal`) [https://pdal.io](https://pdal.io) ======= @@ -291,6 +302,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -360,6 +372,10 @@ Note: also the respective development packages (commonly named `xxx-dev` or ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main - **PostgreSQL libraries** (for the PostgreSQL database interface and PostGIS support) [https://www.postgresql.org](https://www.postgresql.org) - **MariaDB/MySQL libraries** (for the MySQL database interface) @@ -388,6 +404,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -480,6 +497,11 @@ Note: also the respective development packages (commonly named `xxx-dev` or ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main - **Ctypes** (for ctypes interface) Ctypes can be added as a third-party module in Python 2.3 and 2.4 - [https://pypi.org/project/ctypes/1.0.2/](https://pypi.org/project/ctypes/1.0.2/) @@ -501,6 +523,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -592,6 +615,11 @@ Note: also the respective development packages (commonly named `xxx-dev` or ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main - **wxPython >= 2.8.10.1** (for wxGUI) [https://www.wxpython.org](https://www.wxpython.org) - **NumPy >= 1.0.4** (for various wxGUI components and pyGRASS) @@ -629,6 +657,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -721,6 +750,11 @@ Note: also the respective development packages (commonly named `xxx-dev` or ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main - **six** (`python-six`, needed for Python API and for cross-version Python compatibility) [https://pypi.python.org/pypi/six](https://pypi.python.org/pypi/six) @@ -742,6 +776,7 @@ Note: also the respective development packages (commonly named `xxx-dev` or <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -833,6 +868,11 @@ Note: also the respective development packages (commonly named `xxx-dev` or ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main - **FFMPEG or alternative** (for wxGUI Animation tool - `g.gui.module`), specifically ffmpeg tool [https://ffmpeg.org](https://ffmpeg.org) @@ -878,6 +918,7 @@ MacOSX users may go here to download precompiled libraries etc.: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD © _GRASS Development Team 1997-2023_ ======= <<<<<<< HEAD @@ -920,6 +961,8 @@ MacOSX users may go here to download precompiled libraries etc.: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main © _GRASS Development Team 1997-2024_ ======= © _GRASS Development Team 1997-2023_ @@ -938,6 +981,7 @@ MacOSX users may go here to download precompiled libraries etc.: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= © _GRASS Development Team 1997-2023_ >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -1021,6 +1065,11 @@ MacOSX users may go here to download precompiled libraries etc.: © _GRASS Development Team 1997-2023_ >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +© _GRASS Development Team 1997-2023_ +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main Please report bugs here: [https://grass.osgeo.org/contribute/](https://grass.osgeo.org/contribute/) diff --git a/aclocal.m4 b/aclocal.m4 index cbcab80c151..d8b473dfffd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -239,6 +239,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -309,6 +310,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ ======= >>>>>>> osgeo-main ======= +#include +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) #include >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -335,6 +340,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -425,6 +431,8 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include <$1> int main(void) { FILE *fp = fopen("conftestdata","w"); @@ -635,6 +643,7 @@ AC_DEFUN([SC_ENABLE_SHARED], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(STATIC_BUILD, 1, [define for Windows static build]) ======= @@ -677,6 +686,8 @@ AC_DEFUN([SC_ENABLE_SHARED], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(STATIC_BUILD, 1, [Define to 1 for Windows static build.]) ======= @@ -696,6 +707,7 @@ AC_DEFUN([SC_ENABLE_SHARED], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(STATIC_BUILD, 1, [define for Windows static build]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -778,6 +790,11 @@ AC_DEFUN([SC_ENABLE_SHARED], [ ======= AC_DEFINE(STATIC_BUILD, 1, [define for Windows static build]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + AC_DEFINE(STATIC_BUILD, 1, [define for Windows static build]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main GRASS_LIBRARY_TYPE='stlib' fi @@ -904,6 +921,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -947,6 +965,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(_REENTRANT, 1, [Define to 1 for _REENTRANT flag (for SunOS).]) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to 1 to enable threading extensions on Solaris.]) @@ -968,6 +988,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -996,6 +1017,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -1014,6 +1037,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1055,6 +1079,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Note: need the LIBS below, otherwise Tk won't find Tcl's # symbols when dynamically loaded into tclsh. @@ -1093,6 +1119,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -1136,6 +1163,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(_REENTRANT, 1, [Define to 1 for _REENTRANT flag (for SunOS).]) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to 1 to enable threading extensions on Solaris.]) @@ -1157,6 +1186,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1185,6 +1215,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -1203,6 +1235,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1244,6 +1277,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Note: need the LIBS below, otherwise Tk won't find Tcl's # symbols when dynamically loaded into tclsh. @@ -1295,6 +1330,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # TODO: add optional pthread support with any combination of: @@ -1357,6 +1393,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # TODO: add optional pthread support with any combination of: # CFLAGS="$CFLAGS -pthread" @@ -1378,6 +1416,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1407,6 +1446,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) # TODO: add optional pthread support with any combination of: ======= @@ -1426,6 +1467,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1454,6 +1496,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # TODO: add optional pthread support with any combination of: ======= @@ -1472,6 +1516,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1517,6 +1562,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # CFLAGS="$CFLAGS -pthread" # LDFLAGS="$LDFLAGS -lpthread" @@ -1537,6 +1584,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1621,6 +1669,11 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ;; *-netbsd*) @@ -1658,6 +1711,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -1701,6 +1755,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # AC_DEFINE(_REENTRANT, 1, [Define to 1 for _REENTRANT flag (for SunOS).]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to 1 to enable threading extensions on Solaris.]) @@ -1722,6 +1778,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1750,6 +1807,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -1768,6 +1827,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1809,6 +1869,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ;; *aix*) @@ -1865,6 +1927,7 @@ dnl to enable Clang detection <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1888,6 +1951,8 @@ dnl to enable Clang detection >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # _LOC_LANG_OPENMP # --------------- @@ -1994,6 +2059,7 @@ dnl -------------------- / OpenMP --------------------------------------------- <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727)) ======= >>>>>>> osgeo-main @@ -2384,6 +2450,11 @@ dnl -------------------- / OpenMP --------------------------------------------- >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= + <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main @@ -2541,6 +2612,7 @@ dnl -------------------- / OpenMP --------------------------------------------- <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -2610,6 +2682,10 @@ dnl -------------------- / OpenMP --------------------------------------------- ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main dnl XXXX Begin Stolen from cdrtools-2.01 dnl XXXX by Joerg Schilling et al. XXXXXXXXX diff --git a/binder/requirements.txt b/binder/requirements.txt index 71b3badc0b9..2f149bd0f98 100644 --- a/binder/requirements.txt +++ b/binder/requirements.txt @@ -24,6 +24,7 @@ ply <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -90,6 +91,10 @@ PyVirtualDisplay PyVirtualDisplay ======= >>>>>>> osgeo-main +======= +PyVirtualDisplay +======= +>>>>>>> osgeo-main folium >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733)) ======= @@ -112,6 +117,7 @@ PyVirtualDisplay <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -190,3 +196,5 @@ PyVirtualDisplay >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main diff --git a/config.guess b/config.guess index 1a10f54cb9a..d3b201efe21 100755 --- a/config.guess +++ b/config.guess @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -66,6 +67,8 @@ timestamp='2022-01-09' >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale @@ -81,6 +84,7 @@ timestamp='2024-01-01' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -107,6 +111,8 @@ timestamp='2024-01-01' ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale @@ -120,6 +126,7 @@ timestamp='2022-01-09' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -163,6 +170,10 @@ timestamp='2022-01-09' ======= >>>>>>> osgeo-main ======= +>>>>>>> ba9afcba1b (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= # Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale @@ -176,6 +187,7 @@ timestamp='2022-01-09' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -227,6 +239,9 @@ timestamp='2022-01-09' ======= >>>>>>> 81d97e00cb (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 81d97e00cb (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -293,6 +308,7 @@ Copyright 1992-2024 Free Software Foundation, Inc. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -416,6 +432,13 @@ Copyright 1992-2022 Free Software Foundation, Inc. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +Copyright 1992-2022 Free Software Foundation, Inc. +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +Copyright 1992-2022 Free Software Foundation, Inc. +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -829,6 +852,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -900,6 +924,8 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # Japanese Language versions have a version number like `4.1.3-JL'. <<<<<<< HEAD @@ -911,6 +937,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -954,6 +981,10 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` GUESS=sparc-sun-sunos$SUN_REL @@ -1412,6 +1443,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1534,6 +1566,13 @@ EOF <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= + UNAME_PROCESSOR=`/usr/bin/uname -p` +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= + UNAME_PROCESSOR=`/usr/bin/uname -p` +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main case $UNAME_PROCESSOR in amd64) @@ -1605,6 +1644,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1656,6 +1696,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) GUESS="$UNAME_MACHINE-pc-managarm-mlibc" @@ -1670,6 +1712,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1690,6 +1733,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1700,6 +1745,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1757,6 +1803,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix @@ -1771,6 +1819,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1823,6 +1872,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main set_cc_for_build CPU=$UNAME_MACHINE @@ -1852,6 +1903,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1871,6 +1923,8 @@ EOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= GUESS=$UNAME_MACHINE-unknown-linux-$LIBC >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1884,6 +1938,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1948,6 +2003,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ;; aarch64_be:Linux:*:*) @@ -2023,6 +2080,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2075,6 +2133,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main kvx:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -2093,6 +2153,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2112,6 +2173,8 @@ EOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2125,6 +2188,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2189,6 +2253,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; @@ -2333,6 +2399,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2358,6 +2425,8 @@ EOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ @@ -2375,6 +2444,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2475,6 +2545,11 @@ EOF >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ;; xtensa*:Linux:*:*) @@ -2647,6 +2722,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2688,6 +2764,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2698,6 +2776,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2727,6 +2806,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # says GUESS=i586-unisys-sysv4 @@ -2782,6 +2863,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2835,6 +2917,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ppc:Haiku:*:*) # Haiku running on Apple PowerPC GUESS=powerpc-apple-haiku @@ -2848,6 +2932,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2873,6 +2958,8 @@ EOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= x86_64:Haiku:*:*) GUESS=x86_64-unknown-haiku @@ -2884,6 +2971,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2918,6 +3006,8 @@ EOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= x86_64:Haiku:*:*) GUESS=x86_64-unknown-haiku @@ -2929,6 +3019,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2975,6 +3066,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ;; SX-4:SUPER-UX:*:*) @@ -3160,6 +3253,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3269,6 +3363,11 @@ EOF ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main esac # Do we have a guess based on uname results? diff --git a/config.sub b/config.sub index 18278e1bb9a..6e44257e04a 100755 --- a/config.sub +++ b/config.sub @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -66,6 +67,8 @@ timestamp='2022-01-03' >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Copyright 1992-2024 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale @@ -83,6 +86,7 @@ timestamp='2024-01-01' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD timestamp='2024-01-01' <<<<<<< HEAD <<<<<<< HEAD @@ -147,6 +151,8 @@ timestamp='2022-01-03' >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main timestamp='2022-01-03' >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -155,6 +161,9 @@ timestamp='2022-01-03' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -176,6 +185,7 @@ timestamp='2022-01-03' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -227,6 +237,9 @@ timestamp='2022-01-03' ======= >>>>>>> 81d97e00cb (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 81d97e00cb (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -309,6 +322,7 @@ Copyright 1992-2024 Free Software Foundation, Inc. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -432,6 +446,13 @@ Copyright 1992-2022 Free Software Foundation, Inc. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +Copyright 1992-2022 Free Software Foundation, Inc. +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +Copyright 1992-2022 Free Software Foundation, Inc. +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1889,6 +1910,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1940,6 +1962,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ;; managarm*) @@ -1952,6 +1976,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1972,6 +1997,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1982,6 +2009,7 @@ EOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2039,6 +2067,8 @@ EOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ;; *) @@ -2473,6 +2503,7 @@ case $os in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2595,6 +2626,13 @@ case $os in <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= + musl* | newlib* | relibc* | uclibc*) +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= + musl* | newlib* | relibc* | uclibc*) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ;; # Likewise for "kernel-abi" @@ -2838,6 +2876,7 @@ case $os in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2943,6 +2982,8 @@ case $os in ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main | fiwix* ) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2956,6 +2997,9 @@ case $os in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3035,6 +3079,7 @@ case $kernel-$os-$obj in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3048,6 +3093,8 @@ case $kernel-$os-$obj in ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ | linux-musl* | linux-relibc* | linux-uclibc* ) @@ -3062,6 +3109,9 @@ case $kernel-$os in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3076,6 +3126,7 @@ case $kernel-$os in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= case $kernel-$os in @@ -3244,6 +3295,8 @@ case $kernel-$os in ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main managarm-mlibc*- | managarm-kernel*- ) ;; @@ -3258,6 +3311,7 @@ case $kernel-$os in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3277,6 +3331,8 @@ case $kernel-$os in >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3290,6 +3346,7 @@ case $kernel-$os in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3354,6 +3411,8 @@ case $kernel-$os in ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # These are just libc implementations, not actual OSes, and thus # require a kernel. diff --git a/configure b/configure index 2780711729e..21884c87b52 100755 --- a/configure +++ b/configure @@ -17,6 +17,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -58,6 +59,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Generated by GNU Autoconf 2.71. # # @@ -78,6 +81,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -147,6 +151,10 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Generated by GNU Autoconf 2.69. # # @@ -168,6 +176,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -259,6 +268,11 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # # # This configure script is free software; the Free Software Foundation @@ -286,6 +300,7 @@ DUALCASE=1; export DUALCASE # for MKS sh <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : ======= <<<<<<< HEAD @@ -328,6 +343,8 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : @@ -348,6 +365,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -430,6 +448,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : ======= if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main emulate sh NULLCMD=: @@ -454,6 +477,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD @@ -496,6 +520,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -514,6 +540,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -596,6 +623,11 @@ else ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +else +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main case `(set -o) 2>/dev/null` in #( *posix*) : @@ -623,6 +655,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -664,6 +697,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Reset variables that may have inherited troublesome values from # the environment. @@ -719,6 +754,7 @@ if ${PATH_SEPARATOR+false} :; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -788,6 +824,10 @@ if ${PATH_SEPARATOR+false} :; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_nl=' ' export as_nl @@ -845,6 +885,7 @@ if test "${PATH_SEPARATOR+set}" != set; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -935,6 +976,11 @@ if test "${PATH_SEPARATOR+set}" != set; then >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { @@ -960,6 +1006,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1052,6 +1099,11 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # IFS # We need space, tab and new line, in precisely that order. Quoting is # there to prevent editors from complaining about space-tab. @@ -1076,6 +1128,7 @@ IFS=" "" $as_nl" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1167,6 +1220,11 @@ IFS=" "" $as_nl" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -1191,6 +1249,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break @@ -1234,6 +1293,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -1259,6 +1320,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1287,6 +1349,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break @@ -1305,6 +1369,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1346,6 +1411,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main done IFS=$as_save_IFS @@ -1375,6 +1442,7 @@ if test ! -f "$as_myself"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1415,6 +1483,8 @@ if test ! -f "$as_myself"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 @@ -1435,6 +1505,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1503,6 +1574,10 @@ fi ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 @@ -1545,6 +1620,7 @@ export LANGUAGE <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1636,6 +1712,11 @@ export LANGUAGE ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -1674,6 +1755,7 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 as_fn_exit 255 ======= @@ -1717,6 +1799,8 @@ as_fn_exit 255 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 ======= @@ -1737,6 +1821,7 @@ as_fn_exit 255 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1766,6 +1851,8 @@ as_fn_exit 255 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 as_fn_exit 255 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1783,6 +1870,7 @@ as_fn_exit 255 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1824,6 +1912,8 @@ as_fn_exit 255 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fi # We don't want this to propagate to other subprocesses. @@ -1846,175 +1936,8 @@ if test "x$CONFIG_SHELL" = x; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -======= ->>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) -======= <<<<<<< HEAD ->>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main ->>>>>>> main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= ->>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) -======= -<<<<<<< HEAD ->>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main ->>>>>>> main -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= -======= - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main -======= -======= as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ->>>>>>> osgeo-main - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -else ======= <<<<<<< HEAD ======= @@ -2056,6 +1979,185 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +>>>>>>> main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +else +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +>>>>>>> main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else \$as_nop ======= else @@ -2074,6 +2176,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2156,6 +2259,11 @@ else ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +else +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main case \`(set -o) 2>/dev/null\` in #( *posix*) : @@ -2193,6 +2301,7 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2234,6 +2343,8 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : @@ -2258,6 +2369,7 @@ test x\"\$blah\" = xblah || exit 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2327,6 +2439,10 @@ test x\"\$blah\" = xblah || exit 1 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else @@ -2350,6 +2466,7 @@ test x\$exitcode = x0 || exit 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2441,6 +2558,11 @@ test x\$exitcode = x0 || exit 1 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO @@ -2464,6 +2586,7 @@ test \$(( 1 + 1 )) = 2 || exit 1" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2504,6 +2627,8 @@ test \$(( 1 + 1 )) = 2 || exit 1" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (eval "$as_required") 2>/dev/null then : @@ -2530,6 +2655,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2598,6 +2724,10 @@ else $as_nop ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (eval "$as_required") 2>/dev/null; then : as_have_required=yes @@ -2624,6 +2754,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2714,6 +2845,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false @@ -2736,6 +2872,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test -z "$as_dir" && as_dir=. ======= @@ -2778,6 +2915,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -2801,6 +2940,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= test -z "$as_dir" && as_dir=. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2883,6 +3023,11 @@ do ======= test -z "$as_dir" && as_dir=. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + test -z "$as_dir" && as_dir=. +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_found=: case $as_dir in #( @@ -2906,6 +3051,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2946,6 +3092,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && @@ -2969,6 +3117,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3037,6 +3186,10 @@ then : ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_shell=$as_dir/$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && @@ -3060,6 +3213,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3150,6 +3304,11 @@ then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -3175,6 +3334,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3216,6 +3376,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main IFS=$as_save_IFS if $as_found then : @@ -3246,6 +3408,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3315,6 +3478,10 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : CONFIG_SHELL=$SHELL as_have_required=yes @@ -3340,6 +3507,7 @@ IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3430,6 +3598,11 @@ IFS=$as_save_IFS >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a @@ -3465,6 +3638,7 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3506,6 +3680,8 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -3534,6 +3710,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3603,6 +3780,10 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -3632,6 +3813,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3723,6 +3905,11 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -3766,6 +3953,7 @@ as_unset=as_fn_unset <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3801,6 +3989,8 @@ as_unset=as_fn_unset >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3820,6 +4010,7 @@ as_unset=as_fn_unset <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3871,6 +4062,8 @@ as_unset=as_fn_unset >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -3905,6 +4098,7 @@ as_fn_exit () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3946,6 +4140,8 @@ as_fn_exit () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # as_fn_nop # --------- # Do nothing but, unlike ":", preserve the value of $?. @@ -3970,6 +4166,7 @@ as_nop=as_fn_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -4039,6 +4236,10 @@ as_nop=as_fn_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # as_fn_mkdir_p # ------------- @@ -4069,6 +4270,7 @@ as_fn_mkdir_p () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ======= @@ -4111,6 +4313,8 @@ as_fn_mkdir_p () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ======= @@ -4130,6 +4334,7 @@ as_fn_mkdir_p () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4212,6 +4417,11 @@ as_fn_mkdir_p () ======= *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main *) as_qdir=$as_dir;; esac @@ -4238,6 +4448,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X"$as_dir" | ======= <<<<<<< HEAD @@ -4280,6 +4491,8 @@ $as_echo X"$as_dir" | >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" X"$as_dir" | ======= $as_echo X"$as_dir" | @@ -4298,6 +4511,7 @@ $as_echo X"$as_dir" | <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo X"$as_dir" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4380,6 +4594,11 @@ $as_echo X"$as_dir" | ======= $as_echo X"$as_dir" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo X"$as_dir" | +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ @@ -4436,6 +4655,7 @@ as_fn_executable_p () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ======= <<<<<<< HEAD @@ -4478,6 +4698,8 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null then : ======= @@ -4497,6 +4719,7 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4579,6 +4802,11 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ======= if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main eval 'as_fn_append () { @@ -4601,6 +4829,7 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD @@ -4643,6 +4872,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -4661,6 +4892,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4743,6 +4975,11 @@ else ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +else +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_append () { @@ -4772,6 +5009,7 @@ fi # as_fn_append <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ======= <<<<<<< HEAD @@ -4814,6 +5052,8 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null then : ======= @@ -4833,6 +5073,7 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4915,6 +5156,11 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ======= if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main eval 'as_fn_arith () { @@ -4937,6 +5183,7 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD @@ -4979,6 +5226,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -4997,6 +5246,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5079,6 +5329,11 @@ else ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +else +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_arith () { @@ -5103,6 +5358,7 @@ fi # as_fn_arith <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -5144,6 +5400,8 @@ fi # as_fn_arith >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # as_fn_nop # --------- # Do nothing but, unlike ":", preserve the value of $?. @@ -5168,6 +5426,7 @@ as_nop=as_fn_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5237,6 +5496,10 @@ as_nop=as_fn_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -5264,6 +5527,7 @@ as_fn_error () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi @@ -5308,6 +5572,8 @@ as_fn_error () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi @@ -5331,6 +5597,7 @@ as_fn_error () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5359,6 +5626,8 @@ as_fn_error () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi @@ -5378,6 +5647,7 @@ as_fn_error () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5419,6 +5689,8 @@ as_fn_error () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_exit $as_status } # as_fn_error @@ -5463,6 +5735,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X/"$0" | ======= <<<<<<< HEAD @@ -5505,6 +5778,8 @@ $as_echo X/"$0" | >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" X/"$0" | ======= $as_echo X/"$0" | @@ -5523,6 +5798,7 @@ $as_echo X/"$0" | <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo X/"$0" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5605,6 +5881,11 @@ $as_echo X/"$0" | ======= $as_echo X/"$0" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo X/"$0" | +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ @@ -5665,6 +5946,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } ======= @@ -5707,6 +5989,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } ======= @@ -5726,6 +6010,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5808,6 +6093,11 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # If we had to re-execute with $CONFIG_SHELL, we're ensured to have @@ -5839,6 +6129,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -5880,6 +6171,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Determine whether it's possible to make 'echo' print without a newline. # These variables are no longer used directly by Autoconf, but are AC_SUBSTed @@ -5900,6 +6193,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5969,6 +6263,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -5999,6 +6297,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6040,6 +6339,8 @@ esac >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # For backward compatibility with old third-party macros, we provide # the shell variables $as_echo and $as_echo_n. New code should use # AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. @@ -6063,6 +6364,7 @@ as_echo_n='printf %s' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -6132,6 +6434,10 @@ as_echo_n='printf %s' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -6214,6 +6520,7 @@ MAKEFLAGS= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6255,6 +6562,8 @@ MAKEFLAGS= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main PACKAGE_NAME='' PACKAGE_TARNAME='' PACKAGE_VERSION='' @@ -6276,6 +6585,7 @@ PACKAGE_URL='' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -6345,6 +6655,10 @@ PACKAGE_URL='' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main PACKAGE_NAME= PACKAGE_TARNAME= PACKAGE_VERSION= @@ -6368,6 +6682,7 @@ PACKAGE_URL= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6459,6 +6774,11 @@ PACKAGE_URL= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_unique_file="configure.ac" # Factoring default headers for most tests. @@ -6480,6 +6800,7 @@ ac_includes_default="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6521,6 +6842,8 @@ ac_includes_default="\ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include #ifdef HAVE_STDIO_H # include @@ -6546,6 +6869,7 @@ ac_includes_default="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -6615,6 +6939,10 @@ ac_includes_default="\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #include #ifdef HAVE_SYS_TYPES_H # include @@ -6656,6 +6984,7 @@ ac_includes_default="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6747,6 +7076,11 @@ ac_includes_default="\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef HAVE_INTTYPES_H # include #endif @@ -6770,6 +7104,7 @@ ac_includes_default="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6811,6 +7146,8 @@ ac_includes_default="\ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #ifdef HAVE_STRINGS_H # include #endif @@ -6836,6 +7173,7 @@ ac_includes_default="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -6905,6 +7243,10 @@ ac_includes_default="\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef HAVE_UNISTD_H # include #endif" @@ -6926,6 +7268,7 @@ ac_includes_default="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6961,6 +7304,8 @@ ac_includes_default="\ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_header_c_list= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6980,6 +7325,7 @@ ac_header_c_list= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7031,6 +7377,8 @@ ac_header_c_list= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_subst_vars='LTLIBOBJS LIBOBJS GRASS_HOME @@ -7067,6 +7415,7 @@ USE_OPENMP <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7159,6 +7508,10 @@ USE_OPENMP ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +>>>>>>> osgeo-main OPENMP_LIB OPENMP_LIBPATH OPENMP_INCPATH @@ -7178,6 +7531,7 @@ OPENMP_CFLAGS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7221,6 +7575,9 @@ OPENMP_CFLAGS ======= >>>>>>> osgeo-main ======= +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -7234,6 +7591,7 @@ OPENMP_CFLAGS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) @@ -7298,6 +7656,8 @@ OPENMP_CFLAGS >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main OMPCFLAGS OMPLIB OMPLIBPATH @@ -7322,6 +7682,7 @@ OMPINCPATH <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7352,6 +7713,8 @@ OMPINCPATH >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7371,6 +7734,7 @@ OMPINCPATH <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -7400,6 +7764,8 @@ OMPINCPATH ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= OPENMP_LIB OPENMP_LIBPATH @@ -7421,6 +7787,7 @@ OPENMP_CFLAGS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7487,6 +7854,8 @@ OPENMP_CFLAGS >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main USE_PTHREAD PTHREADLIB PTHREADLIBPATH @@ -7517,6 +7886,7 @@ CAIRO_HAS_XRENDER <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -7558,6 +7928,8 @@ CAIRO_HAS_XRENDER >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main USE_LIBSVM LIBSVM_LIB LIBSVM_INC @@ -7577,6 +7949,7 @@ LIBSVM_INC <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7646,6 +8019,10 @@ LIBSVM_INC ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LAPACKINC LAPACKLIB BLASINC @@ -7707,6 +8084,7 @@ PDAL_LIBS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD PDAL_CONFIG ======= <<<<<<< HEAD @@ -7744,6 +8122,8 @@ PDAL_CONFIG ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= PDAL_CONFIG >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7763,6 +8143,7 @@ PDAL_CONFIG <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7814,6 +8195,8 @@ PDAL_CONFIG >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main USE_LIBLAS LIBLAS_INC LIBLAS_CFLAGS @@ -7974,6 +8357,7 @@ includedir <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -8009,6 +8393,8 @@ includedir >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main runstatedir ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8028,6 +8414,7 @@ runstatedir <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8079,6 +8466,8 @@ runstatedir >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main localstatedir sharedstatedir sysconfdir @@ -8135,6 +8524,7 @@ with_lapack <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -8169,11 +8559,16 @@ with_lapack ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8196,6 +8591,7 @@ with_libsvm <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8247,6 +8643,8 @@ with_libsvm >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main with_cairo with_freetype with_nls @@ -8274,6 +8672,7 @@ with_zstd <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -8315,6 +8714,8 @@ with_zstd >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main with_pdal with_blas with_lapack @@ -8336,6 +8737,7 @@ with_liblas <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -8405,6 +8807,10 @@ with_liblas ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main with_libpng with_gdal with_liblas @@ -8426,6 +8832,7 @@ with_pdal <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8517,6 +8924,11 @@ with_pdal ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main with_netcdf with_geos with_includes @@ -8567,6 +8979,7 @@ with_lapack_libs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -8607,11 +9020,16 @@ with_lapack_libs ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8633,6 +9051,7 @@ with_libsvm_libs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -8702,6 +9121,10 @@ with_libsvm_libs ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main with_cairo_includes with_cairo_libs with_cairo_ldflags @@ -8743,6 +9166,7 @@ with_x <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8812,6 +9236,10 @@ enable_openmp enable_openmp ======= >>>>>>> osgeo-main +======= +enable_openmp +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8837,6 +9265,7 @@ enable_openmp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8933,6 +9362,8 @@ enable_openmp >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main enable_largefile ' ac_precious_vars='build_alias @@ -9005,6 +9436,7 @@ localstatedir='${prefix}/var' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -9040,6 +9472,8 @@ localstatedir='${prefix}/var' >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main runstatedir='${localstatedir}/run' ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9059,6 +9493,7 @@ runstatedir='${localstatedir}/run' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9110,6 +9545,8 @@ runstatedir='${localstatedir}/run' >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -9160,6 +9597,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9250,6 +9688,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main case $ac_dashdash$ac_option in --) @@ -9307,6 +9750,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -9351,6 +9795,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt @@ -9374,6 +9820,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9402,6 +9849,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -9421,6 +9870,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9462,6 +9912,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $ac_user_opts in *" @@ -9502,6 +9954,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -9546,6 +9999,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt @@ -9569,6 +10024,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9597,6 +10053,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -9616,6 +10074,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9657,6 +10116,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $ac_user_opts in *" @@ -9884,6 +10345,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -9928,6 +10390,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt @@ -9951,6 +10415,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9979,6 +10444,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -9998,6 +10465,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10039,6 +10507,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $ac_user_opts in *" @@ -10069,6 +10539,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -10113,6 +10584,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt @@ -10136,6 +10609,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -10164,6 +10638,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt @@ -10183,6 +10659,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10224,6 +10701,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $ac_user_opts in *" @@ -10284,6 +10763,7 @@ Try \`$0 --help' for more information" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && @@ -10328,6 +10808,8 @@ Try \`$0 --help' for more information" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && @@ -10351,6 +10833,7 @@ Try \`$0 --help' for more information" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -10379,6 +10862,8 @@ Try \`$0 --help' for more information" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && @@ -10398,6 +10883,7 @@ Try \`$0 --help' for more information" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10439,6 +10925,8 @@ Try \`$0 --help' for more information" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -10471,6 +10959,7 @@ if test -n "$ac_unrecognized_opts"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ======= @@ -10513,6 +11002,8 @@ if test -n "$ac_unrecognized_opts"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ======= @@ -10532,6 +11023,7 @@ if test -n "$ac_unrecognized_opts"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -10614,6 +11106,11 @@ if test -n "$ac_unrecognized_opts"; then ======= *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main esac fi @@ -10638,6 +11135,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD libdir localedir mandir ======= @@ -10680,6 +11178,8 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main libdir localedir mandir runstatedir ======= @@ -10699,6 +11199,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= libdir localedir mandir >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -10782,6 +11283,11 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ libdir localedir mandir >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + libdir localedir mandir +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -10854,6 +11360,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X"$as_myself" | ======= <<<<<<< HEAD @@ -10896,6 +11403,8 @@ $as_echo X"$as_myself" | >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" X"$as_myself" | ======= $as_echo X"$as_myself" | @@ -10914,6 +11423,7 @@ $as_echo X"$as_myself" | <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo X"$as_myself" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -10996,6 +11506,11 @@ $as_echo X"$as_myself" | ======= $as_echo X"$as_myself" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo X"$as_myself" | +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ @@ -11110,6 +11625,7 @@ Fine tuning of the installation directories: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -11144,6 +11660,8 @@ Fine tuning of the installation directories: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] ======= @@ -11164,6 +11682,7 @@ Fine tuning of the installation directories: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11214,6 +11733,8 @@ Fine tuning of the installation directories: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] @@ -11277,6 +11798,7 @@ Optional Features: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -11346,6 +11868,10 @@ Optional Features: --disable-openmp do not use OpenMP ======= >>>>>>> osgeo-main +======= + --disable-openmp do not use OpenMP +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -11371,6 +11897,7 @@ Optional Features: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11466,6 +11993,8 @@ Optional Features: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main --disable-largefile omit support for large files (LFS) @@ -11507,6 +12036,7 @@ Optional Packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -11541,11 +12071,16 @@ Optional Packages: ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11568,6 +12103,7 @@ Optional Packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11618,6 +12154,8 @@ Optional Packages: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main --with-cairo support Cairo functionality (default: yes) --with-freetype support FreeType functionality (default: yes) @@ -11646,6 +12184,7 @@ Optional Packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -11746,6 +12285,9 @@ Optional Packages: ======= --with-pdal support PDAL functionality (default: yes) >>>>>>> osgeo-main +======= + --with-pdal support PDAL functionality (default: yes) +>>>>>>> osgeo-main <<<<<<< HEAD --with-blas=pkg-config-package enable BLAS support with by adding name of @@ -11765,6 +12307,9 @@ Optional Packages: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -11794,6 +12339,7 @@ Optional Packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -11885,6 +12431,11 @@ Optional Packages: ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main --with-pdal=path/pdal-config enable PDAL support (pdal-config with path, @@ -11907,6 +12458,7 @@ Optional Packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -11997,6 +12549,11 @@ Optional Packages: >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main --with-netcdf=path/nc-config enable NetCDF support (nc-config with path, @@ -12070,6 +12627,7 @@ Optional Packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -12110,11 +12668,16 @@ Optional Packages: ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -12137,6 +12700,7 @@ Optional Packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -12205,6 +12769,10 @@ Optional Packages: ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main --with-cairo-includes=DIRS cairo include files are in DIRS @@ -12288,6 +12856,7 @@ case "$ac_dir" in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. @@ -12332,6 +12901,8 @@ case "$ac_dir" in ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. @@ -12355,6 +12926,7 @@ case "$ac_dir" in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -12383,6 +12955,8 @@ case "$ac_dir" in >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. @@ -12402,6 +12976,7 @@ case "$ac_dir" in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -12443,6 +13018,8 @@ case "$ac_dir" in ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; @@ -12487,6 +13064,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Check for guested configure. ======= @@ -12529,6 +13107,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Check for configure.gnu first; this name is used for a wrapper for # Metaconfig's "Configure" on case-insensitive file systems. @@ -12549,6 +13129,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # Check for guested configure. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -12631,6 +13212,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ======= # Check for guested configure. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + # Check for guested configure. +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if test -f "$ac_srcdir/configure.gnu"; then echo && @@ -12655,6 +13241,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ======= @@ -12697,6 +13284,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ======= @@ -12716,6 +13305,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -12798,6 +13388,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ======= $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } @@ -12825,6 +13420,7 @@ configure <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -12869,6 +13465,8 @@ Copyright (C) 2012 Free Software Foundation, Inc. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -12891,6 +13489,7 @@ Copyright (C) 2012 Free Software Foundation, Inc. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -12920,6 +13519,8 @@ Copyright (C) 2012 Free Software Foundation, Inc. ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -12938,6 +13539,7 @@ Copyright (C) 2012 Free Software Foundation, Inc. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -12980,6 +13582,8 @@ Copyright (C) 2012 Free Software Foundation, Inc. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -13012,6 +13616,7 @@ ac_fn_c_try_compile () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rm -f conftest.$ac_objext ======= @@ -13054,6 +13659,8 @@ ac_fn_c_try_compile () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main rm -f conftest.$ac_objext conftest.beam ======= @@ -13073,6 +13680,7 @@ ac_fn_c_try_compile () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= rm -f conftest.$ac_objext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -13155,6 +13763,11 @@ ac_fn_c_try_compile () ======= rm -f conftest.$ac_objext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + rm -f conftest.$ac_objext +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if { { ac_try="$ac_compile" case "(($ac_try" in @@ -13179,6 +13792,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD @@ -13221,6 +13835,8 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -13239,6 +13855,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -13321,6 +13938,11 @@ $as_echo "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo "$ac_try_echo"; } >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main (eval "$ac_compile") 2>conftest.err ac_status=$? @@ -13346,6 +13968,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -13386,6 +14009,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { @@ -13411,6 +14036,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -13479,6 +14105,10 @@ else $as_nop ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { @@ -13505,6 +14135,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -13596,6 +14227,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -13627,6 +14263,7 @@ ac_fn_cxx_try_compile () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rm -f conftest.$ac_objext ======= @@ -13669,6 +14306,8 @@ ac_fn_cxx_try_compile () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main rm -f conftest.$ac_objext conftest.beam ======= @@ -13688,6 +14327,7 @@ ac_fn_cxx_try_compile () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= rm -f conftest.$ac_objext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -13770,6 +14410,11 @@ ac_fn_cxx_try_compile () ======= rm -f conftest.$ac_objext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + rm -f conftest.$ac_objext +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if { { ac_try="$ac_compile" case "(($ac_try" in @@ -13794,6 +14439,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD @@ -13836,6 +14482,8 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -13854,6 +14502,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -13936,6 +14585,11 @@ $as_echo "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo "$ac_try_echo"; } >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main (eval "$ac_compile") 2>conftest.err ac_status=$? @@ -13961,6 +14615,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -14001,6 +14656,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { @@ -14026,6 +14683,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -14094,6 +14752,10 @@ else $as_nop ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { @@ -14120,6 +14782,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14211,6 +14874,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -14239,6 +14907,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes # that executables *can* be run. ======= @@ -14282,6 +14951,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that # executables *can* be run. ======= @@ -14302,6 +14973,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -14331,6 +15003,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes # that executables *can* be run. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -14348,6 +15022,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -14390,6 +15065,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack @@ -14416,6 +15093,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -14457,6 +15135,8 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? @@ -14476,6 +15156,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -14545,6 +15226,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? @@ -14566,6 +15251,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14656,6 +15342,11 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' { { case "(($ac_try" in @@ -14680,6 +15371,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -14721,6 +15413,8 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? @@ -14746,6 +15440,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -14815,6 +15510,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? @@ -14841,6 +15540,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -14932,6 +15632,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status @@ -14964,6 +15669,7 @@ ac_fn_c_try_link () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rm -f conftest.$ac_objext conftest$ac_exeext ======= @@ -15006,6 +15712,8 @@ ac_fn_c_try_link () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext ======= @@ -15025,6 +15733,7 @@ ac_fn_c_try_link () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= rm -f conftest.$ac_objext conftest$ac_exeext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -15107,6 +15816,11 @@ ac_fn_c_try_link () ======= rm -f conftest.$ac_objext conftest$ac_exeext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + rm -f conftest.$ac_objext conftest$ac_exeext +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if { { ac_try="$ac_link" case "(($ac_try" in @@ -15131,6 +15845,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD @@ -15173,6 +15888,8 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -15191,6 +15908,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -15273,6 +15991,11 @@ $as_echo "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo "$ac_try_echo"; } >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main (eval "$ac_link") 2>conftest.err ac_status=$? @@ -15297,6 +16020,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ======= @@ -15339,6 +16063,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ======= @@ -15358,6 +16084,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -15440,6 +16167,11 @@ $as_echo "$ac_try_echo"; } >&5 ======= $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || @@ -15464,6 +16196,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -15504,6 +16237,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } then : @@ -15525,6 +16260,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -15593,6 +16329,10 @@ else $as_nop ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main }; then : ac_retval=0 @@ -15615,6 +16355,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -15706,6 +16447,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -15737,6 +16483,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -15778,6 +16525,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -15876,6 +16625,7 @@ printf "%s\n" "$ac_res" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -15945,6 +16695,10 @@ printf "%s\n" "$ac_res" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # ac_fn_c_try_cpp LINENO # ---------------------- # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -15974,6 +16728,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD @@ -16016,6 +16771,8 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -16034,6 +16791,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -16116,6 +16874,11 @@ $as_echo "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo "$ac_try_echo"; } >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? @@ -16141,6 +16904,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -16181,6 +16945,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { @@ -16206,6 +16972,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -16274,6 +17041,10 @@ else $as_nop ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { @@ -16300,6 +17071,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -16391,6 +17163,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -16416,6 +17193,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -16508,6 +17286,11 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists, giving a warning if it cannot be compiled using @@ -16687,6 +17470,7 @@ $as_echo "$ac_res" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -16778,6 +17562,11 @@ $as_echo "$ac_res" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -16800,6 +17589,7 @@ ac_fn_c_check_func () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } @@ -16843,6 +17633,8 @@ $as_echo_n "checking for $2... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 printf %s "checking for $2... " >&6; } @@ -16864,6 +17656,7 @@ $as_echo_n "checking for $2... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -16892,6 +17685,8 @@ $as_echo_n "checking for $2... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } @@ -16910,6 +17705,7 @@ $as_echo_n "checking for $2... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -16952,6 +17748,8 @@ $as_echo_n "checking for $2... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16977,6 +17775,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -17017,6 +17816,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main which can conflict with char $2 (); below. */ @@ -17036,6 +17837,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -17104,6 +17906,10 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main which can conflict with char $2 (); below. Prefer to if __STDC__ is defined, since @@ -17132,6 +17938,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17223,6 +18030,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -17257,6 +18069,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -17299,6 +18112,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -17317,6 +18132,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -17400,6 +18216,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return $2 (); ; @@ -17423,6 +18244,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -17464,6 +18286,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : eval "$3=yes" @@ -17490,6 +18314,7 @@ printf "%s\n" "$ac_res" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -17559,6 +18384,10 @@ printf "%s\n" "$ac_res" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : eval "$3=yes" else @@ -17586,6 +18415,7 @@ $as_echo "$ac_res" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -17676,6 +18506,11 @@ $as_echo "$ac_res" >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -17703,6 +18538,7 @@ ac_fn_cxx_try_link () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rm -f conftest.$ac_objext conftest$ac_exeext ======= @@ -17745,6 +18581,8 @@ ac_fn_cxx_try_link () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext ======= @@ -17764,6 +18602,7 @@ ac_fn_cxx_try_link () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= rm -f conftest.$ac_objext conftest$ac_exeext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -17846,6 +18685,11 @@ ac_fn_cxx_try_link () ======= rm -f conftest.$ac_objext conftest$ac_exeext >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + rm -f conftest.$ac_objext conftest$ac_exeext +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if { { ac_try="$ac_link" case "(($ac_try" in @@ -17870,6 +18714,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD @@ -17912,6 +18757,8 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -17930,6 +18777,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -18012,6 +18860,11 @@ $as_echo "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo "$ac_try_echo"; } >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main (eval "$ac_link") 2>conftest.err ac_status=$? @@ -18036,6 +18889,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ======= @@ -18078,6 +18932,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ======= @@ -18097,6 +18953,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -18179,6 +19036,11 @@ $as_echo "$ac_try_echo"; } >&5 ======= $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || @@ -18203,6 +19065,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -18243,6 +19106,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } then : @@ -18264,6 +19129,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -18332,6 +19198,10 @@ else $as_nop ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main }; then : ac_retval=0 @@ -18354,6 +19224,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18445,6 +19316,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -18481,6 +19357,7 @@ ac_fn_cxx_check_func () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } @@ -18524,6 +19401,8 @@ $as_echo_n "checking for $2... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 printf %s "checking for $2... " >&6; } @@ -18545,6 +19424,7 @@ $as_echo_n "checking for $2... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -18573,6 +19453,8 @@ $as_echo_n "checking for $2... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } @@ -18591,6 +19473,7 @@ $as_echo_n "checking for $2... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -18633,6 +19516,8 @@ $as_echo_n "checking for $2... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18658,6 +19543,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -18698,6 +19584,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main which can conflict with char $2 (); below. */ @@ -18717,6 +19605,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -18785,6 +19674,10 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main which can conflict with char $2 (); below. Prefer to if __STDC__ is defined, since @@ -18813,6 +19706,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -18904,6 +19798,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -18938,6 +19837,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -18980,6 +19880,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -18998,6 +19900,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -19081,6 +19984,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return $2 (); ; @@ -19104,6 +20012,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -19145,6 +20054,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_link "$LINENO" then : eval "$3=yes" @@ -19194,6 +20105,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -19263,6 +20175,10 @@ esac ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_cxx_try_link "$LINENO"; then : eval "$3=yes" else @@ -19293,6 +20209,7 @@ $as_echo "$ac_res" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -19384,6 +20301,11 @@ $as_echo "$ac_res" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -19406,6 +20328,7 @@ It was created by $as_me, which was <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -19450,6 +20373,8 @@ generated by GNU Autoconf 2.69. Invocation command line was >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -19472,6 +20397,7 @@ generated by GNU Autoconf 2.69. Invocation command line was <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -19501,6 +20427,8 @@ generated by GNU Autoconf 2.69. Invocation command line was ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -19519,6 +20447,7 @@ generated by GNU Autoconf 2.69. Invocation command line was <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -19561,6 +20490,8 @@ generated by GNU Autoconf 2.69. Invocation command line was >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main _ACEOF exec 5>>config.log @@ -19609,6 +20540,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test -z "$as_dir" && as_dir=. $as_echo "PATH: $as_dir" @@ -19652,6 +20584,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -19677,6 +20611,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -19705,6 +20640,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= test -z "$as_dir" && as_dir=. $as_echo "PATH: $as_dir" @@ -19723,6 +20660,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -19764,6 +20702,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main done IFS=$as_save_IFS @@ -19815,6 +20755,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -19857,6 +20798,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -19876,6 +20819,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -19958,6 +20902,11 @@ do ======= ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main esac case $ac_pass in @@ -20010,6 +20959,7 @@ trap 'exit_status=$? <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -20050,6 +21000,8 @@ trap 'exit_status=$? ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Sanitize IFS. IFS=" "" $as_nl" @@ -20069,6 +21021,7 @@ trap 'exit_status=$? <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -20137,6 +21090,10 @@ trap 'exit_status=$? ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # Save into config.log some information that might help in debugging. { @@ -20158,6 +21115,7 @@ trap 'exit_status=$? <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "## ---------------- ## ======= @@ -20200,6 +21158,8 @@ trap 'exit_status=$? ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "## ---------------- ## ======= @@ -20219,6 +21179,7 @@ trap 'exit_status=$? <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "## ---------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -20302,6 +21263,11 @@ trap 'exit_status=$? $as_echo "## ---------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + $as_echo "## ---------------- ## +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## Cache variables. ## ## ---------------- ##" echo @@ -20328,6 +21294,7 @@ trap 'exit_status=$? <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; @@ -20371,6 +21338,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; @@ -20392,6 +21361,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -20420,6 +21390,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; @@ -20438,6 +21410,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -20479,6 +21452,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main esac case $ac_var in #( @@ -20519,6 +21494,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "## ----------------- ## ======= @@ -20561,6 +21537,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "## ----------------- ## ======= @@ -20580,6 +21558,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "## ----------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -20663,6 +21642,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "## ----------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + $as_echo "## ----------------- ## +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## Output variables. ## ## ----------------- ##" echo @@ -20686,6 +21670,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac @@ -20730,6 +21715,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac @@ -20753,6 +21740,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -20781,6 +21769,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac @@ -20800,6 +21790,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -20841,6 +21832,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main done | sort echo @@ -20862,6 +21855,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "## ------------------- ## ======= @@ -20904,6 +21898,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "## ------------------- ## ======= @@ -20923,6 +21919,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "## ------------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -21006,6 +22003,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "## ------------------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + $as_echo "## ------------------- ## +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## File substitutions. ## ## ------------------- ##" echo @@ -21029,6 +22031,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac @@ -21073,6 +22076,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac @@ -21096,6 +22101,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -21124,6 +22130,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac @@ -21143,6 +22151,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -21184,6 +22193,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main done | sort echo @@ -21206,6 +22217,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "## ----------- ## ======= @@ -21248,6 +22260,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "## ----------- ## ======= @@ -21267,6 +22281,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "## ----------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -21350,6 +22365,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; $as_echo "## ----------- ## >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + $as_echo "## ----------- ## +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## confdefs.h. ## ## ----------- ##" echo @@ -21373,6 +22393,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me: caught signal $ac_signal" $as_echo "$as_me: exit $exit_status" @@ -21416,6 +22437,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me: caught signal $ac_signal" printf "%s\n" "$as_me: exit $exit_status" @@ -21437,6 +22460,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -21465,6 +22489,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= $as_echo "$as_me: caught signal $ac_signal" $as_echo "$as_me: exit $exit_status" @@ -21483,6 +22509,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -21524,6 +22551,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } >&5 rm -f core *.core core.conftest.* && @@ -21555,6 +22584,7 @@ rm -f -r conftest* confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -21596,6 +22626,8 @@ rm -f -r conftest* confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. @@ -21626,6 +22658,7 @@ printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -21695,6 +22728,10 @@ printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. @@ -21739,6 +22776,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -21830,6 +22868,11 @@ _ACEOF ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Let the site file select an alternate cache file if it wants to. @@ -21851,6 +22894,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -21892,6 +22936,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$CONFIG_SITE"; then ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then @@ -21930,6 +22976,7 @@ printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -21999,6 +23046,10 @@ printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then @@ -22042,6 +23093,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -22133,6 +23185,11 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -22156,6 +23213,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -22246,6 +23304,8 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Test code for whether the C compiler supports C89 (global declarations) ac_c_conftest_c89_globals=' /* Does the compiler advertise C89 conformance? @@ -22924,6 +23984,7 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -22960,6 +24021,8 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done if $ac_cache_corrupted; then { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -22982,6 +24045,7 @@ $as_echo "$as_me: error: changes in the environment can compromise the build" >& <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -23018,6 +24082,8 @@ $as_echo "$as_me: error: changes in the environment can compromise the build" >& >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) fi ## -------------------- ## @@ -23063,6 +24129,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -23105,6 +24172,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) # Check that the precious variables saved in the cache have kept the same # value. @@ -23305,6 +24374,7 @@ $as_echo "$ac_cv_build" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -23396,6 +24466,11 @@ $as_echo "$ac_cv_build" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -23431,6 +24506,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } ======= @@ -23474,6 +24550,8 @@ $as_echo_n "checking host system type... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 printf %s "checking host system type... " >&6; } ======= @@ -23494,6 +24572,7 @@ $as_echo_n "checking host system type... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -23523,6 +24602,8 @@ $as_echo_n "checking host system type... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -23540,6 +24621,7 @@ $as_echo_n "checking host system type... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -23582,6 +24664,8 @@ $as_echo_n "checking host system type... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build @@ -23602,6 +24686,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 @@ -23649,6 +24734,8 @@ $as_echo "$ac_cv_host" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 @@ -23678,6 +24765,7 @@ $as_echo "$ac_cv_host" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -23706,6 +24794,8 @@ $as_echo "$ac_cv_host" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 @@ -23728,6 +24818,7 @@ $as_echo "$ac_cv_host" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -23770,6 +24861,8 @@ $as_echo "$ac_cv_host" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -23805,6 +24898,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -23846,6 +24940,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main @@ -23871,6 +24967,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -23940,6 +25037,10 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -23965,6 +25066,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -24008,6 +25110,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -24028,6 +25132,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -24057,6 +25162,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -24074,6 +25181,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -24116,6 +25224,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -24141,6 +25251,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -24181,6 +25292,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -24206,6 +25319,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -24274,6 +25388,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -24297,6 +25415,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -24387,6 +25506,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -24413,6 +25537,7 @@ if test -n "$CC"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -24459,6 +25584,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 printf "%s\n" "$CC" >&6; } @@ -24486,6 +25613,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -24514,6 +25642,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -24535,6 +25665,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -24577,6 +25708,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -24602,6 +25735,7 @@ set dummy gcc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -24645,6 +25779,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -24665,6 +25801,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -24694,6 +25831,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -24711,6 +25850,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -24753,6 +25893,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -24778,6 +25920,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -24818,6 +25961,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -24843,6 +25988,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -24911,6 +26057,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -24934,6 +26084,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25024,6 +26175,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -25051,6 +26207,7 @@ if test -n "$ac_ct_CC"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -25091,6 +26248,8 @@ if test -n "$ac_ct_CC"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 printf "%s\n" "$ac_ct_CC" >&6; } @@ -25112,6 +26271,7 @@ printf "%s\n" "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -25180,6 +26340,10 @@ printf "%s\n" "no" >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } @@ -25203,6 +26367,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25294,6 +26459,11 @@ $as_echo "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi if test "x$ac_ct_CC" = x; then @@ -25318,6 +26488,7 @@ yes:) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ======= @@ -25361,6 +26532,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ======= @@ -25381,6 +26554,7 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -25410,6 +26584,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -25427,6 +26603,7 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -25469,6 +26646,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -25498,6 +26677,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -25541,6 +26721,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -25561,6 +26743,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -25590,6 +26773,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -25607,6 +26792,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -25649,6 +26835,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -25674,6 +26862,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -25714,6 +26903,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -25739,6 +26930,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -25807,6 +26999,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -25830,6 +27026,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -25920,6 +27117,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -25947,6 +27149,7 @@ if test -n "$CC"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -25987,6 +27190,8 @@ if test -n "$CC"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 printf "%s\n" "$CC" >&6; } @@ -26008,6 +27213,7 @@ printf "%s\n" "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -26076,6 +27282,10 @@ printf "%s\n" "no" >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -26099,6 +27309,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26190,6 +27401,11 @@ $as_echo "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -26215,6 +27431,7 @@ set dummy cc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -26258,6 +27475,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -26278,6 +27497,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -26307,6 +27527,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -26324,6 +27546,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -26366,6 +27589,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -26392,6 +27617,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -26432,6 +27658,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -26456,6 +27684,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -26524,6 +27753,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -26546,6 +27779,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -26636,6 +27870,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_prog_rejected=yes continue @@ -26657,6 +27896,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ======= @@ -26699,6 +27939,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 ======= @@ -26718,6 +27960,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -26800,6 +28043,11 @@ do ======= $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -26832,6 +28080,7 @@ if test $ac_prog_rejected = yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ======= @@ -26874,6 +28123,8 @@ if test $ac_prog_rejected = yes; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" ======= @@ -26893,6 +28144,7 @@ if test $ac_prog_rejected = yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -26975,6 +28227,11 @@ if test $ac_prog_rejected = yes; then ======= ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi fi @@ -26997,6 +28254,7 @@ if test -n "$CC"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -27043,6 +28301,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 printf "%s\n" "$CC" >&6; } @@ -27070,6 +28330,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -27098,6 +28359,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -27119,6 +28382,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -27161,6 +28425,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -27188,6 +28454,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -27231,6 +28498,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -27251,6 +28520,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -27280,6 +28550,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -27297,6 +28569,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -27339,6 +28612,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -27364,6 +28639,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -27404,6 +28680,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -27429,6 +28707,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -27497,6 +28776,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -27520,6 +28803,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -27610,6 +28894,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -27636,6 +28925,7 @@ if test -n "$CC"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -27682,6 +28972,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 printf "%s\n" "$CC" >&6; } @@ -27709,6 +29001,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -27737,6 +29030,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } @@ -27758,6 +29053,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -27800,6 +29096,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -27829,6 +29127,7 @@ set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -27872,6 +29171,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -27892,6 +29193,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -27921,6 +29223,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -27938,6 +29242,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -27980,6 +29285,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -28005,6 +29312,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -28045,6 +29353,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -28070,6 +29380,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -28138,6 +29449,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -28161,6 +29476,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28251,6 +29567,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -28278,6 +29599,7 @@ if test -n "$ac_ct_CC"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -28318,6 +29640,8 @@ if test -n "$ac_ct_CC"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 printf "%s\n" "$ac_ct_CC" >&6; } @@ -28339,6 +29663,7 @@ printf "%s\n" "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -28407,6 +29732,10 @@ printf "%s\n" "no" >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } @@ -28430,6 +29759,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -28521,6 +29851,11 @@ $as_echo "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -28549,6 +29884,7 @@ yes:) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ======= @@ -28592,6 +29928,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ======= @@ -28612,6 +29950,7 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -28648,6 +29987,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -28670,6 +30011,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -28876,6 +30218,8 @@ $as_echo "$ac_cv_exeext" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. @@ -29336,6 +30680,7 @@ $as_echo "$ac_cv_exeext" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -29365,6 +30710,8 @@ $as_echo "$ac_cv_exeext" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -29549,6 +30896,7 @@ $as_echo "$ac_cv_exeext" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -29591,6 +30939,8 @@ $as_echo "$ac_cv_exeext" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT @@ -29615,6 +30965,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -29657,6 +31008,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -29675,6 +31028,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -29758,6 +31112,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -29786,6 +31145,7 @@ ac_clean_files="$ac_clean_files conftest.out" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 $as_echo_n "checking whether we are cross compiling... " >&6; } ======= @@ -29829,6 +31189,8 @@ $as_echo_n "checking whether we are cross compiling... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 printf %s "checking whether we are cross compiling... " >&6; } ======= @@ -29849,6 +31211,7 @@ $as_echo_n "checking whether we are cross compiling... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -29878,6 +31241,8 @@ $as_echo_n "checking whether we are cross compiling... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 $as_echo_n "checking whether we are cross compiling... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -29895,6 +31260,7 @@ $as_echo_n "checking whether we are cross compiling... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -29937,6 +31303,8 @@ $as_echo_n "checking whether we are cross compiling... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -29961,6 +31329,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -30002,6 +31371,8 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? @@ -30021,6 +31392,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -30090,6 +31462,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? @@ -30111,6 +31487,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -30201,6 +31578,11 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' @@ -30226,6 +31608,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -30267,6 +31650,8 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? @@ -30286,6 +31671,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -30355,6 +31741,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? @@ -30376,6 +31766,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -30466,6 +31857,11 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test $ac_status = 0; }; }; then cross_compiling=no @@ -30489,6 +31885,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -30533,6 +31930,8 @@ as_fn_error $? "cannot run C compiled programs. ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -30556,6 +31955,7 @@ as_fn_error $? "cannot run C compiled programs. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -30584,6 +31984,8 @@ as_fn_error $? "cannot run C compiled programs. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -30603,6 +32005,7 @@ as_fn_error $? "cannot run C compiled programs. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -30645,6 +32048,8 @@ as_fn_error $? "cannot run C compiled programs. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi @@ -30667,6 +32072,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -30708,6 +32114,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } @@ -30730,6 +32138,7 @@ printf %s "checking for suffix of object files... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -30799,6 +32208,10 @@ printf %s "checking for suffix of object files... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 $as_echo "$cross_compiling" >&6; } @@ -30823,6 +32236,7 @@ $as_echo_n "checking for suffix of object files... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -30914,6 +32328,11 @@ $as_echo_n "checking for suffix of object files... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30936,6 +32355,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -30978,6 +32398,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -30996,6 +32418,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -31079,6 +32502,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { ; @@ -31109,6 +32537,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -31150,6 +32579,8 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? @@ -31171,6 +32602,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -31240,6 +32672,10 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? @@ -31262,6 +32698,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31352,6 +32789,11 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; @@ -31378,6 +32820,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -31419,6 +32862,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else $as_nop printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -31440,6 +32885,7 @@ printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -31509,6 +32955,10 @@ printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -31532,6 +32982,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31623,6 +33074,11 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi @@ -31644,6 +33100,7 @@ rm -f conftest.$ac_cv_objext conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -31685,6 +33142,8 @@ rm -f conftest.$ac_cv_objext conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext @@ -31706,6 +33165,7 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -31775,6 +33235,10 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext @@ -31798,6 +33262,7 @@ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -31889,6 +33354,11 @@ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31911,6 +33381,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -31953,6 +33424,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -31971,6 +33444,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -32054,6 +33528,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { #ifndef __GNUC__ choke me @@ -32080,6 +33559,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else @@ -32131,6 +33611,8 @@ $as_echo "$ac_cv_c_compiler_gnu" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes @@ -32170,6 +33652,7 @@ $as_echo "$ac_cv_c_compiler_gnu" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -32199,6 +33682,8 @@ $as_echo "$ac_cv_c_compiler_gnu" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else @@ -32224,6 +33709,7 @@ $as_echo "$ac_cv_c_compiler_gnu" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -32266,6 +33752,8 @@ $as_echo "$ac_cv_c_compiler_gnu" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test $ac_compiler_gnu = yes; then GCC=yes else @@ -32288,6 +33776,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -32329,6 +33818,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 @@ -32348,6 +33839,7 @@ printf %s "checking whether $CC accepts -g... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -32417,6 +33909,10 @@ printf %s "checking whether $CC accepts -g... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 @@ -32438,6 +33934,7 @@ $as_echo_n "checking whether $CC accepts -g... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -32529,6 +34026,11 @@ $as_echo_n "checking whether $CC accepts -g... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -32555,6 +34057,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -32597,6 +34100,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -32615,6 +34120,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -32698,6 +34204,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { ; @@ -32721,6 +34232,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -32762,6 +34274,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes @@ -32823,6 +34337,7 @@ if test $ac_test_CFLAGS; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -32892,6 +34407,10 @@ if test $ac_test_CFLAGS; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else @@ -32952,6 +34471,7 @@ if test "$ac_test_CFLAGS" = set; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33042,6 +34562,11 @@ if test "$ac_test_CFLAGS" = set; then >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -33074,6 +34599,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } @@ -33158,6 +34684,8 @@ int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_prog_cc_stdc=no if test x$ac_prog_cc_stdc = xno then : @@ -33320,6 +34848,7 @@ int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -33349,6 +34878,8 @@ int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } @@ -33407,6 +34938,7 @@ int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -33449,6 +34981,8 @@ int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -33488,6 +35022,7 @@ rm -f core conftest.err conftest.$ac_objext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33578,6 +35113,11 @@ rm -f core conftest.err conftest.$ac_objext >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -33601,6 +35141,7 @@ CC=$ac_save_CC <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -33642,6 +35183,8 @@ CC=$ac_save_CC >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 @@ -33674,6 +35217,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -33743,6 +35287,10 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -33775,6 +35323,7 @@ if test "x$ac_cv_prog_cc_c89" != xno; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -33866,6 +35415,11 @@ if test "x$ac_cv_prog_cc_c89" != xno; then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi ac_ext=c @@ -33897,6 +35451,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_cxx+set}" = set; then : withval=$with_cxx; else @@ -33941,6 +35496,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_cxx+y} then : withval=$with_cxx; @@ -33964,6 +35521,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -33993,6 +35551,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if test "${with_cxx+set}" = set; then : withval=$with_cxx; else @@ -34011,6 +35571,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -34052,6 +35613,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main with_cxx=yes fi @@ -34076,6 +35639,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -34117,6 +35681,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use C++" >&5 printf %s "checking whether to use C++... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_cxx\"" >&5 @@ -34136,6 +35702,7 @@ printf "%s\n" "\"$with_cxx\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -34205,6 +35772,10 @@ printf "%s\n" "\"$with_cxx\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use C++" >&5 $as_echo_n "checking whether to use C++... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_cxx\"" >&5 @@ -34226,6 +35797,7 @@ $as_echo "\"$with_cxx\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34317,6 +35889,11 @@ $as_echo "\"$with_cxx\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_cxx" in "no") USE_CXX= ;; "yes") USE_CXX="1" ;; @@ -34342,6 +35919,7 @@ if test -n "$USE_CXX"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_ext=cpp ======= @@ -34385,6 +35963,8 @@ if test -n "$USE_CXX"; then >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main @@ -34409,6 +35989,7 @@ ac_ext=cpp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ac_ext=cpp >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -34492,6 +36073,11 @@ ac_ext=cpp ac_ext=cpp >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + ac_ext=cpp +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -34518,6 +36104,7 @@ if test -z "$CXX"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -34558,6 +36145,8 @@ if test -z "$CXX"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do @@ -34580,6 +36169,7 @@ printf %s "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -34648,6 +36238,10 @@ printf %s "checking for $ac_word... " >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do @@ -34672,6 +36266,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -34763,6 +36358,11 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -34788,6 +36388,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -34828,6 +36429,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -34853,6 +36456,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -34921,6 +36525,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -34944,6 +36552,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35034,6 +36643,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -35061,6 +36675,7 @@ if test -n "$CXX"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -35101,6 +36716,8 @@ if test -n "$CXX"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 printf "%s\n" "$CXX" >&6; } @@ -35122,6 +36739,7 @@ printf "%s\n" "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -35190,6 +36808,10 @@ printf "%s\n" "no" >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } @@ -35213,6 +36835,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35304,6 +36927,11 @@ $as_echo "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -35329,6 +36957,7 @@ if test -z "$CXX"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -35369,6 +36998,8 @@ if test -z "$CXX"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do @@ -35391,6 +37022,7 @@ printf %s "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -35459,6 +37091,10 @@ printf %s "checking for $ac_word... " >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do @@ -35483,6 +37119,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35574,6 +37211,11 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -35599,6 +37241,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -35639,6 +37282,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -35664,6 +37309,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -35732,6 +37378,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -35755,6 +37405,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -35845,6 +37496,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -35872,6 +37528,7 @@ if test -n "$ac_ct_CXX"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -35912,6 +37569,8 @@ if test -n "$ac_ct_CXX"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 printf "%s\n" "$ac_ct_CXX" >&6; } @@ -35933,6 +37592,7 @@ printf "%s\n" "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -36001,6 +37661,10 @@ printf "%s\n" "no" >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 $as_echo "$ac_ct_CXX" >&6; } @@ -36024,6 +37688,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36115,6 +37780,11 @@ $as_echo "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -36143,6 +37813,7 @@ yes:) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ======= @@ -36186,6 +37857,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ======= @@ -36206,6 +37879,7 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -36235,6 +37909,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -36252,6 +37928,7 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -36294,6 +37971,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -36320,6 +37999,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 ======= <<<<<<< HEAD @@ -36362,6 +38042,8 @@ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 ======= $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 @@ -36380,6 +38062,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -36463,6 +38146,11 @@ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -36489,6 +38177,7 @@ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "$ac_try_echo"; } >&5 ======= <<<<<<< HEAD @@ -36531,6 +38220,8 @@ $as_echo "$ac_try_echo"; } >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 @@ -36549,6 +38240,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -36631,6 +38323,11 @@ $as_echo "$ac_try_echo"; } >&5 ======= $as_echo "$ac_try_echo"; } >&5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo "$ac_try_echo"; } >&5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? @@ -36658,6 +38355,7 @@ $as_echo "$ac_try_echo"; } >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -36698,6 +38396,8 @@ $as_echo "$ac_try_echo"; } >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } @@ -36720,6 +38420,7 @@ printf %s "checking whether the compiler supports GNU C++... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -36788,6 +38489,10 @@ printf %s "checking whether the compiler supports GNU C++... " >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } @@ -36812,6 +38517,7 @@ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -36903,6 +38609,11 @@ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -36925,6 +38636,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -36967,6 +38679,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -36985,6 +38699,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37068,6 +38783,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { #ifndef __GNUC__ choke me @@ -37094,6 +38814,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else @@ -37155,6 +38876,8 @@ $as_echo_n "checking whether $CXX accepts -g... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO" then : ac_compiler_gnu=yes @@ -37233,6 +38956,7 @@ $as_echo_n "checking whether $CXX accepts -g... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -37269,6 +38993,8 @@ $as_echo_n "checking whether $CXX accepts -g... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -37294,6 +39020,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -37336,6 +39063,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -37354,6 +39083,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37437,6 +39167,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { ; @@ -37460,6 +39195,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else @@ -37504,6 +39240,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes @@ -37527,6 +39265,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -37556,6 +39295,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else @@ -37574,6 +39315,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -37615,6 +39357,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -37638,6 +39382,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -37680,6 +39425,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -37698,6 +39445,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -37781,6 +39529,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { ; @@ -37804,6 +39557,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_cxx_try_compile "$LINENO"; then : else @@ -37848,6 +39602,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO" then : @@ -37871,6 +39627,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -37900,6 +39657,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_cxx_try_compile "$LINENO"; then : else @@ -37918,6 +39677,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -37959,6 +39719,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" @@ -37983,6 +39745,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -38025,6 +39788,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -38043,6 +39808,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -38126,6 +39892,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { ; @@ -38149,6 +39920,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -38190,6 +39962,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes @@ -38218,6 +39992,7 @@ if test $ac_test_CXXFLAGS; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -38287,6 +40062,10 @@ if test $ac_test_CXXFLAGS; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes fi @@ -38316,6 +40095,7 @@ if test "$ac_test_CXXFLAGS" = set; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -38406,6 +40186,11 @@ if test "$ac_test_CXXFLAGS" = set; then >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -38438,6 +40223,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -38479,6 +40265,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_prog_cxx_stdcxx=no if test x$ac_prog_cxx_stdcxx = xno then : @@ -38581,6 +40369,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -38650,6 +40439,10 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -38692,6 +40485,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for executable suffix" >&5 $as_echo_n "checking for executable suffix... " >&6; } ======= @@ -38735,6 +40529,8 @@ $as_echo_n "checking for executable suffix... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for executable suffix" >&5 printf %s "checking for executable suffix... " >&6; } ======= @@ -38755,6 +40551,7 @@ $as_echo_n "checking for executable suffix... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -38784,6 +40581,8 @@ $as_echo_n "checking for executable suffix... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for executable suffix" >&5 $as_echo_n "checking for executable suffix... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -38801,6 +40600,7 @@ $as_echo_n "checking for executable suffix... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -38843,6 +40643,8 @@ $as_echo_n "checking for executable suffix... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "$CYGWIN" = yes || test "$MINGW32" = yes; then ac_cv_exeext=.exe @@ -38869,6 +40671,7 @@ test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_exeext}" >&5 $as_echo "${ac_cv_exeext}" >&6; } ======= @@ -38912,6 +40715,8 @@ $as_echo "${ac_cv_exeext}" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_exeext}" >&5 printf "%s\n" "${ac_cv_exeext}" >&6; } ======= @@ -38932,6 +40737,7 @@ $as_echo "${ac_cv_exeext}" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -38961,6 +40767,8 @@ $as_echo "${ac_cv_exeext}" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_exeext}" >&5 $as_echo "${ac_cv_exeext}" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -38978,6 +40786,7 @@ $as_echo "${ac_cv_exeext}" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -39020,6 +40829,8 @@ $as_echo "${ac_cv_exeext}" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_exeext=$EXEEXT @@ -39058,6 +40869,7 @@ IEEEFLAG= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -39099,6 +40911,8 @@ IEEEFLAG= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for full floating-point support" >&5 printf %s "checking for full floating-point support... " >&6; } if test "$cross_compiling" = yes @@ -39123,6 +40937,7 @@ printf %s "checking whether \"cc -mieee\" works... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -39192,6 +41007,10 @@ printf %s "checking whether \"cc -mieee\" works... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for full floating-point support" >&5 $as_echo_n "checking for full floating-point support... " >&6; } if test "$cross_compiling" = yes; then : @@ -39217,6 +41036,7 @@ $as_echo_n "checking whether \"cc -mieee\" works... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39308,6 +41128,11 @@ $as_echo_n "checking whether \"cc -mieee\" works... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_save_cflags=${CFLAGS} CFLAGS="$CFLAGS -mieee" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -39331,6 +41156,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -39373,6 +41199,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -39391,6 +41219,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -39474,6 +41303,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { ; @@ -39497,6 +41331,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -39538,6 +41373,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -39567,6 +41404,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -39636,6 +41474,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -39666,6 +41508,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -39756,6 +41599,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -39788,6 +41636,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -39847,6 +41696,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -39901,6 +41752,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -39930,6 +41782,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -39963,6 +41817,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -40004,6 +41859,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -40036,6 +41893,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -40077,6 +41935,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -40102,6 +41962,7 @@ printf "%s\n" "$as_me: WARNING: *** Incomplete floating-point support." >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -40171,6 +42032,10 @@ printf "%s\n" "$as_me: WARNING: *** Incomplete floating-point support." >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -40197,6 +42062,7 @@ $as_echo "$as_me: WARNING: *** Incomplete floating-point support." >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -40288,6 +42154,11 @@ $as_echo "$as_me: WARNING: *** Incomplete floating-point support." >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -40333,6 +42204,7 @@ set dummy pwd; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -40376,6 +42248,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -40396,6 +42270,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -40425,6 +42300,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -40442,6 +42319,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -40484,6 +42362,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $pwd in [\\/]* | ?:[\\/]*) @@ -40511,6 +42391,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -40551,6 +42432,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -40576,6 +42459,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -40644,6 +42528,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -40667,6 +42555,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -40757,6 +42646,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -40785,6 +42679,7 @@ if test -n "$pwd"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pwd" >&5 $as_echo "$pwd" >&6; } @@ -40831,6 +42726,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pwd" >&5 printf "%s\n" "$pwd" >&6; } @@ -40858,6 +42755,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -40886,6 +42784,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pwd" >&5 $as_echo "$pwd" >&6; } @@ -40907,6 +42807,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -40949,6 +42850,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -40976,6 +42879,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for source directory" >&5 $as_echo_n "checking for source directory... " >&6; } ======= @@ -41019,6 +42923,8 @@ $as_echo_n "checking for source directory... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for source directory" >&5 printf %s "checking for source directory... " >&6; } ======= @@ -41039,6 +42945,7 @@ $as_echo_n "checking for source directory... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -41068,6 +42975,8 @@ $as_echo_n "checking for source directory... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for source directory" >&5 $as_echo_n "checking for source directory... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -41085,6 +42994,7 @@ $as_echo_n "checking for source directory... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -41127,6 +43037,8 @@ $as_echo_n "checking for source directory... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -z "$srcdir" ; then SRCDIR=`$pwd` @@ -41151,6 +43063,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$SRCDIR\"" >&5 $as_echo "\"$SRCDIR\"" >&6; } @@ -41197,6 +43110,8 @@ $as_echo_n "checking for build directory... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$SRCDIR\"" >&5 printf "%s\n" "\"$SRCDIR\"" >&6; } @@ -41223,6 +43138,7 @@ $as_echo_n "checking for build directory... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -41252,6 +43168,8 @@ $as_echo_n "checking for build directory... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$SRCDIR\"" >&5 $as_echo "\"$SRCDIR\"" >&6; } @@ -41272,6 +43190,7 @@ $as_echo_n "checking for build directory... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -41314,6 +43233,8 @@ $as_echo_n "checking for build directory... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main DSTDIR=`$pwd` WINDSTDIR=`$winpwd` @@ -41335,6 +43256,7 @@ WINDSTDIR=`$winpwd` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$DSTDIR\"" >&5 $as_echo "\"$DSTDIR\"" >&6; } ======= @@ -41378,6 +43300,8 @@ $as_echo "\"$DSTDIR\"" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$DSTDIR\"" >&5 printf "%s\n" "\"$DSTDIR\"" >&6; } ======= @@ -41398,6 +43322,7 @@ $as_echo "\"$DSTDIR\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -41427,6 +43352,8 @@ $as_echo "\"$DSTDIR\"" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$DSTDIR\"" >&5 $as_echo "\"$DSTDIR\"" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -41444,6 +43371,7 @@ $as_echo "\"$DSTDIR\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -41486,6 +43414,8 @@ $as_echo "\"$DSTDIR\"" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main @@ -41547,6 +43477,7 @@ set dummy git; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -41590,6 +43521,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -41610,6 +43543,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -41639,6 +43573,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -41656,6 +43592,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -41698,6 +43635,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $GIT in [\\/]* | ?:[\\/]*) @@ -41725,6 +43664,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -41765,6 +43705,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -41790,6 +43732,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -41858,6 +43801,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -41881,6 +43828,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -41971,6 +43919,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -41999,6 +43952,7 @@ if test -n "$GIT"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 $as_echo "$GIT" >&6; } @@ -42048,6 +44002,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 printf "%s\n" "$GIT" >&6; } @@ -42102,6 +44058,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -42130,6 +44087,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 $as_echo "$GIT" >&6; } @@ -42154,6 +44113,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -42196,6 +44156,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "$GIT" != "no" ; then GRASS_VERSION_GIT=`$GIT rev-parse --short HEAD 2>/dev/null` if test -z "$GRASS_VERSION_GIT"; then @@ -42252,6 +44214,7 @@ printf "%s\n" "$GRASS_HEADERS_GIT_DATE" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -42293,6 +44256,8 @@ printf "%s\n" "$GRASS_HEADERS_GIT_DATE" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${enable_macosx_app+y} then : enableval=$enable_macosx_app; @@ -42312,6 +44277,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -42381,6 +44347,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${enable_macosx_app+set}" = set; then : enableval=$enable_macosx_app; else @@ -42406,6 +44376,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX App" >&5 $as_echo_n "checking for MacOSX App... " >&6; } ======= @@ -42449,6 +44420,8 @@ $as_echo_n "checking for MacOSX App... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MacOSX App" >&5 printf %s "checking for MacOSX App... " >&6; } ======= @@ -42469,6 +44442,7 @@ $as_echo_n "checking for MacOSX App... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -42498,6 +44472,8 @@ $as_echo_n "checking for MacOSX App... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX App" >&5 $as_echo_n "checking for MacOSX App... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -42515,6 +44491,7 @@ $as_echo_n "checking for MacOSX App... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -42557,6 +44534,8 @@ $as_echo_n "checking for MacOSX App... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$enable_macosx_app" in yes) MACOSX_APP=1 ;; no) MACOSX_APP= ;; @@ -42579,6 +44558,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$enable_macosx_app\"" >&5 $as_echo "\"$enable_macosx_app\"" >&6; } ======= @@ -42622,6 +44602,8 @@ $as_echo "\"$enable_macosx_app\"" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$enable_macosx_app\"" >&5 printf "%s\n" "\"$enable_macosx_app\"" >&6; } ======= @@ -42642,6 +44624,7 @@ $as_echo "\"$enable_macosx_app\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -42671,6 +44654,8 @@ $as_echo "\"$enable_macosx_app\"" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$enable_macosx_app\"" >&5 $as_echo "\"$enable_macosx_app\"" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -42688,6 +44673,7 @@ $as_echo "\"$enable_macosx_app\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -42730,6 +44716,8 @@ $as_echo "\"$enable_macosx_app\"" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Check for MacOSX archs @@ -42751,6 +44739,7 @@ $as_echo "\"$enable_macosx_app\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX architectures" >&5 $as_echo_n "checking for MacOSX architectures... " >&6; } ======= @@ -42794,6 +44783,8 @@ $as_echo_n "checking for MacOSX architectures... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MacOSX architectures" >&5 printf %s "checking for MacOSX architectures... " >&6; } ======= @@ -42814,6 +44805,7 @@ $as_echo_n "checking for MacOSX architectures... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -42843,6 +44835,8 @@ $as_echo_n "checking for MacOSX architectures... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX architectures" >&5 $as_echo_n "checking for MacOSX architectures... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -42860,6 +44854,7 @@ $as_echo_n "checking for MacOSX architectures... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -42902,6 +44897,8 @@ $as_echo_n "checking for MacOSX architectures... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main MACOSX_ARCHS= @@ -42922,6 +44919,7 @@ if test -z "$with_macosx_archs" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -42965,6 +44963,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -42986,6 +44986,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -43014,6 +45015,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -43032,6 +45035,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -43074,6 +45078,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else for a in $with_macosx_archs do @@ -43100,6 +45106,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACOSX_ARCHS" >&5 $as_echo "$MACOSX_ARCHS" >&6; } @@ -43143,6 +45150,8 @@ $as_echo "$MACOSX_ARCHS" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACOSX_ARCHS" >&5 printf "%s\n" "$MACOSX_ARCHS" >&6; } @@ -43164,6 +45173,7 @@ $as_echo "$MACOSX_ARCHS" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -43192,6 +45202,8 @@ $as_echo "$MACOSX_ARCHS" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACOSX_ARCHS" >&5 $as_echo "$MACOSX_ARCHS" >&6; } @@ -43210,6 +45222,7 @@ $as_echo "$MACOSX_ARCHS" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -43251,6 +45264,8 @@ $as_echo "$MACOSX_ARCHS" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main LDFLAGS="$LDFLAGS $MACOSX_ARCHS" CFLAGS="$CFLAGS $MACOSX_ARCHS" @@ -43280,6 +45295,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX SDK" >&5 $as_echo_n "checking for MacOSX SDK... " >&6; } ======= @@ -43323,6 +45339,8 @@ $as_echo_n "checking for MacOSX SDK... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MacOSX SDK" >&5 printf %s "checking for MacOSX SDK... " >&6; } ======= @@ -43343,6 +45361,7 @@ $as_echo_n "checking for MacOSX SDK... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -43372,6 +45391,8 @@ $as_echo_n "checking for MacOSX SDK... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacOSX SDK" >&5 $as_echo_n "checking for MacOSX SDK... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -43389,6 +45410,7 @@ $as_echo_n "checking for MacOSX SDK... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -43431,6 +45453,8 @@ $as_echo_n "checking for MacOSX SDK... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main MACOSX_SDK= @@ -43451,6 +45475,7 @@ if test -z "$with_macosx_sdk" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -43498,6 +45523,8 @@ $as_echo_n "checking for $with_macosx_sdk/SDKSettings.plist... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -43527,6 +45554,7 @@ $as_echo_n "checking for $with_macosx_sdk/SDKSettings.plist... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -43555,6 +45583,8 @@ $as_echo_n "checking for $with_macosx_sdk/SDKSettings.plist... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -43577,6 +45607,7 @@ $as_echo_n "checking for $with_macosx_sdk/SDKSettings.plist... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -43619,6 +45650,8 @@ $as_echo_n "checking for $with_macosx_sdk/SDKSettings.plist... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 @@ -43645,6 +45678,7 @@ eval ac_res=\$$as_ac_File <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -43685,6 +45719,8 @@ eval ac_res=\$$as_ac_File ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } @@ -43709,6 +45745,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -43777,6 +45814,10 @@ else $as_nop ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } @@ -43802,6 +45843,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -43892,6 +45934,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** specified SDK does not exist or is not a SDK" "$LINENO" 5 fi @@ -43935,6 +45982,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -43975,6 +46023,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5 printf %s "checking how to build libraries... " >&6; } @@ -43998,6 +46048,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -44066,6 +46117,10 @@ else $as_nop ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5 $as_echo_n "checking how to build libraries... " >&6; } @@ -44102,6 +46157,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5 $as_echo "shared" >&6; } @@ -44153,6 +46209,8 @@ $as_echo "#define STATIC_BUILD 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: shared" >&5 printf "%s\n" "shared" >&6; } @@ -44190,6 +46248,7 @@ $as_echo "#define STATIC_BUILD 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -44218,6 +46277,8 @@ $as_echo "#define STATIC_BUILD 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5 $as_echo "shared" >&6; } @@ -44244,6 +46305,7 @@ $as_echo "#define STATIC_BUILD 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -44285,6 +46347,8 @@ $as_echo "#define STATIC_BUILD 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main GRASS_LIBRARY_TYPE='stlib' @@ -44360,6 +46424,7 @@ ac_save_ldflags="$LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -44401,6 +46466,8 @@ ac_save_ldflags="$LDFLAGS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define _REENTRANT 1" >>confdefs.h @@ -44420,6 +46487,7 @@ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -44489,6 +46557,10 @@ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "#define _REENTRANT 1" >>confdefs.h @@ -44510,6 +46582,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -44600,6 +46673,11 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # Note: need the LIBS below, otherwise Tk won't find Tcl's @@ -44641,6 +46719,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -44682,6 +46761,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define _REENTRANT 1" >>confdefs.h @@ -44701,6 +46782,7 @@ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -44770,6 +46852,10 @@ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main $as_echo "#define _REENTRANT 1" >>confdefs.h @@ -44791,6 +46877,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -44881,6 +46968,11 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # Note: need the LIBS below, otherwise Tk won't find Tcl's @@ -44928,6 +47020,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -44971,6 +47064,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # AC_DEFINE(_REENTRANT, 1, [Define to 1 for _REENTRANT flag (for SunOS).]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to 1 to enable threading extensions on Solaris.]) @@ -44992,6 +47087,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -45020,6 +47116,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -45038,6 +47136,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -45079,6 +47178,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ;; *-netbsd*) @@ -45116,6 +47217,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -45159,6 +47261,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # AC_DEFINE(_REENTRANT, 1, [Define to 1 for _REENTRANT flag (for SunOS).]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to 1 to enable threading extensions on Solaris.]) @@ -45180,6 +47284,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -45208,6 +47313,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # AC_DEFINE(_REENTRANT, 1, [define _REENTRANT flag (for SunOS)]) # AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [enable threading extensions on Solaris]) @@ -45226,6 +47333,7 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -45267,6 +47375,8 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ;; *aix*) @@ -45329,6 +47439,7 @@ LDFLAGS="${ac_save_ldflags} $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -45370,6 +47481,8 @@ LDFLAGS="${ac_save_ldflags} $LDFLAGS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${enable_w11+y} then : enableval=$enable_w11; @@ -45389,6 +47502,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -45458,6 +47572,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${enable_w11+set}" = set; then : enableval=$enable_w11; else @@ -45489,6 +47607,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -45530,6 +47649,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_macosx_archs+y} then : withval=$with_macosx_archs; @@ -45549,6 +47670,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -45618,6 +47740,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_macosx_archs+set}" = set; then : withval=$with_macosx_archs; else @@ -45644,6 +47770,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -45685,6 +47812,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_macosx_sdk+y} then : withval=$with_macosx_sdk; @@ -45704,6 +47833,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -45773,6 +47903,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_macosx_sdk+set}" = set; then : withval=$with_macosx_sdk; else @@ -45800,6 +47934,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -45841,6 +47976,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_tiff+y} then : withval=$with_tiff; @@ -45860,6 +47997,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -45929,6 +48067,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_tiff+set}" = set; then : withval=$with_tiff; else @@ -45957,6 +48099,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -45998,6 +48141,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_postgres+y} then : withval=$with_postgres; @@ -46017,6 +48162,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -46086,6 +48232,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_postgres+set}" = set; then : withval=$with_postgres; else @@ -46114,6 +48264,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -46155,6 +48306,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_mysql+y} then : withval=$with_mysql; @@ -46174,6 +48327,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -46243,6 +48397,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_mysql+set}" = set; then : withval=$with_mysql; else @@ -46271,6 +48429,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -46312,6 +48471,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_sqlite+y} then : withval=$with_sqlite; @@ -46331,6 +48492,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -46400,6 +48562,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_sqlite+set}" = set; then : withval=$with_sqlite; else @@ -46428,6 +48594,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -46469,6 +48636,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opengl+y} then : withval=$with_opengl; @@ -46488,6 +48657,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -46557,6 +48727,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_opengl+set}" = set; then : withval=$with_opengl; else @@ -46585,6 +48759,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -46626,6 +48801,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_odbc+y} then : withval=$with_odbc; @@ -46645,6 +48822,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -46714,6 +48892,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_odbc+set}" = set; then : withval=$with_odbc; else @@ -46742,6 +48924,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -46783,6 +48966,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_fftw+y} then : withval=$with_fftw; @@ -46802,6 +48987,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -46871,6 +49057,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_fftw+set}" = set; then : withval=$with_fftw; else @@ -46901,6 +49091,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -46942,6 +49133,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_blas+y} then : withval=$with_blas; @@ -46961,6 +49154,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -47030,6 +49224,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_blas+set}" = set; then : withval=$with_blas; else @@ -47058,6 +49256,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -47099,6 +49298,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_lapack+y} then : withval=$with_lapack; @@ -47118,6 +49319,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -47187,6 +49389,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_lapack+set}" = set; then : withval=$with_lapack; else @@ -47214,6 +49420,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -47254,11 +49461,16 @@ fi ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -47293,6 +49505,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -47362,6 +49575,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Check whether --with-cairo was given. if test "${with_cairo+set}" = set; then : withval=$with_cairo; @@ -47391,6 +49608,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -47432,6 +49650,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_freetype+y} then : withval=$with_freetype; @@ -47451,6 +49671,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -47520,6 +49741,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_freetype+set}" = set; then : withval=$with_freetype; else @@ -47548,6 +49773,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -47589,6 +49815,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_nls+y} then : withval=$with_nls; @@ -47608,6 +49836,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -47677,6 +49906,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_nls+set}" = set; then : withval=$with_nls; else @@ -47705,6 +49938,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -47746,6 +49980,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_readline+y} then : withval=$with_readline; @@ -47765,6 +50001,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -47834,6 +50071,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_readline+set}" = set; then : withval=$with_readline; else @@ -47864,6 +50105,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -47905,6 +50147,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opendwg+y} then : withval=$with_opendwg; @@ -47924,6 +50168,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -47993,6 +50238,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_opendwg+set}" = set; then : withval=$with_opendwg; else @@ -48022,6 +50271,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -48063,6 +50313,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_regex+y} then : withval=$with_regex; @@ -48082,6 +50334,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -48151,6 +50404,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_regex+set}" = set; then : withval=$with_regex; else @@ -48179,6 +50436,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -48220,6 +50478,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_pthread+y} then : withval=$with_pthread; @@ -48239,6 +50499,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -48308,6 +50569,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_pthread+set}" = set; then : withval=$with_pthread; else @@ -48336,6 +50601,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -48377,6 +50643,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_openmp+y} then : withval=$with_openmp; @@ -48396,6 +50664,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -48465,6 +50734,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_openmp+set}" = set; then : withval=$with_openmp; else @@ -48493,6 +50766,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -48534,6 +50808,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opencl+y} then : withval=$with_opencl; @@ -48553,6 +50829,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -48622,6 +50899,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_opencl+set}" = set; then : withval=$with_opencl; else @@ -48650,6 +50931,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -48691,6 +50973,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_bzlib+y} then : withval=$with_bzlib; @@ -48710,6 +50994,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -48779,6 +51064,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_bzlib+set}" = set; then : withval=$with_bzlib; else @@ -48807,6 +51096,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -48848,6 +51138,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_zstd+y} then : withval=$with_zstd; @@ -48867,6 +51159,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -48936,6 +51229,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_zstd+set}" = set; then : withval=$with_zstd; else @@ -48963,6 +51260,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Check whether --with-libpng was given. if test "${with_libpng+set}" = set; then : withval=$with_libpng; @@ -49007,6 +51305,8 @@ if test "${with_libpng+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Check whether --with-pdal was given. if test ${with_pdal+y} then : @@ -49032,6 +51332,7 @@ if test "${with_libpng+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -49061,6 +51362,8 @@ if test "${with_libpng+set}" = set; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Check whether --with-libpng was given. if test "${with_libpng+set}" = set; then : withval=$with_libpng; @@ -49079,6 +51382,7 @@ if test "${with_libpng+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -49121,6 +51425,8 @@ if test "${with_libpng+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -49142,6 +51448,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Check whether --with-gdal was given. if test "${with_gdal+set}" = set; then : ======= @@ -49184,6 +51491,8 @@ if test "${with_gdal+set}" = set; then : ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Check whether --with-blas was given. @@ -49236,6 +51545,7 @@ if test "${with_gdal+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -49265,6 +51575,8 @@ if test "${with_gdal+set}" = set; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Check whether --with-gdal was given. if test "${with_gdal+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -49282,6 +51594,7 @@ if test "${with_gdal+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -49323,6 +51636,8 @@ if test "${with_gdal+set}" = set; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main withval=$with_gdal; fi @@ -49347,6 +51662,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -49388,6 +51704,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_liblas+y} then : withval=$with_liblas; @@ -49407,6 +51725,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -49476,6 +51795,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_liblas+set}" = set; then : withval=$with_liblas; else @@ -49501,6 +51824,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -49542,6 +51866,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Check whether --with-netcdf was given. if test ${with_netcdf+y} @@ -49563,6 +51889,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -49632,6 +51959,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Check whether --with-pdal was given. if test "${with_pdal+set}" = set; then : @@ -49672,6 +52003,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -49713,6 +52045,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_geos+y} then : withval=$with_geos; @@ -49732,6 +52066,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -49801,6 +52136,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "${with_geos+set}" = set; then : withval=$with_geos; else @@ -49828,6 +52167,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -49870,6 +52210,8 @@ if test "${with_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_includes+y} then : ======= @@ -49889,6 +52231,7 @@ if test "${with_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -49971,6 +52314,11 @@ if test "${with_includes+set}" = set; then : ======= if test "${with_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_includes; fi @@ -49995,6 +52343,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -50037,6 +52386,8 @@ if test "${with_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_libs+y} then : ======= @@ -50056,6 +52407,7 @@ if test "${with_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -50138,6 +52490,11 @@ if test "${with_libs+set}" = set; then : ======= if test "${with_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_libs; fi @@ -50163,6 +52520,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_zlib_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -50205,6 +52563,8 @@ if test "${with_zlib_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_zlib_includes+y} then : ======= @@ -50224,6 +52584,7 @@ if test "${with_zlib_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_zlib_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -50306,6 +52667,11 @@ if test "${with_zlib_includes+set}" = set; then : ======= if test "${with_zlib_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_zlib_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_zlib_includes; fi @@ -50331,6 +52697,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_zlib_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -50373,6 +52740,8 @@ if test "${with_zlib_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_zlib_libs+y} then : ======= @@ -50392,6 +52761,7 @@ if test "${with_zlib_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_zlib_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -50474,6 +52844,11 @@ if test "${with_zlib_libs+set}" = set; then : ======= if test "${with_zlib_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_zlib_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_zlib_libs; fi @@ -50500,6 +52875,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_bzlib_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -50542,6 +52918,8 @@ if test "${with_bzlib_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_bzlib_includes+y} then : ======= @@ -50561,6 +52939,7 @@ if test "${with_bzlib_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_bzlib_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -50643,6 +53022,11 @@ if test "${with_bzlib_includes+set}" = set; then : ======= if test "${with_bzlib_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_bzlib_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_bzlib_includes; fi @@ -50668,6 +53052,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_bzlib_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -50710,6 +53095,8 @@ if test "${with_bzlib_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_bzlib_libs+y} then : ======= @@ -50729,6 +53116,7 @@ if test "${with_bzlib_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_bzlib_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -50811,6 +53199,11 @@ if test "${with_bzlib_libs+set}" = set; then : ======= if test "${with_bzlib_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_bzlib_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_bzlib_libs; fi @@ -50837,6 +53230,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_zstd_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -50879,6 +53273,8 @@ if test "${with_zstd_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_zstd_includes+y} then : ======= @@ -50898,6 +53294,7 @@ if test "${with_zstd_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_zstd_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -50980,6 +53377,11 @@ if test "${with_zstd_includes+set}" = set; then : ======= if test "${with_zstd_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_zstd_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_zstd_includes; fi @@ -51005,6 +53407,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_zstd_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -51047,6 +53450,8 @@ if test "${with_zstd_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_zstd_libs+y} then : ======= @@ -51066,6 +53471,7 @@ if test "${with_zstd_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_zstd_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -51148,6 +53554,11 @@ if test "${with_zstd_libs+set}" = set; then : ======= if test "${with_zstd_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_zstd_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_zstd_libs; fi @@ -51174,6 +53585,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_readline_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -51216,6 +53628,8 @@ if test "${with_readline_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_readline_includes+y} then : ======= @@ -51235,6 +53649,7 @@ if test "${with_readline_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_readline_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -51317,6 +53732,11 @@ if test "${with_readline_includes+set}" = set; then : ======= if test "${with_readline_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_readline_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_readline_includes; fi @@ -51342,6 +53762,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_readline_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -51384,6 +53805,8 @@ if test "${with_readline_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_readline_libs+y} then : ======= @@ -51403,6 +53826,7 @@ if test "${with_readline_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_readline_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -51485,6 +53909,11 @@ if test "${with_readline_libs+set}" = set; then : ======= if test "${with_readline_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_readline_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_readline_libs; fi @@ -51511,6 +53940,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_tiff_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -51553,6 +53983,8 @@ if test "${with_tiff_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_tiff_includes+y} then : ======= @@ -51572,6 +54004,7 @@ if test "${with_tiff_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_tiff_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -51654,6 +54087,11 @@ if test "${with_tiff_includes+set}" = set; then : ======= if test "${with_tiff_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_tiff_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_tiff_includes; fi @@ -51679,6 +54117,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_tiff_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -51721,6 +54160,8 @@ if test "${with_tiff_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_tiff_libs+y} then : ======= @@ -51740,6 +54181,7 @@ if test "${with_tiff_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_tiff_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -51822,6 +54264,11 @@ if test "${with_tiff_libs+set}" = set; then : ======= if test "${with_tiff_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_tiff_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_tiff_libs; fi @@ -51848,6 +54295,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_postgres_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -51890,6 +54338,8 @@ if test "${with_postgres_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_postgres_includes+y} then : ======= @@ -51909,6 +54359,7 @@ if test "${with_postgres_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_postgres_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -51991,6 +54442,11 @@ if test "${with_postgres_includes+set}" = set; then : ======= if test "${with_postgres_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_postgres_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_postgres_includes; fi @@ -52016,6 +54472,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_postgres_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -52058,6 +54515,8 @@ if test "${with_postgres_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_postgres_libs+y} then : ======= @@ -52077,6 +54536,7 @@ if test "${with_postgres_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_postgres_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -52159,6 +54619,11 @@ if test "${with_postgres_libs+set}" = set; then : ======= if test "${with_postgres_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_postgres_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_postgres_libs; fi @@ -52185,6 +54650,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_mysql_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -52227,6 +54693,8 @@ if test "${with_mysql_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_mysql_includes+y} then : ======= @@ -52246,6 +54714,7 @@ if test "${with_mysql_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_mysql_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -52328,6 +54797,11 @@ if test "${with_mysql_includes+set}" = set; then : ======= if test "${with_mysql_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_mysql_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_mysql_includes; fi @@ -52353,6 +54827,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_mysql_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -52395,6 +54870,8 @@ if test "${with_mysql_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_mysql_libs+y} then : ======= @@ -52414,6 +54891,7 @@ if test "${with_mysql_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_mysql_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -52496,6 +54974,11 @@ if test "${with_mysql_libs+set}" = set; then : ======= if test "${with_mysql_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_mysql_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_mysql_libs; fi @@ -52522,6 +55005,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_sqlite_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -52564,6 +55048,8 @@ if test "${with_sqlite_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_sqlite_includes+y} then : ======= @@ -52583,6 +55069,7 @@ if test "${with_sqlite_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_sqlite_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -52665,6 +55152,11 @@ if test "${with_sqlite_includes+set}" = set; then : ======= if test "${with_sqlite_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_sqlite_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_sqlite_includes; fi @@ -52690,6 +55182,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_sqlite_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -52732,6 +55225,8 @@ if test "${with_sqlite_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_sqlite_libs+y} then : ======= @@ -52751,6 +55246,7 @@ if test "${with_sqlite_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_sqlite_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -52833,6 +55329,11 @@ if test "${with_sqlite_libs+set}" = set; then : ======= if test "${with_sqlite_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_sqlite_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_sqlite_libs; fi @@ -52859,6 +55360,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opengl_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -52901,6 +55403,8 @@ if test "${with_opengl_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opengl_includes+y} then : ======= @@ -52920,6 +55424,7 @@ if test "${with_opengl_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_opengl_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -53002,6 +55507,11 @@ if test "${with_opengl_includes+set}" = set; then : ======= if test "${with_opengl_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_opengl_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_opengl_includes; fi @@ -53027,6 +55537,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opengl_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -53069,6 +55580,8 @@ if test "${with_opengl_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opengl_libs+y} then : ======= @@ -53088,6 +55601,7 @@ if test "${with_opengl_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_opengl_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -53170,6 +55684,11 @@ if test "${with_opengl_libs+set}" = set; then : ======= if test "${with_opengl_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_opengl_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_opengl_libs; fi @@ -53195,6 +55714,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opengl_framework+set}" = set; then : ======= <<<<<<< HEAD @@ -53237,6 +55757,8 @@ if test "${with_opengl_framework+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opengl_framework+y} then : ======= @@ -53256,6 +55778,7 @@ if test "${with_opengl_framework+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_opengl_framework+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -53338,6 +55861,11 @@ if test "${with_opengl_framework+set}" = set; then : ======= if test "${with_opengl_framework+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_opengl_framework+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_opengl_framework; fi @@ -53364,6 +55892,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_odbc_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -53406,6 +55935,8 @@ if test "${with_odbc_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_odbc_includes+y} then : ======= @@ -53425,6 +55956,7 @@ if test "${with_odbc_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_odbc_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -53507,6 +56039,11 @@ if test "${with_odbc_includes+set}" = set; then : ======= if test "${with_odbc_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_odbc_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_odbc_includes; fi @@ -53532,6 +56069,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_odbc_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -53574,6 +56112,8 @@ if test "${with_odbc_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_odbc_libs+y} then : ======= @@ -53593,6 +56133,7 @@ if test "${with_odbc_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_odbc_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -53675,6 +56216,11 @@ if test "${with_odbc_libs+set}" = set; then : ======= if test "${with_odbc_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_odbc_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_odbc_libs; fi @@ -53701,6 +56247,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_fftw_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -53743,6 +56290,8 @@ if test "${with_fftw_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_fftw_includes+y} then : ======= @@ -53762,6 +56311,7 @@ if test "${with_fftw_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_fftw_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -53844,6 +56394,11 @@ if test "${with_fftw_includes+set}" = set; then : ======= if test "${with_fftw_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_fftw_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_fftw_includes; fi @@ -53869,6 +56424,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_fftw_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -53911,6 +56467,8 @@ if test "${with_fftw_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_fftw_libs+y} then : ======= @@ -53930,6 +56488,7 @@ if test "${with_fftw_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_fftw_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -54012,6 +56571,11 @@ if test "${with_fftw_libs+set}" = set; then : ======= if test "${with_fftw_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_fftw_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_fftw_libs; fi @@ -54040,6 +56604,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_blas_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -54082,6 +56647,8 @@ if test "${with_blas_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_blas_includes+y} then : ======= @@ -54101,6 +56668,7 @@ if test "${with_blas_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_blas_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -54183,6 +56751,11 @@ if test "${with_blas_includes+set}" = set; then : ======= if test "${with_blas_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_blas_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_blas_includes; fi @@ -54208,6 +56781,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_blas_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -54250,6 +56824,8 @@ if test "${with_blas_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_blas_libs+y} then : ======= @@ -54269,6 +56845,7 @@ if test "${with_blas_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_blas_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -54351,6 +56928,11 @@ if test "${with_blas_libs+set}" = set; then : ======= if test "${with_blas_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_blas_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_blas_libs; fi @@ -54377,6 +56959,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_lapack_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -54419,6 +57002,8 @@ if test "${with_lapack_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_lapack_includes+y} then : ======= @@ -54438,6 +57023,7 @@ if test "${with_lapack_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_lapack_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -54520,6 +57106,11 @@ if test "${with_lapack_includes+set}" = set; then : ======= if test "${with_lapack_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_lapack_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_lapack_includes; fi @@ -54545,6 +57136,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_lapack_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -54587,6 +57179,8 @@ if test "${with_lapack_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_lapack_libs+y} then : ======= @@ -54606,6 +57200,7 @@ if test "${with_lapack_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_lapack_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -54688,6 +57283,11 @@ if test "${with_lapack_libs+set}" = set; then : ======= if test "${with_lapack_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_lapack_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_lapack_libs; fi @@ -54713,6 +57313,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Check whether --with-cairo-includes was given. if test "${with_cairo_includes+set}" = set; then : ======= @@ -54755,11 +57356,16 @@ if test "${with_cairo_includes+set}" = set; then : ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -54803,6 +57409,7 @@ if test "${with_cairo_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -54832,6 +57439,8 @@ if test "${with_cairo_includes+set}" = set; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Check whether --with-cairo-includes was given. if test "${with_cairo_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -54849,6 +57458,7 @@ if test "${with_cairo_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -54890,6 +57500,8 @@ if test "${with_cairo_includes+set}" = set; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main withval=$with_cairo_includes; fi @@ -54915,6 +57527,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_cairo_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -54957,6 +57570,8 @@ if test "${with_cairo_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_cairo_libs+y} then : ======= @@ -54976,6 +57591,7 @@ if test "${with_cairo_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_cairo_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -55058,6 +57674,11 @@ if test "${with_cairo_libs+set}" = set; then : ======= if test "${with_cairo_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_cairo_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_cairo_libs; fi @@ -55083,6 +57704,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_cairo_ldflags+set}" = set; then : ======= <<<<<<< HEAD @@ -55125,6 +57747,8 @@ if test "${with_cairo_ldflags+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_cairo_ldflags+y} then : ======= @@ -55144,6 +57768,7 @@ if test "${with_cairo_ldflags+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_cairo_ldflags+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -55226,6 +57851,11 @@ if test "${with_cairo_ldflags+set}" = set; then : ======= if test "${with_cairo_ldflags+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_cairo_ldflags+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_cairo_ldflags; fi @@ -55252,6 +57882,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_freetype_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -55294,6 +57925,8 @@ if test "${with_freetype_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_freetype_includes+y} then : ======= @@ -55313,6 +57946,7 @@ if test "${with_freetype_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_freetype_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -55395,6 +58029,11 @@ if test "${with_freetype_includes+set}" = set; then : ======= if test "${with_freetype_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_freetype_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_freetype_includes; fi @@ -55420,6 +58059,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_freetype_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -55462,6 +58102,8 @@ if test "${with_freetype_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_freetype_libs+y} then : ======= @@ -55481,6 +58123,7 @@ if test "${with_freetype_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_freetype_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -55563,6 +58206,11 @@ if test "${with_freetype_libs+set}" = set; then : ======= if test "${with_freetype_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_freetype_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_freetype_libs; fi @@ -55589,6 +58237,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_proj_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -55631,6 +58280,8 @@ if test "${with_proj_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_proj_includes+y} then : ======= @@ -55650,6 +58301,7 @@ if test "${with_proj_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_proj_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -55732,6 +58384,11 @@ if test "${with_proj_includes+set}" = set; then : ======= if test "${with_proj_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_proj_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_proj_includes; fi @@ -55757,6 +58414,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_proj_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -55799,6 +58457,8 @@ if test "${with_proj_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_proj_libs+y} then : ======= @@ -55818,6 +58478,7 @@ if test "${with_proj_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_proj_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -55900,6 +58561,11 @@ if test "${with_proj_libs+set}" = set; then : ======= if test "${with_proj_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_proj_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_proj_libs; fi @@ -55925,6 +58591,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_proj_share+set}" = set; then : ======= <<<<<<< HEAD @@ -55967,6 +58634,8 @@ if test "${with_proj_share+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_proj_share+y} then : ======= @@ -55986,6 +58655,7 @@ if test "${with_proj_share+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_proj_share+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -56068,6 +58738,11 @@ if test "${with_proj_share+set}" = set; then : ======= if test "${with_proj_share+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_proj_share+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_proj_share; fi @@ -56096,6 +58771,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opendwg_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -56138,6 +58814,8 @@ if test "${with_opendwg_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opendwg_includes+y} then : ======= @@ -56157,6 +58835,7 @@ if test "${with_opendwg_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_opendwg_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -56239,6 +58918,11 @@ if test "${with_opendwg_includes+set}" = set; then : ======= if test "${with_opendwg_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_opendwg_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_opendwg_includes; fi @@ -56264,6 +58948,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opendwg_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -56306,6 +58991,8 @@ if test "${with_opendwg_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opendwg_libs+y} then : ======= @@ -56325,6 +59012,7 @@ if test "${with_opendwg_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_opendwg_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -56407,6 +59095,11 @@ if test "${with_opendwg_libs+set}" = set; then : ======= if test "${with_opendwg_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_opendwg_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_opendwg_libs; fi @@ -56434,6 +59127,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_regex_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -56476,6 +59170,8 @@ if test "${with_regex_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_regex_includes+y} then : ======= @@ -56495,6 +59191,7 @@ if test "${with_regex_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_regex_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -56577,6 +59274,11 @@ if test "${with_regex_includes+set}" = set; then : ======= if test "${with_regex_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_regex_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_regex_includes; fi @@ -56602,6 +59304,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_regex_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -56644,6 +59347,8 @@ if test "${with_regex_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_regex_libs+y} then : ======= @@ -56663,6 +59368,7 @@ if test "${with_regex_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_regex_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -56745,6 +59451,11 @@ if test "${with_regex_libs+set}" = set; then : ======= if test "${with_regex_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_regex_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_regex_libs; fi @@ -56771,6 +59482,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_pthread_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -56813,6 +59525,8 @@ if test "${with_pthread_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_pthread_includes+y} then : ======= @@ -56832,6 +59546,7 @@ if test "${with_pthread_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_pthread_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -56914,6 +59629,11 @@ if test "${with_pthread_includes+set}" = set; then : ======= if test "${with_pthread_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_pthread_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_pthread_includes; fi @@ -56939,6 +59659,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_pthread_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -56981,6 +59702,8 @@ if test "${with_pthread_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_pthread_libs+y} then : ======= @@ -57000,6 +59723,7 @@ if test "${with_pthread_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_pthread_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -57082,6 +59806,11 @@ if test "${with_pthread_libs+set}" = set; then : ======= if test "${with_pthread_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_pthread_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_pthread_libs; fi @@ -57108,6 +59837,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_openmp_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -57150,6 +59880,8 @@ if test "${with_openmp_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_openmp_includes+y} then : ======= @@ -57169,6 +59901,7 @@ if test "${with_openmp_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_openmp_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -57251,6 +59984,11 @@ if test "${with_openmp_includes+set}" = set; then : ======= if test "${with_openmp_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_openmp_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_openmp_includes; fi @@ -57276,6 +60014,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_openmp_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -57318,6 +60057,8 @@ if test "${with_openmp_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_openmp_libs+y} then : ======= @@ -57337,6 +60078,7 @@ if test "${with_openmp_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_openmp_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -57419,6 +60161,11 @@ if test "${with_openmp_libs+set}" = set; then : ======= if test "${with_openmp_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_openmp_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_openmp_libs; fi @@ -57445,6 +60192,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opencl_includes+set}" = set; then : ======= <<<<<<< HEAD @@ -57487,6 +60235,8 @@ if test "${with_opencl_includes+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opencl_includes+y} then : ======= @@ -57506,6 +60256,7 @@ if test "${with_opencl_includes+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_opencl_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -57588,6 +60339,11 @@ if test "${with_opencl_includes+set}" = set; then : ======= if test "${with_opencl_includes+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_opencl_includes+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_opencl_includes; fi @@ -57613,6 +60369,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${with_opencl_libs+set}" = set; then : ======= <<<<<<< HEAD @@ -57655,6 +60412,8 @@ if test "${with_opencl_libs+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${with_opencl_libs+y} then : ======= @@ -57674,6 +60433,7 @@ if test "${with_opencl_libs+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${with_opencl_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -57756,6 +60516,11 @@ if test "${with_opencl_libs+set}" = set; then : ======= if test "${with_opencl_libs+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${with_opencl_libs+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main withval=$with_opencl_libs; fi @@ -57788,6 +60553,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional include dirs" >&5 $as_echo_n "checking for additional include dirs... " >&6; } ======= @@ -57831,6 +60597,8 @@ $as_echo_n "checking for additional include dirs... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for additional include dirs" >&5 printf %s "checking for additional include dirs... " >&6; } ======= @@ -57851,6 +60619,7 @@ $as_echo_n "checking for additional include dirs... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -57880,6 +60649,8 @@ $as_echo_n "checking for additional include dirs... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional include dirs" >&5 $as_echo_n "checking for additional include dirs... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -57897,6 +60668,7 @@ $as_echo_n "checking for additional include dirs... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -57939,6 +60711,8 @@ $as_echo_n "checking for additional include dirs... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to list --with-includes." "$LINENO" 5 @@ -57961,6 +60735,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_includes" >&5 $as_echo "$with_includes" >&6; } ======= @@ -58004,6 +60779,8 @@ $as_echo "$with_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_includes" >&5 printf "%s\n" "$with_includes" >&6; } ======= @@ -58024,6 +60801,7 @@ $as_echo "$with_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -58053,6 +60831,8 @@ $as_echo "$with_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_includes" >&5 $as_echo "$with_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -58070,6 +60850,7 @@ $as_echo "$with_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -58112,6 +60893,8 @@ $as_echo "$with_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_includes"; then for dir in $with_includes; do @@ -58144,6 +60927,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional library dirs" >&5 $as_echo_n "checking for additional library dirs... " >&6; } ======= @@ -58187,6 +60971,8 @@ $as_echo_n "checking for additional library dirs... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for additional library dirs" >&5 printf %s "checking for additional library dirs... " >&6; } ======= @@ -58207,6 +60993,7 @@ $as_echo_n "checking for additional library dirs... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -58236,6 +61023,8 @@ $as_echo_n "checking for additional library dirs... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional library dirs" >&5 $as_echo_n "checking for additional library dirs... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -58253,6 +61042,7 @@ $as_echo_n "checking for additional library dirs... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -58295,6 +61085,8 @@ $as_echo_n "checking for additional library dirs... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory list to --with-libs." "$LINENO" 5 @@ -58317,6 +61109,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libs" >&5 $as_echo "$with_libs" >&6; } ======= @@ -58360,6 +61153,8 @@ $as_echo "$with_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_libs" >&5 printf "%s\n" "$with_libs" >&6; } ======= @@ -58380,6 +61175,7 @@ $as_echo "$with_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -58409,6 +61205,8 @@ $as_echo "$with_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libs" >&5 $as_echo "$with_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -58426,6 +61224,7 @@ $as_echo "$with_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -58468,6 +61267,8 @@ $as_echo "$with_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_libs"; then for dir in $with_libs; do @@ -58515,6 +61316,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } ======= @@ -58558,6 +61360,8 @@ $as_echo_n "checking for a BSD-compatible install... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 printf %s "checking for a BSD-compatible install... " >&6; } ======= @@ -58578,6 +61382,7 @@ $as_echo_n "checking for a BSD-compatible install... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -58607,6 +61412,8 @@ $as_echo_n "checking for a BSD-compatible install... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -58624,6 +61431,7 @@ $as_echo_n "checking for a BSD-compatible install... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -58666,6 +61474,8 @@ $as_echo_n "checking for a BSD-compatible install... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -z "$INSTALL"; then as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -58689,6 +61499,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -58729,6 +61540,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -58753,6 +61566,7 @@ case $as_dir in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -58821,6 +61635,10 @@ case $as_dir in #(( ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. # Account for people who put trailing slashes in PATH elements. @@ -58843,6 +61661,7 @@ case $as_dir/ in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -58933,6 +61752,11 @@ case $as_dir/ in #(( >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ @@ -58959,6 +61783,7 @@ case $as_dir/ in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && @@ -59007,6 +61832,8 @@ case $as_dir/ in #(( ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && @@ -59038,6 +61865,7 @@ case $as_dir/ in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -59066,6 +61894,8 @@ case $as_dir/ in #(( >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && @@ -59089,6 +61919,7 @@ case $as_dir/ in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -59130,6 +61961,8 @@ case $as_dir/ in #(( ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # program-specific install script used by HP pwplus--don't use. : @@ -59154,6 +61987,7 @@ case $as_dir/ in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ======= @@ -59196,6 +62030,8 @@ case $as_dir/ in #(( ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && ======= @@ -59215,6 +62051,7 @@ case $as_dir/ in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -59297,6 +62134,11 @@ case $as_dir/ in #(( ======= if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && @@ -59318,6 +62160,7 @@ case $as_dir/ in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ======= @@ -59360,6 +62203,8 @@ case $as_dir/ in #(( ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" ======= @@ -59379,6 +62224,7 @@ case $as_dir/ in #(( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -59461,6 +62307,11 @@ case $as_dir/ in #(( ======= ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 3 fi @@ -59486,6 +62337,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -59540,6 +62392,10 @@ esac ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main done @@ -59559,6 +62415,7 @@ rm -rf conftest.one conftest.two conftest.dir <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if test "${ac_cv_path_install+set}" = set; then ======= @@ -59692,6 +62549,8 @@ rm -rf conftest.one conftest.two conftest.dir ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if test ${ac_cv_path_install+y}; then ======= @@ -59710,6 +62569,7 @@ rm -rf conftest.one conftest.two conftest.dir <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -59724,6 +62584,8 @@ rm -rf conftest.one conftest.two conftest.dir >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if test "${ac_cv_path_install+set}" = set; then @@ -59734,6 +62596,7 @@ rm -rf conftest.one conftest.two conftest.dir <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -59751,6 +62614,8 @@ rm -rf conftest.one conftest.two conftest.dir ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main INSTALL=$ac_cv_path_install else @@ -59778,6 +62643,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } ======= @@ -59821,6 +62687,8 @@ $as_echo "$INSTALL" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 printf "%s\n" "$INSTALL" >&6; } ======= @@ -59841,6 +62709,7 @@ $as_echo "$INSTALL" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -59870,6 +62739,8 @@ $as_echo "$INSTALL" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -59887,6 +62758,7 @@ $as_echo "$INSTALL" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -59929,6 +62801,8 @@ $as_echo "$INSTALL" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -59960,6 +62834,7 @@ set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -60003,6 +62878,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -60023,6 +62900,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -60052,6 +62930,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -60069,6 +62949,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -60111,6 +62992,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. @@ -60136,6 +63019,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -60176,6 +63060,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -60201,6 +63087,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -60269,6 +63156,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -60292,6 +63183,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -60382,6 +63274,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -60405,6 +63302,7 @@ IFS=$as_save_IFS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD fi LEX=$ac_cv_prog_LEX @@ -60539,6 +63437,8 @@ $as_echo_n "checking whether yytext is a pointer... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi LEX=$ac_cv_prog_LEX @@ -60791,6 +63691,7 @@ $as_echo_n "checking whether yytext is a pointer... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -60820,6 +63721,8 @@ $as_echo_n "checking whether yytext is a pointer... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= fi LEX=$ac_cv_prog_LEX @@ -60928,6 +63831,7 @@ $as_echo_n "checking whether yytext is a pointer... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -60970,6 +63874,8 @@ $as_echo_n "checking whether yytext is a pointer... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # POSIX says lex can declare yytext either as a pointer or an array; the # default is implementation-dependent. Figure out which it is, since @@ -60992,6 +63898,7 @@ ac_cv_prog_lex_yytext_pointer=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" ======= @@ -61036,6 +63943,8 @@ LIBS="$LEXLIB $ac_save_LIBS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61053,6 +63962,7 @@ LIBS="$LEXLIB $ac_save_LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -61082,6 +63992,8 @@ LIBS="$LEXLIB $ac_save_LIBS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -61099,6 +64011,7 @@ LIBS="$LEXLIB $ac_save_LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -61141,6 +64054,8 @@ LIBS="$LEXLIB $ac_save_LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -61164,6 +64079,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -61205,6 +64121,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_lex_yytext_pointer=yes @@ -61233,6 +64151,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -61302,6 +64221,10 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : ac_cv_prog_lex_yytext_pointer=yes fi @@ -61331,6 +64254,7 @@ $as_echo "#define YYTEXT_POINTER 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61422,6 +64346,11 @@ $as_echo "#define YYTEXT_POINTER 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi rm -f conftest.l $LEX_OUTPUT_ROOT.c @@ -61444,6 +64373,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -61485,6 +64415,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$LEX" = "x:"; then as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 elif test "$LEX" = "lex"; then @@ -61507,6 +64439,7 @@ printf %s "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -61576,6 +64509,10 @@ printf %s "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "$LEX" = "lex"; then # Extract the first word of "lex", so it can be a program name with args. set dummy lex; ac_word=$2 @@ -61598,6 +64535,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61689,6 +64627,11 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case $LEXPATH in [\\/]* | ?:[\\/]*) @@ -61716,6 +64659,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -61756,6 +64700,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -61781,6 +64727,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -61849,6 +64796,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -61872,6 +64823,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -61962,6 +64914,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -61990,6 +64947,7 @@ if test -n "$LEXPATH"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEXPATH" >&5 $as_echo "$LEXPATH" >&6; } @@ -62036,6 +64994,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEXPATH" >&5 printf "%s\n" "$LEXPATH" >&6; } @@ -62063,6 +65023,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -62091,6 +65052,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEXPATH" >&5 $as_echo "$LEXPATH" >&6; } @@ -62112,6 +65075,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -62154,6 +65118,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -62174,6 +65140,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 ======= @@ -62216,6 +65183,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 ======= @@ -62235,6 +65204,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -62317,6 +65287,11 @@ fi ======= as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + as_fn_error $? "*** Unable to locate lex." "$LINENO" 5 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi fi @@ -62342,6 +65317,7 @@ set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -62385,6 +65361,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -62405,6 +65383,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -62434,6 +65413,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -62451,6 +65432,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -62493,6 +65475,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -62518,6 +65502,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -62558,6 +65543,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -62583,6 +65570,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -62651,6 +65639,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -62674,6 +65666,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -62764,6 +65757,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -62790,6 +65788,7 @@ if test -n "$YACC"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 $as_echo "$YACC" >&6; } @@ -62836,6 +65835,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 printf "%s\n" "$YACC" >&6; } @@ -62863,6 +65864,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -62891,6 +65893,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 $as_echo "$YACC" >&6; } @@ -62912,6 +65916,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -62954,6 +65959,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -62981,6 +65988,7 @@ set dummy yacc; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -63024,6 +66032,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -63044,6 +66054,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -63073,6 +66084,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -63090,6 +66103,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -63132,6 +66146,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $YACCPATH in [\\/]* | ?:[\\/]*) @@ -63159,6 +66175,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -63199,6 +66216,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -63224,6 +66243,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -63292,6 +66312,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -63315,6 +66339,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -63405,6 +66430,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -63433,6 +66463,7 @@ if test -n "$YACCPATH"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACCPATH" >&5 $as_echo "$YACCPATH" >&6; } @@ -63479,6 +66510,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACCPATH" >&5 printf "%s\n" "$YACCPATH" >&6; } @@ -63506,6 +66539,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -63534,6 +66568,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACCPATH" >&5 $as_echo "$YACCPATH" >&6; } @@ -63555,6 +66591,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -63597,6 +66634,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -63625,6 +66664,7 @@ set dummy ${ac_tool_prefix}ranlib; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -63668,6 +66708,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -63688,6 +66730,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -63717,6 +66760,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -63734,6 +66779,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -63776,6 +66822,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -63801,6 +66849,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -63841,6 +66890,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -63866,6 +66917,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -63934,6 +66986,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -63957,6 +67013,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64047,6 +67104,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -64073,6 +67135,7 @@ if test -n "$RANLIB"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } @@ -64119,6 +67182,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 printf "%s\n" "$RANLIB" >&6; } @@ -64146,6 +67211,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -64174,6 +67240,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } @@ -64195,6 +67263,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -64237,6 +67306,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -64262,6 +67333,7 @@ set dummy ranlib; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -64305,6 +67377,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -64325,6 +67399,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -64354,6 +67429,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -64371,6 +67448,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -64413,6 +67491,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -64438,6 +67518,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -64478,6 +67559,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -64503,6 +67586,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -64571,6 +67655,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -64594,6 +67682,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64684,6 +67773,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -64711,6 +67805,7 @@ if test -n "$ac_ct_RANLIB"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -64751,6 +67846,8 @@ if test -n "$ac_ct_RANLIB"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 printf "%s\n" "$ac_ct_RANLIB" >&6; } @@ -64772,6 +67869,7 @@ printf "%s\n" "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -64840,6 +67938,10 @@ printf "%s\n" "no" >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } @@ -64863,6 +67965,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -64954,6 +68057,11 @@ $as_echo "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi if test "x$ac_ct_RANLIB" = x; then @@ -64978,6 +68086,7 @@ yes:) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ======= @@ -65021,6 +68130,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ======= @@ -65041,6 +68152,7 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -65070,6 +68182,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -65087,6 +68201,7 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -65129,6 +68244,8 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -65158,6 +68275,7 @@ set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -65201,6 +68319,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -65221,6 +68341,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -65250,6 +68371,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -65267,6 +68390,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -65309,6 +68433,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. @@ -65334,6 +68460,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -65374,6 +68501,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -65399,6 +68528,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -65467,6 +68597,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -65490,6 +68624,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -65580,6 +68715,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -65606,6 +68746,7 @@ if test -n "$AR"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } @@ -65652,6 +68793,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 printf "%s\n" "$AR" >&6; } @@ -65679,6 +68822,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -65707,6 +68851,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 $as_echo "$AR" >&6; } @@ -65728,6 +68874,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -65770,6 +68917,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -65797,6 +68946,7 @@ set dummy $ac_prog; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -65840,6 +68990,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -65860,6 +69012,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -65889,6 +69042,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -65906,6 +69061,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -65948,6 +69104,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$ENV"; then ac_cv_prog_ENV="$ENV" # Let the user override the test. @@ -65973,6 +69131,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -66013,6 +69172,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -66038,6 +69199,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -66106,6 +69268,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -66129,6 +69295,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -66219,6 +69386,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -66245,6 +69417,7 @@ if test -n "$ENV"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENV" >&5 $as_echo "$ENV" >&6; } @@ -66291,6 +69464,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ENV" >&5 printf "%s\n" "$ENV" >&6; } @@ -66318,6 +69493,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -66346,6 +69522,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENV" >&5 $as_echo "$ENV" >&6; } @@ -66367,6 +69545,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -66409,6 +69588,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -66434,6 +69615,7 @@ set dummy perl; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } ======= @@ -66477,6 +69659,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -66497,6 +69681,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -66526,6 +69711,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -66543,6 +69730,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -66585,6 +69773,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $PERL in [\\/]* | ?:[\\/]*) @@ -66612,6 +69802,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -66652,6 +69843,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -66677,6 +69870,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -66745,6 +69939,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -66768,6 +69966,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -66858,6 +70057,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -66886,6 +70090,7 @@ if test -n "$PERL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } @@ -66935,6 +70140,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 printf "%s\n" "$PERL" >&6; } @@ -67105,6 +70312,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -67133,6 +70341,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 $as_echo "$PERL" >&6; } @@ -67157,77 +70367,13 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD -======= <<<<<<< HEAD ->>>>>>> main ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD ->>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main >>>>>>> main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= >>>>>>> osgeo-main -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -======= -<<<<<<< HEAD ======= >>>>>>> osgeo-main -<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -67264,6 +70410,76 @@ $as_echo_n "checking how to run the C preprocessor... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +======= +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +>>>>>>> main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 printf %s "checking how to run the C preprocessor... " >&6; } ======= @@ -67284,6 +70500,7 @@ $as_echo_n "checking how to run the C preprocessor... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -67313,6 +70530,8 @@ $as_echo_n "checking how to run the C preprocessor... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -67330,6 +70549,7 @@ $as_echo_n "checking how to run the C preprocessor... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -67372,6 +70592,8 @@ $as_echo_n "checking how to run the C preprocessor... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -67394,6 +70616,7 @@ if test -z "$CPP"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -67437,6 +70660,8 @@ if test -z "$CPP"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Double quotes because $CC needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp @@ -67458,6 +70683,7 @@ if test -z "$CPP"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -67486,6 +70712,8 @@ if test -z "$CPP"; then >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -67504,6 +70732,7 @@ if test -z "$CPP"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -67545,6 +70774,8 @@ if test -z "$CPP"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main do ac_preproc_ok=false @@ -67568,6 +70799,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Prefer to if __STDC__ is defined, since # exists even on freestanding compilers. @@ -67612,6 +70844,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # Prefer to if __STDC__ is defined, since # exists even on freestanding compilers. @@ -67630,6 +70864,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -67658,6 +70893,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # Prefer to if __STDC__ is defined, since # exists even on freestanding compilers. @@ -67676,6 +70913,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -67717,6 +70955,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -67739,6 +70979,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #ifdef __STDC__ # include #else @@ -67795,6 +71036,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include Syntax error _ACEOF @@ -67828,6 +71071,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -67896,6 +71140,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Broken: fails on valid input. continue @@ -67922,6 +71168,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -67961,6 +71208,8 @@ if ac_fn_c_try_cpp "$LINENO"; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_cpp "$LINENO" then : >>>>>>> osgeo-main @@ -68404,6 +71653,37 @@ break _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +======= +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + else # Broken: fails on valid input. continue @@ -68779,6 +72059,7 @@ rm -f conftest.i conftest.err conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if $ac_preproc_ok; then : break fi @@ -69860,6 +73141,8 @@ rm -f conftest.i conftest.err conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if $ac_preproc_ok then : break @@ -70131,6 +73414,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -70186,6 +73470,9 @@ _ACEOF ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main fi done @@ -70207,6 +73494,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD for ac_header in sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -70249,6 +73537,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main for ac_header in limits.h termio.h termios.h unistd.h values.h f2c.h g2c.h do : @@ -70274,6 +73564,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70310,6 +73601,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi done @@ -70329,6 +73622,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70367,6 +73661,8 @@ for ac_header in sys/timeb.h sys/types.h sys/utsname.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main for ac_header in libintl.h iconv.h ======= for ac_header in sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h @@ -70385,6 +73681,7 @@ for ac_header in sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70421,6 +73718,8 @@ for ac_header in sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -70448,6 +73747,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70486,6 +73786,8 @@ for ac_header in libintl.h iconv.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main for ac_header in langinfo.h do : ac_fn_c_check_header_mongrel "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" @@ -70508,6 +73810,7 @@ for ac_header in sys/timeb.h sys/types.h sys/utsname.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70544,6 +73847,8 @@ for ac_header in sys/timeb.h sys/types.h sys/utsname.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -70565,6 +73870,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70617,6 +73923,9 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main _ACEOF fi @@ -70638,6 +73947,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70683,6 +73993,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } @@ -70699,6 +74011,7 @@ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70736,6 +74049,8 @@ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main for ac_header in libintl.h iconv.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -70771,6 +74086,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -70807,6 +74123,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi done @@ -70831,6 +74149,7 @@ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -70887,6 +74206,9 @@ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -70956,6 +74278,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -71046,6 +74369,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_type_uid_t=no fi @@ -71068,6 +74396,7 @@ rm -rf conftest* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 $as_echo "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then @@ -71113,6 +74442,8 @@ if test $ac_cv_type_uid_t = no; then >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 printf "%s\n" "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then @@ -71140,6 +74471,7 @@ if test $ac_cv_type_uid_t = no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -71169,6 +74501,8 @@ if test $ac_cv_type_uid_t = no; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 $as_echo "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then @@ -71188,6 +74522,7 @@ if test $ac_cv_type_uid_t = no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -71230,6 +74565,8 @@ if test $ac_cv_type_uid_t = no; then >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main $as_echo "#define uid_t int" >>confdefs.h @@ -71251,6 +74588,7 @@ $as_echo "#define gid_t int" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -71342,6 +74680,11 @@ $as_echo "#define gid_t int" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -71369,6 +74712,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -71410,6 +74754,8 @@ esac >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "ftime" "ac_cv_func_ftime" if test "x$ac_cv_func_ftime" = xyes then : @@ -71447,6 +74793,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -71516,6 +74863,10 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_func in ftime gethostname gettimeofday lseek nice time uname do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -71541,6 +74892,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -71582,6 +74934,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -71605,6 +74959,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -71686,6 +75041,11 @@ then : ======= ======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi @@ -71719,6 +75079,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -71760,6 +75121,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -71783,6 +75146,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -71864,6 +75228,11 @@ then : ======= ======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi @@ -71897,6 +75266,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -71938,6 +75308,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -71961,6 +75333,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -72042,6 +75415,11 @@ then : ======= ======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi @@ -72075,6 +75453,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -72116,6 +75495,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -72139,6 +75520,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -72220,6 +75602,11 @@ then : ======= ======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi @@ -72273,6 +75660,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -72314,6 +75702,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fi @@ -72387,6 +75777,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -72447,6 +75838,10 @@ fi ======= ======= +>>>>>>> osgeo-main +======= +======= + >>>>>>> osgeo-main fi done @@ -72492,6 +75887,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -72551,6 +75947,9 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi @@ -72577,6 +75976,7 @@ $as_echo "#define SETPGRP_VOID 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -72668,6 +76068,11 @@ $as_echo "#define SETPGRP_VOID 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -72693,6 +76098,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 $as_echo_n "checking for long long int... " >&6; } ======= @@ -72736,6 +76142,8 @@ $as_echo_n "checking for long long int... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 printf %s "checking for long long int... " >&6; } ======= @@ -72756,6 +76164,7 @@ $as_echo_n "checking for long long int... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -72785,6 +76194,8 @@ $as_echo_n "checking for long long int... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 $as_echo_n "checking for long long int... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -72802,6 +76213,7 @@ $as_echo_n "checking for long long int... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -72844,6 +76256,8 @@ $as_echo_n "checking for long long int... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -72865,6 +76279,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -72907,6 +76322,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -72925,6 +76342,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -73008,6 +76426,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { long long int x; ; @@ -73031,6 +76454,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -73072,6 +76496,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -73106,6 +76532,7 @@ printf %s "checking for int64_t... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -73175,6 +76602,10 @@ printf %s "checking for int64_t... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -73210,6 +76641,7 @@ $as_echo_n "checking for int64_t... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -73301,6 +76733,11 @@ $as_echo_n "checking for int64_t... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -73322,6 +76759,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -73364,6 +76802,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -73382,6 +76822,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -73465,6 +76906,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { int64_t x; ; @@ -73488,6 +76934,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -73529,6 +76976,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -73566,6 +77015,7 @@ printf "%s\n" "\"$enable_w11\"" >&6; } ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -73635,6 +77085,10 @@ printf "%s\n" "\"$enable_w11\"" >&6; } ;; ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -73673,6 +77127,7 @@ $as_echo "\"$enable_w11\"" >&6; } ;; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -73763,6 +77218,11 @@ $as_echo "\"$enable_w11\"" >&6; } ;; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main *) as_fn_error $? "*** You must answer yes or no." "$LINENO" 5 ;; esac @@ -73800,6 +77260,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } @@ -73847,6 +77308,8 @@ if test "${with_x+set}" = set; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 printf %s "checking for X... " >&6; } @@ -73877,6 +77340,7 @@ if test "${with_x+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -73905,6 +77369,8 @@ if test "${with_x+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } @@ -73927,6 +77393,7 @@ if test "${with_x+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -73968,6 +77435,8 @@ if test "${with_x+set}" = set; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main withval=$with_x; fi @@ -73998,6 +77467,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_x_includes=no ac_x_libraries=no rm -f -r conftest.dir ======= @@ -74041,6 +77511,8 @@ rm -f -r conftest.dir >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_x_includes=no ac_x_libraries=no # Do we need to do anything special at all? @@ -74089,6 +77561,7 @@ rm -f -r conftest.dir <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -74118,6 +77591,8 @@ rm -f -r conftest.dir ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_x_includes=no ac_x_libraries=no rm -f -r conftest.dir >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -74135,6 +77610,7 @@ rm -f -r conftest.dir <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -74177,6 +77653,8 @@ rm -f -r conftest.dir >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if mkdir conftest.dir; then cd conftest.dir cat >Imakefile <<'_ACEOF' @@ -74232,6 +77710,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Standard set of common directories for X headers. ======= <<<<<<< HEAD @@ -74273,6 +77752,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Standard set of common directories for X headers. ======= @@ -74292,6 +77773,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # Standard set of common directories for X headers. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -74375,6 +77857,11 @@ fi # Standard set of common directories for X headers. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +# Standard set of common directories for X headers. +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include @@ -74418,6 +77905,7 @@ ac_x_header_dirs=' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -74459,6 +77947,8 @@ ac_x_header_dirs=' >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /opt/X11/include ======= @@ -74477,6 +77967,7 @@ ac_x_header_dirs=' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -74546,6 +78037,10 @@ ac_x_header_dirs=' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /usr/X386/include /usr/x386/include /usr/XFree86/include/X11 @@ -74584,6 +78079,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -74625,6 +78121,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_cpp "$LINENO" then : # We can compile using X headers with no special include directory. @@ -74645,6 +78143,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -74714,6 +78213,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_cpp "$LINENO"; then : # We can compile using X headers with no special include directory. ac_x_includes= @@ -74735,6 +78238,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -74825,6 +78329,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then @@ -74863,6 +78372,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -74905,6 +78415,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -74923,6 +78435,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -75006,6 +78519,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { XrmInitialize () ; @@ -75029,6 +78547,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -75070,6 +78589,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : LIBS=$ac_save_LIBS @@ -75093,6 +78614,7 @@ for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -75162,6 +78684,10 @@ for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -75186,6 +78712,7 @@ for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -75277,6 +78804,11 @@ for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib la dll; do @@ -75304,6 +78836,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no @@ -75349,6 +78882,8 @@ fi # $ac_x_libraries = no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no @@ -75383,6 +78918,7 @@ fi # $ac_x_libraries = no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -75412,6 +78948,8 @@ fi # $ac_x_libraries = no ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no @@ -75431,6 +78969,7 @@ fi # $ac_x_libraries = no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -75473,6 +79012,8 @@ fi # $ac_x_libraries = no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $ac_x_includes,$ac_x_libraries in #( no,* | *,no | *\'*) # Didn't find X, or a directory has "'" in its name. @@ -75499,6 +79040,7 @@ case $ac_x_includes,$ac_x_libraries in #( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -75590,6 +79132,11 @@ case $ac_x_includes,$ac_x_libraries in #( ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main esac ;; #( *) have_x=yes;; @@ -75614,6 +79161,7 @@ if test "$have_x" != yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 $as_echo "$have_x" >&6; } @@ -75657,6 +79205,8 @@ $as_echo "$have_x" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 printf "%s\n" "$have_x" >&6; } @@ -75678,6 +79228,7 @@ $as_echo "$have_x" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -75706,6 +79257,8 @@ $as_echo "$have_x" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 $as_echo "$have_x" >&6; } @@ -75724,6 +79277,7 @@ $as_echo "$have_x" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -75765,6 +79319,8 @@ $as_echo "$have_x" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main no_x=yes else @@ -75791,6 +79347,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 $as_echo "libraries $x_libraries, headers $x_includes" >&6; } @@ -75834,6 +79391,8 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } @@ -75855,6 +79414,7 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -75883,6 +79443,8 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 $as_echo "libraries $x_libraries, headers $x_includes" >&6; } @@ -75901,6 +79463,7 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -75943,6 +79506,8 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi if test "$no_x" = yes; then @@ -75965,6 +79530,7 @@ if test "$no_x" = yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h ======= <<<<<<< HEAD @@ -76007,6 +79573,8 @@ $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h ======= $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h @@ -76025,6 +79593,7 @@ $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -76107,6 +79676,11 @@ $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h ======= $as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= @@ -76136,6 +79710,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 $as_echo_n "checking whether -R must be followed by a space... " >&6; } @@ -76179,6 +79754,8 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 printf %s "checking whether -R must be followed by a space... " >&6; } @@ -76200,6 +79777,7 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -76228,6 +79806,8 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 $as_echo_n "checking whether -R must be followed by a space... " >&6; } @@ -76246,6 +79826,7 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -76287,6 +79868,8 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag @@ -76312,6 +79895,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -76354,6 +79938,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -76372,6 +79958,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -76455,6 +80042,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { ; @@ -76478,6 +80070,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -76519,6 +80112,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -76540,6 +80135,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -76609,6 +80205,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -76631,6 +80231,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -76721,6 +80322,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -76744,6 +80350,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -76786,6 +80393,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -76804,6 +80413,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -76887,6 +80497,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { ; @@ -76910,6 +80525,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -76955,6 +80571,8 @@ $as_echo "yes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -76987,6 +80605,7 @@ $as_echo "yes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -77016,6 +80635,8 @@ $as_echo "yes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -77035,6 +80656,7 @@ $as_echo "yes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -77077,6 +80699,8 @@ $as_echo "yes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 $as_echo "neither works" >&6; } @@ -77102,6 +80726,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -77192,6 +80817,11 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag @@ -77232,6 +80862,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -77273,6 +80904,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char XOpenDisplay (); int main (void) @@ -77291,6 +80924,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -77360,6 +80994,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -77383,6 +81021,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -77474,6 +81113,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return XOpenDisplay (); ; @@ -77497,6 +81141,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -77538,6 +81183,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -77559,6 +81206,7 @@ printf %s "checking for dnet_ntoa in -ldnet... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -77628,6 +81276,10 @@ printf %s "checking for dnet_ntoa in -ldnet... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : else @@ -77650,6 +81302,7 @@ $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -77741,6 +81394,11 @@ $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" @@ -77767,6 +81425,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -77808,6 +81467,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char dnet_ntoa (); int main (void) @@ -77826,6 +81487,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -77895,6 +81557,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -77918,6 +81584,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -78009,6 +81676,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return dnet_ntoa (); ; @@ -78032,6 +81704,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_dnet_ntoa=yes else @@ -78078,6 +81751,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dnet_dnet_ntoa=yes @@ -78111,6 +81786,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -78140,6 +81816,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_dnet_ntoa=yes else @@ -78160,6 +81838,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -78202,6 +81881,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -78225,6 +81906,7 @@ if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -78315,6 +81997,11 @@ if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi @@ -78336,6 +82023,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } @@ -78379,6 +82067,8 @@ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } @@ -78400,6 +82090,7 @@ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -78428,6 +82119,8 @@ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } @@ -78446,6 +82139,7 @@ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -78488,6 +82182,8 @@ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" @@ -78514,6 +82210,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -78555,6 +82252,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char dnet_ntoa (); int main (void) @@ -78573,6 +82272,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -78642,6 +82342,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -78665,6 +82369,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -78756,6 +82461,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return dnet_ntoa (); ; @@ -78779,6 +82489,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -78825,6 +82536,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dnet_stub_dnet_ntoa=yes @@ -78858,6 +82571,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -78887,6 +82601,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -78907,6 +82623,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -78949,6 +82666,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -78972,6 +82691,7 @@ if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -79062,6 +82782,11 @@ if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi @@ -79085,6 +82810,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ ======= <<<<<<< HEAD @@ -79127,6 +82853,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= rm -f core conftest.err conftest.$ac_objext \ @@ -79145,6 +82873,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -79227,6 +82956,11 @@ rm -f core conftest.err conftest.$ac_objext \ ======= rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +rm -f core conftest.err conftest.$ac_objext \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -79257,6 +82991,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_gethostbyname" = xyes; then : ======= <<<<<<< HEAD @@ -79299,6 +83034,8 @@ if test "x$ac_cv_func_gethostbyname" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_gethostbyname" = xyes then : ======= @@ -79318,6 +83055,7 @@ if test "x$ac_cv_func_gethostbyname" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "x$ac_cv_func_gethostbyname" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -79401,6 +83139,11 @@ if test "x$ac_cv_func_gethostbyname" = xyes; then : if test "x$ac_cv_func_gethostbyname" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +if test "x$ac_cv_func_gethostbyname" = xyes; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -79421,6 +83164,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } @@ -79464,6 +83208,8 @@ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 printf %s "checking for gethostbyname in -lnsl... " >&6; } @@ -79485,6 +83231,7 @@ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -79513,6 +83260,8 @@ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } @@ -79531,6 +83280,7 @@ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -79573,6 +83323,8 @@ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" @@ -79599,6 +83351,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -79640,6 +83393,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char gethostbyname (); int main (void) @@ -79658,6 +83413,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -79727,6 +83483,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -79750,6 +83510,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -79841,6 +83602,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return gethostbyname (); ; @@ -79864,6 +83630,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_gethostbyname=yes else @@ -79910,6 +83677,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_nsl_gethostbyname=yes @@ -79943,6 +83712,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -79972,6 +83742,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_gethostbyname=yes else @@ -79992,6 +83764,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -80034,6 +83807,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -80057,6 +83832,7 @@ if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -80147,6 +83923,11 @@ if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi @@ -80168,6 +83949,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } @@ -80211,6 +83993,8 @@ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 printf %s "checking for gethostbyname in -lbsd... " >&6; } @@ -80232,6 +84016,7 @@ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -80260,6 +84045,8 @@ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } @@ -80278,6 +84065,7 @@ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -80320,6 +84108,8 @@ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" @@ -80346,6 +84136,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -80387,6 +84178,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char gethostbyname (); int main (void) @@ -80405,6 +84198,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -80474,6 +84268,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -80497,6 +84295,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -80588,6 +84387,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return gethostbyname (); ; @@ -80611,6 +84415,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -80652,6 +84457,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bsd_gethostbyname=yes @@ -80680,6 +84487,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -80749,6 +84557,10 @@ then : ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bsd_gethostbyname=yes else @@ -80777,6 +84589,7 @@ if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -80867,6 +84680,11 @@ if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -80899,6 +84717,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_connect" = xyes; then : ======= <<<<<<< HEAD @@ -80941,6 +84760,8 @@ if test "x$ac_cv_func_connect" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_connect" = xyes then : ======= @@ -80960,6 +84781,7 @@ if test "x$ac_cv_func_connect" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "x$ac_cv_func_connect" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -81043,6 +84865,11 @@ if test "x$ac_cv_func_connect" = xyes; then : if test "x$ac_cv_func_connect" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +if test "x$ac_cv_func_connect" = xyes; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -81063,6 +84890,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 $as_echo_n "checking for connect in -lsocket... " >&6; } @@ -81106,6 +84934,8 @@ $as_echo_n "checking for connect in -lsocket... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 printf %s "checking for connect in -lsocket... " >&6; } @@ -81127,6 +84957,7 @@ $as_echo_n "checking for connect in -lsocket... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -81155,6 +84986,8 @@ $as_echo_n "checking for connect in -lsocket... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 $as_echo_n "checking for connect in -lsocket... " >&6; } @@ -81173,6 +85006,7 @@ $as_echo_n "checking for connect in -lsocket... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -81215,6 +85049,8 @@ $as_echo_n "checking for connect in -lsocket... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" @@ -81241,6 +85077,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -81282,6 +85119,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char connect (); int main (void) @@ -81300,6 +85139,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -81369,6 +85209,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -81392,6 +85236,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -81483,6 +85328,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return connect (); ; @@ -81506,6 +85356,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_connect=yes else @@ -81552,6 +85403,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_socket_connect=yes @@ -81585,6 +85438,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -81614,6 +85468,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_connect=yes else @@ -81634,6 +85490,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -81676,6 +85533,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -81699,6 +85558,7 @@ if test "x$ac_cv_lib_socket_connect" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -81789,6 +85649,11 @@ if test "x$ac_cv_lib_socket_connect" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -81814,6 +85679,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_remove" = xyes; then : ======= <<<<<<< HEAD @@ -81856,6 +85722,8 @@ if test "x$ac_cv_func_remove" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_remove" = xyes then : ======= @@ -81875,6 +85743,7 @@ if test "x$ac_cv_func_remove" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "x$ac_cv_func_remove" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -81958,6 +85827,11 @@ if test "x$ac_cv_func_remove" = xyes; then : if test "x$ac_cv_func_remove" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +if test "x$ac_cv_func_remove" = xyes; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -81978,6 +85852,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 $as_echo_n "checking for remove in -lposix... " >&6; } @@ -82021,6 +85896,8 @@ $as_echo_n "checking for remove in -lposix... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 printf %s "checking for remove in -lposix... " >&6; } @@ -82042,6 +85919,7 @@ $as_echo_n "checking for remove in -lposix... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -82070,6 +85948,8 @@ $as_echo_n "checking for remove in -lposix... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 $as_echo_n "checking for remove in -lposix... " >&6; } @@ -82088,6 +85968,7 @@ $as_echo_n "checking for remove in -lposix... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -82130,6 +86011,8 @@ $as_echo_n "checking for remove in -lposix... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" @@ -82156,6 +86039,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -82197,6 +86081,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char remove (); int main (void) @@ -82215,6 +86101,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -82284,6 +86171,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -82307,6 +86198,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -82398,6 +86290,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return remove (); ; @@ -82421,6 +86318,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix_remove=yes else @@ -82467,6 +86365,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_posix_remove=yes @@ -82500,6 +86400,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -82529,6 +86430,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix_remove=yes else @@ -82549,6 +86452,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -82591,6 +86495,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -82614,6 +86520,7 @@ if test "x$ac_cv_lib_posix_remove" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -82704,6 +86611,11 @@ if test "x$ac_cv_lib_posix_remove" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -82729,6 +86641,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_shmat" = xyes; then : ======= <<<<<<< HEAD @@ -82771,6 +86684,8 @@ if test "x$ac_cv_func_shmat" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_shmat" = xyes then : ======= @@ -82790,6 +86705,7 @@ if test "x$ac_cv_func_shmat" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "x$ac_cv_func_shmat" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -82873,6 +86789,11 @@ if test "x$ac_cv_func_shmat" = xyes; then : if test "x$ac_cv_func_shmat" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +if test "x$ac_cv_func_shmat" = xyes; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -82893,6 +86814,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 $as_echo_n "checking for shmat in -lipc... " >&6; } @@ -82936,6 +86858,8 @@ $as_echo_n "checking for shmat in -lipc... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 printf %s "checking for shmat in -lipc... " >&6; } @@ -82957,6 +86881,7 @@ $as_echo_n "checking for shmat in -lipc... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -82985,6 +86910,8 @@ $as_echo_n "checking for shmat in -lipc... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 $as_echo_n "checking for shmat in -lipc... " >&6; } @@ -83003,6 +86930,7 @@ $as_echo_n "checking for shmat in -lipc... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -83045,6 +86973,8 @@ $as_echo_n "checking for shmat in -lipc... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" @@ -83071,6 +87001,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -83112,6 +87043,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char shmat (); int main (void) @@ -83130,6 +87063,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -83199,6 +87133,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -83222,6 +87160,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -83313,6 +87252,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return shmat (); ; @@ -83336,6 +87280,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ipc_shmat=yes else @@ -83382,6 +87327,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ipc_shmat=yes @@ -83415,6 +87362,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -83444,6 +87392,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ipc_shmat=yes else @@ -83464,6 +87414,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -83506,6 +87457,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -83529,6 +87482,7 @@ if test "x$ac_cv_lib_ipc_shmat" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -83619,6 +87573,11 @@ if test "x$ac_cv_lib_ipc_shmat" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -83651,6 +87610,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } @@ -83694,6 +87654,8 @@ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 printf %s "checking for IceConnectionNumber in -lICE... " >&6; } @@ -83715,6 +87677,7 @@ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -83743,6 +87706,8 @@ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } @@ -83761,6 +87726,7 @@ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -83803,6 +87769,8 @@ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" @@ -83829,6 +87797,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -83870,6 +87839,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char IceConnectionNumber (); int main (void) @@ -83888,6 +87859,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -83957,6 +87929,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -83980,6 +87956,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -84071,6 +88048,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return IceConnectionNumber (); ; @@ -84094,6 +88076,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -84140,6 +88123,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ICE_IceConnectionNumber=yes @@ -84173,6 +88158,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -84202,6 +88188,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -84222,6 +88210,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -84264,6 +88253,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -84287,6 +88278,7 @@ if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -84377,6 +88369,11 @@ if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -84417,6 +88414,7 @@ LIBS="" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cuserid" >&5 $as_echo_n "checking for library containing cuserid... " >&6; } ======= @@ -84460,6 +88458,8 @@ $as_echo_n "checking for library containing cuserid... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing cuserid" >&5 printf %s "checking for library containing cuserid... " >&6; } ======= @@ -84480,6 +88480,7 @@ $as_echo_n "checking for library containing cuserid... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -84509,6 +88510,8 @@ $as_echo_n "checking for library containing cuserid... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cuserid" >&5 $as_echo_n "checking for library containing cuserid... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -84526,6 +88529,7 @@ $as_echo_n "checking for library containing cuserid... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -84568,6 +88572,8 @@ $as_echo_n "checking for library containing cuserid... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -84593,6 +88599,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -84634,6 +88641,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char cuserid (); int main (void) @@ -84652,6 +88661,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -84721,6 +88731,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -84744,6 +88758,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -84835,6 +88850,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return cuserid (); ; @@ -84858,6 +88878,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD for ac_lib in '' compat; do ======= <<<<<<< HEAD @@ -84900,6 +88921,8 @@ for ac_lib in '' compat; do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main for ac_lib in '' compat do ======= @@ -84919,6 +88942,7 @@ for ac_lib in '' compat; do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= for ac_lib in '' compat; do >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -85001,6 +89025,11 @@ for ac_lib in '' compat; do ======= for ac_lib in '' compat; do >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +for ac_lib in '' compat; do +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if test -z "$ac_lib"; then ac_res="none required" @@ -85024,6 +89053,7 @@ for ac_lib in '' compat; do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_cuserid=$ac_res @@ -85081,6 +89111,8 @@ LIBS=$ac_func_search_save_LIBS ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -85136,6 +89168,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -85164,6 +89197,8 @@ then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_cuserid=$ac_res @@ -85196,6 +89231,7 @@ LIBS=$ac_func_search_save_LIBS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -85238,6 +89274,8 @@ LIBS=$ac_func_search_save_LIBS >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cuserid" >&5 $as_echo "$ac_cv_search_cuserid" >&6; } ac_res=$ac_cv_search_cuserid @@ -85259,6 +89297,7 @@ if test "$ac_res" != no; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -85349,6 +89388,11 @@ if test "$ac_res" != no; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" @@ -85375,6 +89419,7 @@ LIBS="$ac_save_libs" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD for ac_func in asprintf do : ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" @@ -85424,6 +89469,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" if test "x$ac_cv_func_asprintf" = xyes then : @@ -85444,6 +89491,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -85546,6 +89594,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for ac_func in asprintf @@ -85602,6 +89652,7 @@ ac_fn_c_check_func "$LINENO" "atan" "ac_cv_func_atan" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -85643,6 +89694,8 @@ ac_fn_c_check_func "$LINENO" "atan" "ac_cv_func_atan" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_atan" = xyes then : MATHLIB= @@ -85665,6 +89718,7 @@ printf %s "checking for atan in -lm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -85734,6 +89788,10 @@ printf %s "checking for atan in -lm... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "x$ac_cv_func_atan" = xyes; then : MATHLIB= else @@ -85757,6 +89815,7 @@ $as_echo_n "checking for atan in -lm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -85848,6 +89907,11 @@ $as_echo_n "checking for atan in -lm... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" @@ -85874,6 +89938,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -85915,6 +89980,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char atan (); int main (void) @@ -85933,6 +90000,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -86002,6 +90070,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -86025,6 +90097,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -86116,6 +90189,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return atan (); ; @@ -86139,6 +90217,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_atan=yes else @@ -86185,6 +90264,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_m_atan=yes @@ -86220,6 +90301,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -86249,6 +90331,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_m_atan=yes else @@ -86269,6 +90353,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -86311,6 +90396,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -86336,6 +90423,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -86426,6 +90514,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Failed check for math library." "$LINENO" 5 @@ -86454,6 +90547,7 @@ ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -86495,6 +90589,8 @@ ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_dlsym" = xyes then : DLLIB= @@ -86517,6 +90613,7 @@ printf %s "checking for dlsym in -ldl... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -86586,6 +90683,10 @@ printf %s "checking for dlsym in -ldl... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "x$ac_cv_func_dlsym" = xyes; then : DLLIB= else @@ -86609,6 +90710,7 @@ $as_echo_n "checking for dlsym in -ldl... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -86700,6 +90802,11 @@ $as_echo_n "checking for dlsym in -ldl... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" @@ -86726,6 +90833,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -86767,6 +90875,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char dlsym (); int main (void) @@ -86785,6 +90895,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -86854,6 +90965,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -86877,6 +90992,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -86968,6 +91084,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return dlsym (); ; @@ -86991,6 +91112,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlsym=yes else @@ -87037,6 +91159,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_dl_dlsym=yes @@ -87072,6 +91196,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -87101,6 +91226,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlsym=yes else @@ -87121,6 +91248,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -87163,6 +91291,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -87188,6 +91318,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -87278,6 +91409,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main DLLIB= @@ -87306,6 +91442,7 @@ ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -87347,6 +91484,8 @@ ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_iconv" = xyes then : ICONVLIB= @@ -87369,6 +91508,7 @@ printf %s "checking for iconv in -liconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -87438,6 +91578,10 @@ printf %s "checking for iconv in -liconv... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "x$ac_cv_func_iconv" = xyes; then : ICONVLIB= else @@ -87461,6 +91605,7 @@ $as_echo_n "checking for iconv in -liconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -87552,6 +91697,11 @@ $as_echo_n "checking for iconv in -liconv... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-liconv $LIBS" @@ -87578,6 +91728,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -87619,6 +91770,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char iconv (); int main (void) @@ -87637,6 +91790,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -87706,6 +91860,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -87729,6 +91887,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -87820,6 +91979,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return iconv (); ; @@ -87843,6 +92007,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_iconv_iconv=yes else @@ -87889,6 +92054,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iconv_iconv=yes @@ -87927,6 +92094,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -87956,6 +92124,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_iconv_iconv=yes else @@ -87976,6 +92146,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -88018,6 +92189,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -88046,6 +92219,7 @@ $as_echo_n "checking for iconv in -lgiconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -88137,6 +92311,11 @@ $as_echo_n "checking for iconv in -lgiconv... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lgiconv $LIBS" @@ -88163,6 +92342,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -88204,6 +92384,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char iconv (); int main (void) @@ -88222,6 +92404,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -88291,6 +92474,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -88314,6 +92501,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -88405,6 +92593,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return iconv (); ; @@ -88428,6 +92621,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_giconv_iconv=yes else @@ -88474,6 +92668,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_giconv_iconv=yes @@ -88518,6 +92714,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -88547,6 +92744,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_giconv_iconv=yes else @@ -88567,6 +92766,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -88609,6 +92809,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -88642,6 +92844,7 @@ $as_echo_n "checking for libiconv in -liconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -88733,6 +92936,11 @@ $as_echo_n "checking for libiconv in -liconv... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-liconv $LIBS" @@ -88759,6 +92967,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -88800,6 +93009,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char libiconv (); int main (void) @@ -88818,6 +93029,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -88887,6 +93099,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -88910,6 +93126,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -89001,6 +93218,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return libiconv (); ; @@ -89024,6 +93246,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_iconv_libiconv=yes else @@ -89070,6 +93293,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iconv_libiconv=yes @@ -89108,6 +93333,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -89137,6 +93363,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_iconv_libiconv=yes else @@ -89157,6 +93385,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -89199,6 +93428,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -89227,6 +93458,7 @@ $as_echo_n "checking for libiconv in -lgiconv... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -89318,6 +93550,11 @@ $as_echo_n "checking for libiconv in -lgiconv... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lgiconv $LIBS" @@ -89344,6 +93581,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -89385,6 +93623,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char libiconv (); int main (void) @@ -89403,6 +93643,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -89472,6 +93713,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -89495,6 +93740,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -89586,6 +93832,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return libiconv (); ; @@ -89609,6 +93860,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_giconv_libiconv=yes else @@ -89655,6 +93907,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_giconv_libiconv=yes @@ -89693,6 +93947,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -89722,6 +93977,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_giconv_libiconv=yes else @@ -89742,6 +93999,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -89784,6 +94042,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -89812,6 +94072,7 @@ $as_echo "$as_me: WARNING: *** Unable to locate iconv() function." >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -89902,6 +94163,11 @@ $as_echo "$as_me: WARNING: *** Unable to locate iconv() function." >&2;} >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ICONVLIB= @@ -89938,6 +94204,7 @@ ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -89979,6 +94246,8 @@ ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_socket" = xyes then : SOCKLIB= @@ -90001,6 +94270,7 @@ printf %s "checking for socket in -lsocket... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -90070,6 +94340,10 @@ printf %s "checking for socket in -lsocket... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "x$ac_cv_func_socket" = xyes; then : SOCKLIB= else @@ -90093,6 +94367,7 @@ $as_echo_n "checking for socket in -lsocket... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -90184,6 +94459,11 @@ $as_echo_n "checking for socket in -lsocket... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" @@ -90210,6 +94490,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -90251,6 +94532,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char socket (); int main (void) @@ -90269,6 +94552,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -90338,6 +94622,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -90361,6 +94649,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -90452,6 +94741,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return socket (); ; @@ -90475,6 +94769,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_socket=yes else @@ -90533,6 +94828,8 @@ $as_echo "$as_me: WARNING: *** Unable to locate socket() function." >&2;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_socket_socket=yes @@ -90585,6 +94882,7 @@ $as_echo "$as_me: WARNING: *** Unable to locate socket() function." >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -90614,6 +94912,8 @@ $as_echo "$as_me: WARNING: *** Unable to locate socket() function." >&2;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_socket=yes else @@ -90646,6 +94946,7 @@ $as_echo "$as_me: WARNING: *** Unable to locate socket() function." >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -90688,6 +94989,8 @@ $as_echo "$as_me: WARNING: *** Unable to locate socket() function." >&2;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -90714,6 +95017,7 @@ if test "$have_socket" = 1 ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_SOCKET 1" >>confdefs.h ======= <<<<<<< HEAD @@ -90756,6 +95060,8 @@ $as_echo "#define HAVE_SOCKET 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h ======= $as_echo "#define HAVE_SOCKET 1" >>confdefs.h @@ -90774,6 +95080,7 @@ $as_echo "#define HAVE_SOCKET 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_SOCKET 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -90857,6 +95164,11 @@ $as_echo "#define HAVE_SOCKET 1" >>confdefs.h $as_echo "#define HAVE_SOCKET 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_SOCKET 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main else HAVE_SOCKET= @@ -90890,6 +95202,7 @@ ZLIB= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zlib includes" >&5 $as_echo_n "checking for location of zlib includes... " >&6; } ======= @@ -90933,6 +95246,8 @@ $as_echo_n "checking for location of zlib includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of zlib includes" >&5 printf %s "checking for location of zlib includes... " >&6; } ======= @@ -90953,6 +95268,7 @@ $as_echo_n "checking for location of zlib includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -90982,6 +95298,8 @@ $as_echo_n "checking for location of zlib includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zlib includes" >&5 $as_echo_n "checking for location of zlib includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -90999,6 +95317,7 @@ $as_echo_n "checking for location of zlib includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -91041,6 +95360,8 @@ $as_echo_n "checking for location of zlib includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_zlib_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-zlib-includes." "$LINENO" 5 @@ -91063,6 +95384,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib_includes" >&5 $as_echo "$with_zlib_includes" >&6; } ======= @@ -91106,6 +95428,8 @@ $as_echo "$with_zlib_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_zlib_includes" >&5 printf "%s\n" "$with_zlib_includes" >&6; } ======= @@ -91126,6 +95450,7 @@ $as_echo "$with_zlib_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -91155,6 +95480,8 @@ $as_echo "$with_zlib_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib_includes" >&5 $as_echo "$with_zlib_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -91172,6 +95499,7 @@ $as_echo "$with_zlib_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -91214,6 +95542,8 @@ $as_echo "$with_zlib_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_zlib_includes" ; then for dir in $with_zlib_includes; do @@ -91246,6 +95576,7 @@ CPPFLAGS="$ZLIBINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -91286,6 +95617,8 @@ CPPFLAGS="$ZLIBINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in zlib.h do : @@ -91310,6 +95643,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -91379,6 +95713,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in zlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" @@ -91405,6 +95743,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -91495,6 +95834,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate zlib includes." "$LINENO" 5 @@ -91525,6 +95869,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zlib library" >&5 $as_echo_n "checking for location of zlib library... " >&6; } ======= @@ -91568,6 +95913,8 @@ $as_echo_n "checking for location of zlib library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of zlib library" >&5 printf %s "checking for location of zlib library... " >&6; } ======= @@ -91588,6 +95935,7 @@ $as_echo_n "checking for location of zlib library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -91617,6 +95965,8 @@ $as_echo_n "checking for location of zlib library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zlib library" >&5 $as_echo_n "checking for location of zlib library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -91634,6 +95984,7 @@ $as_echo_n "checking for location of zlib library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -91676,6 +96027,8 @@ $as_echo_n "checking for location of zlib library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_zlib_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-zlib-libs." "$LINENO" 5 @@ -91698,6 +96051,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib_libs" >&5 $as_echo "$with_zlib_libs" >&6; } ======= @@ -91741,6 +96095,8 @@ $as_echo "$with_zlib_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_zlib_libs" >&5 printf "%s\n" "$with_zlib_libs" >&6; } ======= @@ -91761,6 +96117,7 @@ $as_echo "$with_zlib_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -91790,6 +96147,8 @@ $as_echo "$with_zlib_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib_libs" >&5 $as_echo "$with_zlib_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -91807,6 +96166,7 @@ $as_echo "$with_zlib_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -91849,6 +96209,8 @@ $as_echo "$with_zlib_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_zlib_libs"; then for dir in $with_zlib_libs; do @@ -91883,6 +96245,7 @@ LDFLAGS="$ZLIBLIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 $as_echo_n "checking for deflate in -lz... " >&6; } ======= @@ -91926,6 +96289,8 @@ $as_echo_n "checking for deflate in -lz... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 printf %s "checking for deflate in -lz... " >&6; } ======= @@ -91946,6 +96311,7 @@ $as_echo_n "checking for deflate in -lz... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -91975,6 +96341,8 @@ $as_echo_n "checking for deflate in -lz... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 $as_echo_n "checking for deflate in -lz... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -91992,6 +96360,7 @@ $as_echo_n "checking for deflate in -lz... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -92034,6 +96403,8 @@ $as_echo_n "checking for deflate in -lz... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" @@ -92060,6 +96431,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -92101,6 +96473,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char deflate (); int main (void) @@ -92119,6 +96493,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -92188,6 +96563,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -92211,6 +96590,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92302,6 +96682,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return deflate (); ; @@ -92325,6 +96710,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_z_deflate=yes else @@ -92371,6 +96757,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_z_deflate=yes @@ -92406,6 +96794,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -92435,6 +96824,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_z_deflate=yes else @@ -92455,6 +96846,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -92497,6 +96889,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -92522,6 +96916,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92613,6 +97008,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -92658,6 +97058,7 @@ BZIP2LIB= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -92699,6 +97100,8 @@ BZIP2LIB= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use bzlib" >&5 printf %s "checking whether to use bzlib... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_bzlib\"" >&5 @@ -92718,6 +97121,7 @@ printf "%s\n" "\"$with_bzlib\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -92787,6 +97191,10 @@ printf "%s\n" "\"$with_bzlib\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use bzlib" >&5 $as_echo_n "checking whether to use bzlib... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_bzlib\"" >&5 @@ -92808,6 +97216,7 @@ $as_echo "\"$with_bzlib\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -92899,6 +97308,11 @@ $as_echo "\"$with_bzlib\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_bzlib" in "no") USE_BZIP2= ;; "yes") USE_BZIP2="1" ;; @@ -92929,6 +97343,7 @@ if test -n "$USE_BZIP2"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of bzlib includes" >&5 $as_echo_n "checking for location of bzlib includes... " >&6; } ======= @@ -92972,6 +97387,8 @@ $as_echo_n "checking for location of bzlib includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of bzlib includes" >&5 printf %s "checking for location of bzlib includes... " >&6; } ======= @@ -92992,6 +97409,7 @@ $as_echo_n "checking for location of bzlib includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -93021,6 +97439,8 @@ $as_echo_n "checking for location of bzlib includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of bzlib includes" >&5 $as_echo_n "checking for location of bzlib includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -93038,6 +97458,7 @@ $as_echo_n "checking for location of bzlib includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -93080,6 +97501,8 @@ $as_echo_n "checking for location of bzlib includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_bzlib_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-bzlib-includes." "$LINENO" 5 @@ -93102,6 +97525,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_includes" >&5 $as_echo "$with_bzlib_includes" >&6; } ======= @@ -93145,6 +97569,8 @@ $as_echo "$with_bzlib_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_includes" >&5 printf "%s\n" "$with_bzlib_includes" >&6; } ======= @@ -93165,6 +97591,7 @@ $as_echo "$with_bzlib_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -93194,6 +97621,8 @@ $as_echo "$with_bzlib_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_includes" >&5 $as_echo "$with_bzlib_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -93211,6 +97640,7 @@ $as_echo "$with_bzlib_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -93253,6 +97683,8 @@ $as_echo "$with_bzlib_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_bzlib_includes" ; then for dir in $with_bzlib_includes; do @@ -93285,6 +97717,7 @@ CPPFLAGS="$BZIP2INCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -93325,6 +97758,8 @@ CPPFLAGS="$BZIP2INCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in bzlib.h do : @@ -93349,6 +97784,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -93418,6 +97854,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in bzlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" @@ -93444,6 +97884,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -93534,6 +97975,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate bzlib includes." "$LINENO" 5 @@ -93564,6 +98010,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of bzlib library" >&5 $as_echo_n "checking for location of bzlib library... " >&6; } ======= @@ -93607,6 +98054,8 @@ $as_echo_n "checking for location of bzlib library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of bzlib library" >&5 printf %s "checking for location of bzlib library... " >&6; } ======= @@ -93627,6 +98076,7 @@ $as_echo_n "checking for location of bzlib library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -93656,6 +98106,8 @@ $as_echo_n "checking for location of bzlib library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of bzlib library" >&5 $as_echo_n "checking for location of bzlib library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -93673,6 +98125,7 @@ $as_echo_n "checking for location of bzlib library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -93715,6 +98168,8 @@ $as_echo_n "checking for location of bzlib library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_bzlib_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-bzlib-libs." "$LINENO" 5 @@ -93737,6 +98192,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_libs" >&5 $as_echo "$with_bzlib_libs" >&6; } ======= @@ -93780,6 +98236,8 @@ $as_echo "$with_bzlib_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_libs" >&5 printf "%s\n" "$with_bzlib_libs" >&6; } ======= @@ -93800,6 +98258,7 @@ $as_echo "$with_bzlib_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -93829,6 +98288,8 @@ $as_echo "$with_bzlib_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_bzlib_libs" >&5 $as_echo "$with_bzlib_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -93846,6 +98307,7 @@ $as_echo "$with_bzlib_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -93888,6 +98350,8 @@ $as_echo "$with_bzlib_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_bzlib_libs"; then for dir in $with_bzlib_libs; do @@ -93922,6 +98386,7 @@ LDFLAGS="$BZIP2LIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5 $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } ======= @@ -93965,6 +98430,8 @@ $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5 printf %s "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } ======= @@ -93985,6 +98452,7 @@ $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -94014,6 +98482,8 @@ $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5 $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -94031,6 +98501,7 @@ $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -94073,6 +98544,8 @@ $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lbz2 $LIBS" @@ -94099,6 +98572,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -94140,6 +98614,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char BZ2_bzBuffToBuffCompress (); int main (void) @@ -94158,6 +98634,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -94227,6 +98704,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -94250,6 +98731,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94341,6 +98823,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return BZ2_bzBuffToBuffCompress (); ; @@ -94364,6 +98851,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes else @@ -94410,6 +98898,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes @@ -94445,6 +98935,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -94474,6 +98965,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes else @@ -94494,6 +98987,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -94536,6 +99030,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -94561,6 +99057,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94652,6 +99149,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -94699,6 +99201,7 @@ ZSTDLIB= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -94740,6 +99243,8 @@ ZSTDLIB= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use zstd" >&5 printf %s "checking whether to use zstd... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_zstd\"" >&5 @@ -94759,6 +99264,7 @@ printf "%s\n" "\"$with_zstd\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -94828,6 +99334,10 @@ printf "%s\n" "\"$with_zstd\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use zstd" >&5 $as_echo_n "checking whether to use zstd... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_zstd\"" >&5 @@ -94849,6 +99359,7 @@ $as_echo "\"$with_zstd\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -94940,6 +99451,11 @@ $as_echo "\"$with_zstd\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_zstd" in "no") USE_ZSTD= ;; "yes") USE_ZSTD="1" ;; @@ -94970,6 +99486,7 @@ if test -n "$USE_ZSTD"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zstd includes" >&5 $as_echo_n "checking for location of zstd includes... " >&6; } ======= @@ -95013,6 +99530,8 @@ $as_echo_n "checking for location of zstd includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of zstd includes" >&5 printf %s "checking for location of zstd includes... " >&6; } ======= @@ -95033,6 +99552,7 @@ $as_echo_n "checking for location of zstd includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -95062,6 +99582,8 @@ $as_echo_n "checking for location of zstd includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zstd includes" >&5 $as_echo_n "checking for location of zstd includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -95079,6 +99601,7 @@ $as_echo_n "checking for location of zstd includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -95121,6 +99644,8 @@ $as_echo_n "checking for location of zstd includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_zstd_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-zstd-includes." "$LINENO" 5 @@ -95143,6 +99668,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zstd_includes" >&5 $as_echo "$with_zstd_includes" >&6; } ======= @@ -95186,6 +99712,8 @@ $as_echo "$with_zstd_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_zstd_includes" >&5 printf "%s\n" "$with_zstd_includes" >&6; } ======= @@ -95206,6 +99734,7 @@ $as_echo "$with_zstd_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -95235,6 +99764,8 @@ $as_echo "$with_zstd_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zstd_includes" >&5 $as_echo "$with_zstd_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -95252,6 +99783,7 @@ $as_echo "$with_zstd_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -95294,6 +99826,8 @@ $as_echo "$with_zstd_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_zstd_includes" ; then for dir in $with_zstd_includes; do @@ -95325,6 +99859,7 @@ CPPFLAGS="$ZSTDINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -95365,6 +99900,8 @@ CPPFLAGS="$ZSTDINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in zstd.h do : @@ -95389,6 +99926,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -95458,6 +99996,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in zstd.h do : ac_fn_c_check_header_mongrel "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default" @@ -95484,6 +100026,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -95574,6 +100117,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate zstd includes." "$LINENO" 5 @@ -95604,6 +100152,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zstd library" >&5 $as_echo_n "checking for location of zstd library... " >&6; } ======= @@ -95647,6 +100196,8 @@ $as_echo_n "checking for location of zstd library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of zstd library" >&5 printf %s "checking for location of zstd library... " >&6; } ======= @@ -95667,6 +100218,7 @@ $as_echo_n "checking for location of zstd library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -95696,6 +100248,8 @@ $as_echo_n "checking for location of zstd library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of zstd library" >&5 $as_echo_n "checking for location of zstd library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -95713,6 +100267,7 @@ $as_echo_n "checking for location of zstd library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -95755,6 +100310,8 @@ $as_echo_n "checking for location of zstd library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_zstd_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-zstd-libs." "$LINENO" 5 @@ -95777,6 +100334,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zstd_libs" >&5 $as_echo "$with_zstd_libs" >&6; } ======= @@ -95820,6 +100378,8 @@ $as_echo "$with_zstd_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_zstd_libs" >&5 printf "%s\n" "$with_zstd_libs" >&6; } ======= @@ -95840,6 +100400,7 @@ $as_echo "$with_zstd_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -95869,6 +100430,8 @@ $as_echo "$with_zstd_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zstd_libs" >&5 $as_echo "$with_zstd_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -95886,6 +100449,7 @@ $as_echo "$with_zstd_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -95928,6 +100492,8 @@ $as_echo "$with_zstd_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_zstd_libs"; then for dir in $with_zstd_libs; do @@ -95962,6 +100528,7 @@ LDFLAGS="$ZSTDLIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compress in -lzstd" >&5 $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } ======= @@ -96005,6 +100572,8 @@ $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compress in -lzstd" >&5 printf %s "checking for ZSTD_compress in -lzstd... " >&6; } ======= @@ -96025,6 +100594,7 @@ $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -96054,6 +100624,8 @@ $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compress in -lzstd" >&5 $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -96071,6 +100643,7 @@ $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -96113,6 +100686,8 @@ $as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lzstd $LIBS" @@ -96139,6 +100714,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -96180,6 +100756,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char ZSTD_compress (); int main (void) @@ -96198,6 +100776,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -96267,6 +100846,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -96290,6 +100873,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -96381,6 +100965,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return ZSTD_compress (); ; @@ -96404,6 +100993,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_zstd_ZSTD_compress=yes else @@ -96450,6 +101040,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_zstd_ZSTD_compress=yes @@ -96485,6 +101077,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -96514,6 +101107,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_zstd_ZSTD_compress=yes else @@ -96534,6 +101129,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -96576,6 +101172,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -96601,6 +101199,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -96692,6 +101291,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -96743,6 +101347,7 @@ PROJMAJOR=4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ includes" >&5 $as_echo_n "checking for location of External PROJ includes... " >&6; } ======= @@ -96786,6 +101391,8 @@ $as_echo_n "checking for location of External PROJ includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ includes" >&5 printf %s "checking for location of External PROJ includes... " >&6; } ======= @@ -96806,6 +101413,7 @@ $as_echo_n "checking for location of External PROJ includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -96835,6 +101443,8 @@ $as_echo_n "checking for location of External PROJ includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ includes" >&5 $as_echo_n "checking for location of External PROJ includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -96852,6 +101462,7 @@ $as_echo_n "checking for location of External PROJ includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -96894,6 +101505,8 @@ $as_echo_n "checking for location of External PROJ includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_proj_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-proj-includes." "$LINENO" 5 @@ -96916,6 +101529,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_includes" >&5 $as_echo "$with_proj_includes" >&6; } ======= @@ -96959,6 +101573,8 @@ $as_echo "$with_proj_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_proj_includes" >&5 printf "%s\n" "$with_proj_includes" >&6; } ======= @@ -96979,6 +101595,7 @@ $as_echo "$with_proj_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -97008,6 +101625,8 @@ $as_echo "$with_proj_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_includes" >&5 $as_echo "$with_proj_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -97025,6 +101644,7 @@ $as_echo "$with_proj_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -97067,6 +101687,8 @@ $as_echo "$with_proj_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_proj_includes" ; then for dir in $with_proj_includes; do @@ -97100,6 +101722,7 @@ CPPFLAGS="$PROJINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -97140,6 +101763,8 @@ CPPFLAGS="$PROJINC $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in proj.h do : @@ -97164,6 +101789,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -97233,6 +101859,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in proj.h do : ac_fn_c_check_header_mongrel "$LINENO" "proj.h" "ac_cv_header_proj_h" "$ac_includes_default" @@ -97259,6 +101889,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -97349,6 +101980,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main PROJ4API=1 fi @@ -97376,6 +102012,7 @@ if test $PROJ4API = 0 ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ major version" >&5 $as_echo_n "checking External PROJ major version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -97426,6 +102063,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking External PROJ major version" >&5 printf %s "checking External PROJ major version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -97461,6 +102100,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -97490,6 +102130,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ major version" >&5 $as_echo_n "checking External PROJ major version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -97514,6 +102156,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -97555,6 +102198,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -97585,6 +102230,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_run "$LINENO"; then : proj_ver_major=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver_major" >&5 @@ -97631,6 +102277,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver_major=`cat conftestdata` @@ -97658,6 +102306,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -97687,6 +102336,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_run "$LINENO"; then : proj_ver_major=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver_major" >&5 @@ -97707,6 +102358,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -97748,6 +102400,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Could not determine External PROJ major version." "$LINENO" 5 fi @@ -97775,6 +102429,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ minor version" >&5 $as_echo_n "checking External PROJ minor version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -97825,6 +102480,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking External PROJ minor version" >&5 printf %s "checking External PROJ minor version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -97860,6 +102517,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -97889,6 +102547,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ minor version" >&5 $as_echo_n "checking External PROJ minor version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -97913,6 +102573,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -97954,6 +102615,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -97984,6 +102647,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_run "$LINENO"; then : proj_ver_minor=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver_minor" >&5 @@ -98030,6 +102694,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver_minor=`cat conftestdata` @@ -98057,6 +102723,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -98086,6 +102753,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_run "$LINENO"; then : proj_ver_minor=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver_minor" >&5 @@ -98106,6 +102775,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -98147,6 +102817,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Could not determine External PROJ minor version." "$LINENO" 5 fi @@ -98174,6 +102846,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ patch version" >&5 $as_echo_n "checking External PROJ patch version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -98224,6 +102897,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking External PROJ patch version" >&5 printf %s "checking External PROJ patch version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -98259,6 +102934,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -98288,6 +102964,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ patch version" >&5 $as_echo_n "checking External PROJ patch version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -98312,6 +102990,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -98353,6 +103032,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -98383,6 +103064,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_run "$LINENO"; then : proj_ver_patch=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver_patch" >&5 @@ -98429,6 +103111,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver_patch=`cat conftestdata` @@ -98456,6 +103140,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -98485,6 +103170,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_run "$LINENO"; then : proj_ver_patch=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver_patch" >&5 @@ -98505,6 +103192,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -98546,6 +103234,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Could not determine External PROJ patch version." "$LINENO" 5 fi @@ -98571,6 +103261,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: found PROJ version \"${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}\"" >&5 $as_echo "found PROJ version \"${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}\"" >&6; } @@ -98619,6 +103310,8 @@ $as_echo "$as_me: WARNING: At least PROJ version \"5.1.0\" is required for the n ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found PROJ version \"${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}\"" >&5 printf "%s\n" "found PROJ version \"${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}\"" >&6; } @@ -98650,6 +103343,7 @@ $as_echo "$as_me: WARNING: At least PROJ version \"5.1.0\" is required for the n <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -98678,6 +103372,8 @@ $as_echo "$as_me: WARNING: At least PROJ version \"5.1.0\" is required for the n >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: found PROJ version \"${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}\"" >&5 $as_echo "found PROJ version \"${proj_ver_major}.${proj_ver_minor}.${proj_ver_patch}\"" >&6; } @@ -98701,6 +103397,7 @@ $as_echo "$as_me: WARNING: At least PROJ version \"5.1.0\" is required for the n <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -98742,6 +103439,8 @@ $as_echo "$as_me: WARNING: At least PROJ version \"5.1.0\" is required for the n ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main PROJ4API=1 fi @@ -98764,6 +103463,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 $as_echo_n "checking External PROJ.4 version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -98814,6 +103514,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 printf %s "checking External PROJ.4 version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -98849,6 +103551,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -98878,6 +103581,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 $as_echo_n "checking External PROJ.4 version... " >&6; } ac_save_cppflags="$CPPFLAGS" @@ -98902,6 +103607,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -98943,6 +103649,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -98973,6 +103681,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_run "$LINENO"; then : proj_ver=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver" >&5 @@ -99019,6 +103728,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver=`cat conftestdata` @@ -99046,6 +103757,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -99075,6 +103787,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_run "$LINENO"; then : proj_ver=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver" >&5 @@ -99095,6 +103809,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -99136,6 +103851,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Could not determine External PROJ.4 version." "$LINENO" 5 fi @@ -99168,6 +103885,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: found PROJ version \"${proj_ver}\"" >&5 $as_echo "found PROJ version \"${proj_ver}\"" >&6; } @@ -99216,6 +103934,8 @@ $as_echo "using new PROJ version 5+ API" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found PROJ version \"${proj_ver}\"" >&5 printf "%s\n" "found PROJ version \"${proj_ver}\"" >&6; } @@ -99247,6 +103967,7 @@ $as_echo "using new PROJ version 5+ API" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -99275,6 +103996,8 @@ $as_echo "using new PROJ version 5+ API" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: found PROJ version \"${proj_ver}\"" >&5 $as_echo "found PROJ version \"${proj_ver}\"" >&6; } @@ -99298,6 +104021,7 @@ $as_echo "using new PROJ version 5+ API" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -99339,6 +104063,8 @@ $as_echo "using new PROJ version 5+ API" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # With PROJ library directory @@ -99361,6 +104087,7 @@ $as_echo "using new PROJ version 5+ API" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ library" >&5 $as_echo_n "checking for location of External PROJ library... " >&6; } ======= @@ -99404,6 +104131,8 @@ $as_echo_n "checking for location of External PROJ library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ library" >&5 printf %s "checking for location of External PROJ library... " >&6; } ======= @@ -99424,6 +104153,7 @@ $as_echo_n "checking for location of External PROJ library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -99453,6 +104183,8 @@ $as_echo_n "checking for location of External PROJ library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ library" >&5 $as_echo_n "checking for location of External PROJ library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -99470,6 +104202,7 @@ $as_echo_n "checking for location of External PROJ library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -99512,6 +104245,8 @@ $as_echo_n "checking for location of External PROJ library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_proj_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-proj-libs." "$LINENO" 5 @@ -99534,6 +104269,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 $as_echo "$with_proj_libs" >&6; } ======= @@ -99577,6 +104313,8 @@ $as_echo "$with_proj_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 printf "%s\n" "$with_proj_libs" >&6; } ======= @@ -99597,6 +104335,7 @@ $as_echo "$with_proj_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -99626,6 +104365,8 @@ $as_echo "$with_proj_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 $as_echo "$with_proj_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -99643,6 +104384,7 @@ $as_echo "$with_proj_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -99685,6 +104427,8 @@ $as_echo "$with_proj_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_proj_libs"; then for dir in $with_proj_libs; do @@ -99718,6 +104462,7 @@ LDFLAGS="$PROJLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for proj_pj_info in -lproj" >&5 $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } ======= @@ -99761,6 +104506,8 @@ $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for proj_pj_info in -lproj" >&5 printf %s "checking for proj_pj_info in -lproj... " >&6; } ======= @@ -99781,6 +104528,7 @@ $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -99810,6 +104558,8 @@ $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for proj_pj_info in -lproj" >&5 $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -99827,6 +104577,7 @@ $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -99869,6 +104620,8 @@ $as_echo_n "checking for proj_pj_info in -lproj... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lproj $LIBS" @@ -99895,6 +104648,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -99936,6 +104690,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char proj_pj_info (); int main (void) @@ -99954,6 +104710,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -100023,6 +104780,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -100046,6 +104807,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -100137,6 +104899,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return proj_pj_info (); ; @@ -100160,6 +104927,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_proj_proj_pj_info=yes else @@ -100206,6 +104974,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_proj_proj_pj_info=yes @@ -100241,6 +105011,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -100270,6 +105041,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_proj_proj_pj_info=yes else @@ -100290,6 +105063,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -100332,6 +105106,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -100357,6 +105133,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -100448,6 +105225,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -100478,6 +105260,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -100518,6 +105301,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using old PROJ version 4 API" >&5 printf "%s\n" "using old PROJ version 4 API" >&6; } @@ -100538,6 +105323,7 @@ printf "%s\n" "#define USE_PROJ4API 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -100606,6 +105392,10 @@ printf "%s\n" "#define USE_PROJ4API 1" >>confdefs.h ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: using old PROJ version 4 API" >&5 $as_echo "using old PROJ version 4 API" >&6; } @@ -100628,6 +105418,7 @@ $as_echo "#define USE_PROJ4API 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -100719,6 +105510,11 @@ $as_echo "#define USE_PROJ4API 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main @@ -100741,6 +105537,7 @@ CPPFLAGS="$PROJINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -100781,6 +105578,8 @@ CPPFLAGS="$PROJINC $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in proj_api.h do : @@ -100805,6 +105604,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -100874,6 +105674,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in proj_api.h do : ac_fn_c_check_header_mongrel "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default" @@ -100900,6 +105704,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -100990,6 +105795,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate External PROJ includes." "$LINENO" 5 @@ -101019,75 +105829,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&5 -$as_echo "$as_me: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&2;} - else - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 -$as_echo_n "checking External PROJ.4 version... " >&6; } -ac_save_cppflags="$CPPFLAGS" -CPPFLAGS="$PROJINC $CPPFLAGS" -if test "$cross_compiling" = yes; then : - proj_ver=0 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 -$as_echo "unknown (cross-compiling)" >&6; } -else -======= -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -======= ->>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) -======= <<<<<<< HEAD ->>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main ->>>>>>> main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&5 -printf "%s\n" "$as_me: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&2;} - else - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 -printf %s "checking External PROJ.4 version... " >&6; } -ac_save_cppflags="$CPPFLAGS" -CPPFLAGS="$PROJINC $CPPFLAGS" -if test "$cross_compiling" = yes -then : - proj_ver=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 -printf "%s\n" "unknown (cross-compiling)" >&6; } -else $as_nop -======= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&5 $as_echo "$as_me: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&2;} else @@ -101101,84 +105843,11 @@ if test "$cross_compiling" = yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 $as_echo "unknown (cross-compiling)" >&6; } else ->>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD ->>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main ->>>>>>> main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main ======= >>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&5 -$as_echo "$as_me: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&2;} - else - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 -$as_echo_n "checking External PROJ.4 version... " >&6; } -ac_save_cppflags="$CPPFLAGS" -CPPFLAGS="$PROJINC $CPPFLAGS" -if test "$cross_compiling" = yes; then : - proj_ver=0 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 -$as_echo "unknown (cross-compiling)" >&6; } -else ->>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD <<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> main ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -101214,6 +105883,156 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&5 +printf "%s\n" "$as_me: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&2;} + else + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 +printf %s "checking External PROJ.4 version... " >&6; } +ac_save_cppflags="$CPPFLAGS" +CPPFLAGS="$PROJINC $CPPFLAGS" +if test "$cross_compiling" = yes +then : + proj_ver=0 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 +printf "%s\n" "unknown (cross-compiling)" >&6; } +else $as_nop +======= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&5 +$as_echo "$as_me: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&2;} + else + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 +$as_echo_n "checking External PROJ.4 version... " >&6; } +ac_save_cppflags="$CPPFLAGS" +CPPFLAGS="$PROJINC $CPPFLAGS" +if test "$cross_compiling" = yes; then : + proj_ver=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 +$as_echo "unknown (cross-compiling)" >&6; } +else +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +>>>>>>> main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&5 +$as_echo "$as_me: WARNING: *** Cannot check PROJ.4 version (cross-compiling)." >&2;} + else + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking External PROJ.4 version" >&5 +$as_echo_n "checking External PROJ.4 version... " >&6; } +ac_save_cppflags="$CPPFLAGS" +CPPFLAGS="$PROJINC $CPPFLAGS" +if test "$cross_compiling" = yes; then : + proj_ver=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (cross-compiling)" >&5 +$as_echo "unknown (cross-compiling)" >&6; } +else +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> main +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +<<<<<<< HEAD +>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +>>>>>>> main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -101244,6 +106063,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_run "$LINENO"; then : proj_ver=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver" >&5 @@ -101290,6 +106110,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_run "$LINENO" then : proj_ver=`cat conftestdata` @@ -101317,6 +106139,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -101346,6 +106169,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_run "$LINENO"; then : proj_ver=`cat conftestdata` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proj_ver" >&5 @@ -101366,6 +106191,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -101407,6 +106233,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Could not determine External PROJ.4 version." "$LINENO" 5 fi @@ -101442,6 +106270,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ.4 library" >&5 $as_echo_n "checking for location of External PROJ.4 library... " >&6; } ======= @@ -101485,6 +106314,8 @@ $as_echo_n "checking for location of External PROJ.4 library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ.4 library" >&5 printf %s "checking for location of External PROJ.4 library... " >&6; } ======= @@ -101505,6 +106336,7 @@ $as_echo_n "checking for location of External PROJ.4 library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -101534,6 +106366,8 @@ $as_echo_n "checking for location of External PROJ.4 library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ.4 library" >&5 $as_echo_n "checking for location of External PROJ.4 library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -101551,6 +106385,7 @@ $as_echo_n "checking for location of External PROJ.4 library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -101593,6 +106428,8 @@ $as_echo_n "checking for location of External PROJ.4 library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_proj_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-proj-libs." "$LINENO" 5 @@ -101615,6 +106452,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 $as_echo "$with_proj_libs" >&6; } ======= @@ -101658,6 +106496,8 @@ $as_echo "$with_proj_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 printf "%s\n" "$with_proj_libs" >&6; } ======= @@ -101678,6 +106518,7 @@ $as_echo "$with_proj_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -101707,6 +106548,8 @@ $as_echo "$with_proj_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_libs" >&5 $as_echo "$with_proj_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -101724,6 +106567,7 @@ $as_echo "$with_proj_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -101766,6 +106610,8 @@ $as_echo "$with_proj_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_proj_libs"; then for dir in $with_proj_libs; do @@ -101799,6 +106645,7 @@ LDFLAGS="$PROJLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_get_def in -lproj" >&5 $as_echo_n "checking for pj_get_def in -lproj... " >&6; } ======= @@ -101842,6 +106689,8 @@ $as_echo_n "checking for pj_get_def in -lproj... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pj_get_def in -lproj" >&5 printf %s "checking for pj_get_def in -lproj... " >&6; } ======= @@ -101862,6 +106711,7 @@ $as_echo_n "checking for pj_get_def in -lproj... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -101891,6 +106741,8 @@ $as_echo_n "checking for pj_get_def in -lproj... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_get_def in -lproj" >&5 $as_echo_n "checking for pj_get_def in -lproj... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -101908,6 +106760,7 @@ $as_echo_n "checking for pj_get_def in -lproj... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -101950,6 +106803,8 @@ $as_echo_n "checking for pj_get_def in -lproj... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lproj $LIBS" @@ -101976,6 +106831,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -102017,6 +106873,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char pj_get_def (); int main (void) @@ -102035,6 +106893,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -102104,6 +106963,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -102127,6 +106990,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -102218,6 +107082,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return pj_get_def (); ; @@ -102241,6 +107110,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_proj_pj_get_def=yes else @@ -102287,6 +107157,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_proj_pj_get_def=yes @@ -102322,6 +107194,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -102351,6 +107224,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_proj_pj_get_def=yes else @@ -102371,6 +107246,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -102413,6 +107289,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -102438,6 +107316,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -102529,6 +107408,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -102563,6 +107447,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ data files" >&5 $as_echo_n "checking for location of External PROJ data files... " >&6; } ======= @@ -102606,6 +107491,8 @@ $as_echo_n "checking for location of External PROJ data files... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ data files" >&5 printf %s "checking for location of External PROJ data files... " >&6; } ======= @@ -102626,6 +107513,7 @@ $as_echo_n "checking for location of External PROJ data files... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -102655,6 +107543,8 @@ $as_echo_n "checking for location of External PROJ data files... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of External PROJ data files" >&5 $as_echo_n "checking for location of External PROJ data files... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -102672,6 +107562,7 @@ $as_echo_n "checking for location of External PROJ data files... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -102714,6 +107605,8 @@ $as_echo_n "checking for location of External PROJ data files... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_proj_share" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-proj-share." "$LINENO" 5 @@ -102736,6 +107629,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_share" >&5 $as_echo "$with_proj_share" >&6; } ======= @@ -102779,6 +107673,8 @@ $as_echo "$with_proj_share" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_proj_share" >&5 printf "%s\n" "$with_proj_share" >&6; } ======= @@ -102799,6 +107695,7 @@ $as_echo "$with_proj_share" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -102828,6 +107725,8 @@ $as_echo "$with_proj_share" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_proj_share" >&5 $as_echo "$with_proj_share" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -102845,6 +107744,7 @@ $as_echo "$with_proj_share" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -102887,6 +107787,8 @@ $as_echo "$with_proj_share" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_proj_share" ; then if test -d "$with_proj_share"; then @@ -102913,6 +107815,7 @@ if test -z "$PROJSHARE" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** External PROJ directory not specified; default will be used" >&5 $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default will be used" >&2;} @@ -102956,6 +107859,8 @@ $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default wi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** External PROJ directory not specified; default will be used" >&5 printf "%s\n" "$as_me: WARNING: *** External PROJ directory not specified; default will be used" >&2;} @@ -102977,6 +107882,7 @@ $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default wi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -103005,6 +107911,8 @@ $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default wi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** External PROJ directory not specified; default will be used" >&5 $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default will be used" >&2;} @@ -103023,6 +107931,7 @@ $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default wi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -103064,6 +107973,8 @@ $as_echo "$as_me: WARNING: *** External PROJ directory not specified; default wi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main PROJSHARE=/usr/share/proj fi @@ -103088,6 +107999,7 @@ if test `expr ${PROJMAJOR} \< 6` = 1 ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epsg" >&5 $as_echo_n "checking for epsg... " >&6; } @@ -103139,6 +108051,8 @@ $as_echo_n "checking for $PROJSHARE/epsg... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epsg" >&5 printf %s "checking for epsg... " >&6; } @@ -103167,6 +108081,7 @@ $as_echo "unknown (cross-compiling)" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -103195,6 +108110,8 @@ $as_echo "unknown (cross-compiling)" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main as_ac_File=`$as_echo "ac_cv_file_$PROJSHARE/epsg" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PROJSHARE/epsg" >&5 @@ -103207,6 +108124,7 @@ $as_echo_n "checking for $PROJSHARE/epsg... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -103267,6 +108185,9 @@ $as_echo_n "checking for $PROJSHARE/epsg... " >&6; } >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= + >>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epsg" >&5 @@ -103294,6 +108215,7 @@ $as_echo_n "checking for $PROJSHARE/epsg... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -103330,6 +108252,8 @@ $as_echo_n "checking for $PROJSHARE/epsg... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$PROJSHARE/epsg"; then @@ -103355,6 +108279,7 @@ eval ac_res=\$$as_ac_File <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -103395,6 +108320,8 @@ eval ac_res=\$$as_ac_File ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } @@ -103419,6 +108346,7 @@ printf "%s\n" "$as_me: WARNING: *** Unable to locate PROJ data files." >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -103487,6 +108415,10 @@ printf "%s\n" "$as_me: WARNING: *** Unable to locate PROJ data files." >&2;} ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } @@ -103512,6 +108444,7 @@ $as_echo "$as_me: WARNING: *** Unable to locate PROJ data files." >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -103603,6 +108536,11 @@ $as_echo "$as_me: WARNING: *** Unable to locate PROJ data files." >&2;} ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -103636,6 +108574,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -103677,6 +108616,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use regex" >&5 printf %s "checking whether to use regex... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_regex\"" >&5 @@ -103696,6 +108637,7 @@ printf "%s\n" "\"$with_regex\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -103765,6 +108707,10 @@ printf "%s\n" "\"$with_regex\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use regex" >&5 $as_echo_n "checking whether to use regex... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_regex\"" >&5 @@ -103786,6 +108732,7 @@ $as_echo "\"$with_regex\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -103877,6 +108824,11 @@ $as_echo "\"$with_regex\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_regex" in "no") USE_REGEX= ;; "yes") USE_REGEX="1" ;; @@ -103911,6 +108863,7 @@ if test -n "$USE_REGEX"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of regex includes" >&5 $as_echo_n "checking for location of regex includes... " >&6; } ======= @@ -103954,6 +108907,8 @@ $as_echo_n "checking for location of regex includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of regex includes" >&5 printf %s "checking for location of regex includes... " >&6; } ======= @@ -103974,6 +108929,7 @@ $as_echo_n "checking for location of regex includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -104003,6 +108959,8 @@ $as_echo_n "checking for location of regex includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of regex includes" >&5 $as_echo_n "checking for location of regex includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -104020,6 +108978,7 @@ $as_echo_n "checking for location of regex includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -104062,6 +109021,8 @@ $as_echo_n "checking for location of regex includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_regex_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-regex-includes." "$LINENO" 5 @@ -104084,6 +109045,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_regex_includes" >&5 $as_echo "$with_regex_includes" >&6; } ======= @@ -104127,6 +109089,8 @@ $as_echo "$with_regex_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_regex_includes" >&5 printf "%s\n" "$with_regex_includes" >&6; } ======= @@ -104147,6 +109111,7 @@ $as_echo "$with_regex_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -104176,6 +109141,8 @@ $as_echo "$with_regex_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_regex_includes" >&5 $as_echo "$with_regex_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -104193,6 +109160,7 @@ $as_echo "$with_regex_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -104235,6 +109203,8 @@ $as_echo "$with_regex_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_regex_includes" ; then for dir in $with_regex_includes; do @@ -104267,6 +109237,7 @@ CPPFLAGS="$REGEXINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -104307,6 +109278,8 @@ CPPFLAGS="$REGEXINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in regex.h do : @@ -104331,6 +109304,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -104400,6 +109374,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in regex.h do : ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default" @@ -104426,6 +109404,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -104516,6 +109495,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate regex includes." "$LINENO" 5 @@ -104546,6 +109530,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of regex library" >&5 $as_echo_n "checking for location of regex library... " >&6; } ======= @@ -104589,6 +109574,8 @@ $as_echo_n "checking for location of regex library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of regex library" >&5 printf %s "checking for location of regex library... " >&6; } ======= @@ -104609,6 +109596,7 @@ $as_echo_n "checking for location of regex library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -104638,6 +109626,8 @@ $as_echo_n "checking for location of regex library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of regex library" >&5 $as_echo_n "checking for location of regex library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -104655,6 +109645,7 @@ $as_echo_n "checking for location of regex library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -104697,6 +109688,8 @@ $as_echo_n "checking for location of regex library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_regex_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-regex-libs." "$LINENO" 5 @@ -104719,6 +109712,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_regex_libs" >&5 $as_echo "$with_regex_libs" >&6; } ======= @@ -104762,6 +109756,8 @@ $as_echo "$with_regex_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_regex_libs" >&5 printf "%s\n" "$with_regex_libs" >&6; } ======= @@ -104782,6 +109778,7 @@ $as_echo "$with_regex_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -104811,6 +109808,8 @@ $as_echo "$with_regex_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_regex_libs" >&5 $as_echo "$with_regex_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -104828,6 +109827,7 @@ $as_echo "$with_regex_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -104870,6 +109870,8 @@ $as_echo "$with_regex_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_regex_libs"; then for dir in $with_regex_libs; do @@ -104905,6 +109907,7 @@ ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "x$ac_cv_func_regcomp" = xyes; then : ======= <<<<<<< HEAD @@ -104947,6 +109950,8 @@ if test "x$ac_cv_func_regcomp" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "x$ac_cv_func_regcomp" = xyes then : ======= @@ -104966,6 +109971,7 @@ if test "x$ac_cv_func_regcomp" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "x$ac_cv_func_regcomp" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -105048,6 +110054,11 @@ if test "x$ac_cv_func_regcomp" = xyes; then : ======= if test "x$ac_cv_func_regcomp" = xyes; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "x$ac_cv_func_regcomp" = xyes; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -105075,6 +110086,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -105166,6 +110178,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_save_ldflags="$LDFLAGS" @@ -105189,6 +110206,7 @@ LDFLAGS="$REGEXLIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcomp in -lregex" >&5 $as_echo_n "checking for regcomp in -lregex... " >&6; } ======= @@ -105232,6 +110250,8 @@ $as_echo_n "checking for regcomp in -lregex... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for regcomp in -lregex" >&5 printf %s "checking for regcomp in -lregex... " >&6; } ======= @@ -105252,6 +110272,7 @@ $as_echo_n "checking for regcomp in -lregex... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -105281,6 +110302,8 @@ $as_echo_n "checking for regcomp in -lregex... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcomp in -lregex" >&5 $as_echo_n "checking for regcomp in -lregex... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -105298,6 +110321,7 @@ $as_echo_n "checking for regcomp in -lregex... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -105340,6 +110364,8 @@ $as_echo_n "checking for regcomp in -lregex... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lregex $LIBS" @@ -105366,6 +110392,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -105407,6 +110434,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char regcomp (); int main (void) @@ -105425,6 +110454,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -105494,6 +110524,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -105517,6 +110551,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -105608,6 +110643,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return regcomp (); ; @@ -105631,6 +110671,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_regex_regcomp=yes else @@ -105677,6 +110718,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_regex_regcomp=yes @@ -105712,6 +110755,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -105741,6 +110785,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_regex_regcomp=yes else @@ -105761,6 +110807,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -105803,6 +110850,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -105828,6 +110877,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -105919,6 +110969,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -105968,6 +111023,7 @@ fi # $USE_REGEX <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -106009,6 +111065,8 @@ fi # $USE_REGEX >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use Readline" >&5 printf %s "checking whether to use Readline... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_readline\"" >&5 @@ -106028,6 +111086,7 @@ printf "%s\n" "\"$with_readline\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -106097,6 +111156,10 @@ printf "%s\n" "\"$with_readline\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Readline" >&5 $as_echo_n "checking whether to use Readline... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_readline\"" >&5 @@ -106118,6 +111181,7 @@ $as_echo "\"$with_readline\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -106209,6 +111273,11 @@ $as_echo "\"$with_readline\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_readline" in "no") USE_READLINE= ;; "yes") USE_READLINE="1" ;; @@ -106244,6 +111313,7 @@ if test -n "$USE_READLINE"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Readline includes" >&5 $as_echo_n "checking for location of Readline includes... " >&6; } ======= @@ -106287,6 +111357,8 @@ $as_echo_n "checking for location of Readline includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Readline includes" >&5 printf %s "checking for location of Readline includes... " >&6; } ======= @@ -106307,6 +111379,7 @@ $as_echo_n "checking for location of Readline includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -106336,6 +111409,8 @@ $as_echo_n "checking for location of Readline includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Readline includes" >&5 $as_echo_n "checking for location of Readline includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -106353,6 +111428,7 @@ $as_echo_n "checking for location of Readline includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -106395,6 +111471,8 @@ $as_echo_n "checking for location of Readline includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_readline_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-readline-includes." "$LINENO" 5 @@ -106417,6 +111495,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_readline_includes" >&5 $as_echo "$with_readline_includes" >&6; } ======= @@ -106460,6 +111539,8 @@ $as_echo "$with_readline_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_readline_includes" >&5 printf "%s\n" "$with_readline_includes" >&6; } ======= @@ -106480,6 +111561,7 @@ $as_echo "$with_readline_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -106509,6 +111591,8 @@ $as_echo "$with_readline_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_readline_includes" >&5 $as_echo "$with_readline_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -106526,6 +111610,7 @@ $as_echo "$with_readline_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -106568,6 +111653,8 @@ $as_echo "$with_readline_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_readline_includes" ; then for dir in $with_readline_includes; do @@ -106600,6 +111687,7 @@ CPPFLAGS="$READLINEINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -106640,6 +111728,8 @@ CPPFLAGS="$READLINEINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in readline/readline.h do : @@ -106664,6 +111754,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -106733,6 +111824,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in readline/readline.h do : ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" @@ -106759,6 +111854,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -106849,6 +111945,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate Readline includes." "$LINENO" 5 @@ -106878,6 +111979,7 @@ CPPFLAGS="$READLINEINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -106918,6 +112020,8 @@ CPPFLAGS="$READLINEINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in readline/history.h do : @@ -106942,6 +112046,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -107011,6 +112116,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in readline/history.h do : ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" @@ -107037,6 +112146,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -107127,6 +112237,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate Readline includes." "$LINENO" 5 @@ -107157,6 +112272,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Readline library" >&5 $as_echo_n "checking for location of Readline library... " >&6; } ======= @@ -107200,6 +112316,8 @@ $as_echo_n "checking for location of Readline library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Readline library" >&5 printf %s "checking for location of Readline library... " >&6; } ======= @@ -107220,6 +112338,7 @@ $as_echo_n "checking for location of Readline library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -107249,6 +112368,8 @@ $as_echo_n "checking for location of Readline library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Readline library" >&5 $as_echo_n "checking for location of Readline library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -107266,6 +112387,7 @@ $as_echo_n "checking for location of Readline library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -107308,6 +112430,8 @@ $as_echo_n "checking for location of Readline library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_readline_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-readline-libs." "$LINENO" 5 @@ -107330,6 +112454,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_readline_libs" >&5 $as_echo "$with_readline_libs" >&6; } ======= @@ -107373,6 +112498,8 @@ $as_echo "$with_readline_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_readline_libs" >&5 printf "%s\n" "$with_readline_libs" >&6; } ======= @@ -107393,6 +112520,7 @@ $as_echo "$with_readline_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -107422,6 +112550,8 @@ $as_echo "$with_readline_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_readline_libs" >&5 $as_echo "$with_readline_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -107439,6 +112569,7 @@ $as_echo "$with_readline_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -107481,6 +112612,8 @@ $as_echo "$with_readline_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_readline_libs"; then for dir in $with_readline_libs; do @@ -107515,6 +112648,7 @@ LDFLAGS="$READLINELIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 $as_echo_n "checking for readline in -lreadline... " >&6; } ======= @@ -107558,6 +112692,8 @@ $as_echo_n "checking for readline in -lreadline... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 printf %s "checking for readline in -lreadline... " >&6; } ======= @@ -107578,6 +112714,7 @@ $as_echo_n "checking for readline in -lreadline... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -107607,6 +112744,8 @@ $as_echo_n "checking for readline in -lreadline... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 $as_echo_n "checking for readline in -lreadline... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -107624,6 +112763,7 @@ $as_echo_n "checking for readline in -lreadline... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -107666,6 +112806,8 @@ $as_echo_n "checking for readline in -lreadline... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" @@ -107692,6 +112834,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -107733,6 +112876,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char readline (); int main (void) @@ -107751,6 +112896,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -107820,6 +112966,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -107843,6 +112993,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -107934,6 +113085,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return readline (); ; @@ -107957,6 +113113,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_readline_readline=yes else @@ -108003,6 +113160,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_readline_readline=yes @@ -108038,6 +113197,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -108067,6 +113227,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_readline_readline=yes else @@ -108087,6 +113249,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -108129,6 +113292,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -108154,6 +113319,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -108245,6 +113411,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -108279,6 +113450,7 @@ LDFLAGS="$READLINELIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_history in -lhistory" >&5 $as_echo_n "checking for add_history in -lhistory... " >&6; } ======= @@ -108322,6 +113494,8 @@ $as_echo_n "checking for add_history in -lhistory... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for add_history in -lhistory" >&5 printf %s "checking for add_history in -lhistory... " >&6; } ======= @@ -108342,6 +113516,7 @@ $as_echo_n "checking for add_history in -lhistory... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -108371,6 +113546,8 @@ $as_echo_n "checking for add_history in -lhistory... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for add_history in -lhistory" >&5 $as_echo_n "checking for add_history in -lhistory... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -108388,6 +113565,7 @@ $as_echo_n "checking for add_history in -lhistory... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -108430,6 +113608,8 @@ $as_echo_n "checking for add_history in -lhistory... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lhistory $LIBS" @@ -108456,6 +113636,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -108497,6 +113678,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char add_history (); int main (void) @@ -108515,6 +113698,7 @@ main (void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -108584,6 +113768,10 @@ main (void) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #ifdef __cplusplus extern "C" #endif @@ -108607,6 +113795,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -108698,6 +113887,11 @@ main () ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return add_history (); ; @@ -108721,6 +113915,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_history_add_history=yes else @@ -108767,6 +113962,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_history_add_history=yes @@ -108802,6 +113999,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -108831,6 +114029,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_history_add_history=yes else @@ -108851,6 +114051,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -108893,6 +114094,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -108918,6 +114121,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -109009,6 +114213,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -109050,6 +114259,7 @@ fi # $USE_READLINE <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use PNG" >&5 $as_echo_n "checking whether to use PNG... " >&6; } ======= @@ -109093,6 +114303,8 @@ $as_echo_n "checking whether to use PNG... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use PNG" >&5 printf %s "checking whether to use PNG... " >&6; } ======= @@ -109113,6 +114325,7 @@ $as_echo_n "checking whether to use PNG... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -109142,6 +114355,8 @@ $as_echo_n "checking whether to use PNG... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use PNG" >&5 $as_echo_n "checking whether to use PNG... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -109159,6 +114374,7 @@ $as_echo_n "checking whether to use PNG... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -109201,6 +114417,8 @@ $as_echo_n "checking whether to use PNG... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main PNGLIB= PNGINC= @@ -109228,6 +114446,7 @@ if test "$with_libpng" = "no" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -109268,6 +114487,8 @@ if test "$with_libpng" = "no" ; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -109293,6 +114514,7 @@ printf %s "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -109361,6 +114583,10 @@ printf %s "checking for $ac_word... " >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -109388,6 +114614,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -109479,6 +114706,11 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case $LIBPNG_CONFIG in [\\/]* | ?:[\\/]*) @@ -109506,6 +114738,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -109546,6 +114779,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -109571,6 +114806,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -109639,6 +114875,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -109662,6 +114902,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -109752,6 +114993,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -109781,6 +115027,7 @@ if test -n "$LIBPNG_CONFIG"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -109821,6 +115068,8 @@ if test -n "$LIBPNG_CONFIG"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBPNG_CONFIG" >&5 printf "%s\n" "$LIBPNG_CONFIG" >&6; } @@ -109842,6 +115091,7 @@ printf "%s\n" "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -109910,6 +115160,10 @@ printf "%s\n" "no" >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBPNG_CONFIG" >&5 $as_echo "$LIBPNG_CONFIG" >&6; } @@ -109933,6 +115187,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -110024,6 +115279,11 @@ $as_echo "no" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -110065,6 +115325,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -110107,6 +115368,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -110125,6 +115388,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -110208,6 +115472,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { png_read_image(NULL, NULL); ; @@ -110231,6 +115500,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : else @@ -110275,6 +115545,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -110298,6 +115570,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -110327,6 +115600,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : else @@ -110345,6 +115620,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -110386,6 +115662,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -110409,6 +115687,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -110451,6 +115730,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -110469,6 +115750,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -110552,6 +115834,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { png_read_image(NULL, NULL); ; @@ -110575,6 +115862,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : PNGLIB="$PNGLIB" else @@ -110619,6 +115907,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : PNGLIB="$PNGLIB" @@ -110642,6 +115932,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -110671,6 +115962,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : PNGLIB="$PNGLIB" else @@ -110689,6 +115982,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -110730,6 +116024,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate libpng library." "$LINENO" 5 @@ -110752,6 +116048,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -110793,6 +116090,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -110813,6 +116112,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -110882,6 +116182,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -110904,6 +116208,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -110994,6 +116299,11 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext LIBS=${ac_save_libs} @@ -111017,6 +116327,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_PNG_H 1" >>confdefs.h ======= <<<<<<< HEAD @@ -111059,6 +116370,8 @@ $as_echo "#define HAVE_PNG_H 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_PNG_H 1" >>confdefs.h ======= $as_echo "#define HAVE_PNG_H 1" >>confdefs.h @@ -111077,6 +116390,7 @@ $as_echo "#define HAVE_PNG_H 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_PNG_H 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -111160,6 +116474,11 @@ $as_echo "#define HAVE_PNG_H 1" >>confdefs.h $as_echo "#define HAVE_PNG_H 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_PNG_H 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -111186,6 +116505,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GDAL" >&5 $as_echo_n "checking whether to use GDAL... " >&6; } ======= @@ -111229,6 +116549,8 @@ $as_echo_n "checking whether to use GDAL... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use GDAL" >&5 printf %s "checking whether to use GDAL... " >&6; } ======= @@ -111249,6 +116571,7 @@ $as_echo_n "checking whether to use GDAL... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -111278,6 +116601,8 @@ $as_echo_n "checking whether to use GDAL... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GDAL" >&5 $as_echo_n "checking whether to use GDAL... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -111295,6 +116620,7 @@ $as_echo_n "checking whether to use GDAL... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -111337,6 +116663,8 @@ $as_echo_n "checking whether to use GDAL... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GDAL_LIBS= GDAL_CFLAGS= @@ -111364,6 +116692,7 @@ if test "$with_gdal" = "no" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -111414,6 +116743,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -111449,6 +116780,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -111477,6 +116809,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -111502,6 +116836,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -111544,6 +116879,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $GDAL_CONFIG in [\\/]* | ?:[\\/]*) @@ -111571,6 +116908,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -111611,6 +116949,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -111636,6 +116976,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -111704,6 +117045,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -111727,6 +117072,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -111817,6 +117163,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -111845,6 +117196,7 @@ if test -n "$GDAL_CONFIG"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDAL_CONFIG" >&5 $as_echo "$GDAL_CONFIG" >&6; } @@ -111891,6 +117243,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GDAL_CONFIG" >&5 printf "%s\n" "$GDAL_CONFIG" >&6; } @@ -111918,6 +117272,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -111946,6 +117301,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDAL_CONFIG" >&5 $as_echo "$GDAL_CONFIG" >&6; } @@ -111967,6 +117324,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -112009,6 +117367,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -112041,6 +117401,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_OGR 1" >>confdefs.h ======= <<<<<<< HEAD @@ -112083,6 +117444,8 @@ $as_echo "#define HAVE_OGR 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_OGR 1" >>confdefs.h ======= $as_echo "#define HAVE_OGR 1" >>confdefs.h @@ -112101,6 +117464,7 @@ $as_echo "#define HAVE_OGR 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_OGR 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -112183,6 +117547,11 @@ $as_echo "#define HAVE_OGR 1" >>confdefs.h ======= $as_echo "#define HAVE_OGR 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_OGR 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main USE_OGR=1 @@ -112215,6 +117584,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -112257,6 +117627,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -112275,6 +117647,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -112358,6 +117731,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { GDALOpen("foo", GA_ReadOnly); ; @@ -112381,6 +117759,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : else @@ -112425,6 +117804,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -112448,6 +117829,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -112477,6 +117859,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : else @@ -112495,6 +117879,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -112536,6 +117921,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main LIBS="$LIBS $GDAL_DEP_LIBS" @@ -112560,6 +117947,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -112602,6 +117990,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -112620,6 +118010,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -112703,6 +118094,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { GDALOpen("foo", GA_ReadOnly); ; @@ -112726,6 +118122,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS" else @@ -112770,6 +118167,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS" @@ -112793,6 +118192,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -112822,6 +118222,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS" else @@ -112840,6 +118242,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -112881,6 +118284,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate GDAL library." "$LINENO" 5 @@ -112903,6 +118308,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -112950,6 +118356,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -112969,6 +118377,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -112996,6 +118405,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext @@ -113009,6 +118420,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) conftest$ac_exeext conftest.$ac_ext <<<<<<< HEAD @@ -113070,6 +118482,9 @@ rm -f core conftest.err conftest.$ac_objext \ ======= conftest$ac_exeext conftest.$ac_ext >>>>>>> osgeo-main +======= + conftest$ac_exeext conftest.$ac_ext +>>>>>>> osgeo-main ======= rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -113092,6 +118507,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -113127,6 +118543,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main LIBS=${ac_save_libs} CFLAGS=${ac_save_cflags} @@ -113149,6 +118567,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_GDAL 1" >>confdefs.h ======= <<<<<<< HEAD @@ -113191,6 +118610,8 @@ $as_echo "#define HAVE_GDAL 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_GDAL 1" >>confdefs.h ======= $as_echo "#define HAVE_GDAL 1" >>confdefs.h @@ -113209,6 +118630,7 @@ $as_echo "#define HAVE_GDAL 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_GDAL 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -113292,6 +118714,11 @@ $as_echo "#define HAVE_GDAL 1" >>confdefs.h $as_echo "#define HAVE_GDAL 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_GDAL 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -113319,6 +118746,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libLAS" >&5 $as_echo_n "checking whether to use libLAS... " >&6; } ======= @@ -113362,6 +118790,8 @@ $as_echo_n "checking whether to use libLAS... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use libLAS" >&5 printf %s "checking whether to use libLAS... " >&6; } ======= @@ -113382,6 +118812,7 @@ $as_echo_n "checking whether to use libLAS... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -113411,6 +118842,8 @@ $as_echo_n "checking whether to use libLAS... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libLAS" >&5 $as_echo_n "checking whether to use libLAS... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -113428,6 +118861,7 @@ $as_echo_n "checking whether to use libLAS... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -113470,6 +118904,8 @@ $as_echo_n "checking whether to use libLAS... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LIBLAS_LIBS= LIBLAS_CFLAGS= @@ -113496,6 +118932,7 @@ if test "$with_liblas" = "no" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -113546,6 +118983,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -113581,6 +119020,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -113609,6 +119049,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -113634,6 +119076,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -113676,6 +119119,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $LIBLAS_CONFIG in [\\/]* | ?:[\\/]*) @@ -113703,6 +119148,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -113743,6 +119189,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -113768,6 +119216,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -113836,6 +119285,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -113859,6 +119312,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -113949,6 +119403,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -113977,6 +119436,7 @@ if test -n "$LIBLAS_CONFIG"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBLAS_CONFIG" >&5 $as_echo "$LIBLAS_CONFIG" >&6; } @@ -114023,6 +119483,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBLAS_CONFIG" >&5 printf "%s\n" "$LIBLAS_CONFIG" >&6; } @@ -114050,6 +119512,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -114078,6 +119541,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBLAS_CONFIG" >&5 $as_echo "$LIBLAS_CONFIG" >&6; } @@ -114099,6 +119564,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -114141,6 +119607,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -114179,6 +119647,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD for ac_header in liblas/capi/liblas.h do : @@ -114228,6 +119697,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_fn_c_check_header_compile "$LINENO" "liblas/capi/liblas.h" "ac_cv_header_liblas_capi_liblas_h" "$ac_includes_default" if test "x$ac_cv_header_liblas_capi_liblas_h" = xyes @@ -114258,6 +119729,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -114286,6 +119758,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for ac_header in liblas/capi/liblas.h do : @@ -114310,6 +119784,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -114352,6 +119827,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi done @@ -114378,6 +119855,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -114420,6 +119898,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -114438,6 +119918,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -114521,6 +120002,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { LASReader_Create("foo"); ; @@ -114544,6 +120030,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : else @@ -114588,6 +120075,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -114611,6 +120100,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -114640,6 +120130,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : else @@ -114658,6 +120150,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -114699,6 +120192,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -114722,6 +120217,7 @@ int <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD main () ======= <<<<<<< HEAD @@ -114764,6 +120260,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main main (void) ======= main () @@ -114782,6 +120280,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -114865,6 +120364,11 @@ main () main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +main () +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { LASReader_Create("foo"); ; @@ -114888,6 +120392,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : LAS_LIBS="$LAS_LIBS" else @@ -114932,6 +120437,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : LAS_LIBS="$LAS_LIBS" @@ -114955,6 +120462,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -114984,6 +120492,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : LAS_LIBS="$LAS_LIBS" else @@ -115002,6 +120512,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -115043,6 +120554,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate libLAS library." "$LINENO" 5 @@ -115065,6 +120578,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -115112,6 +120626,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -115131,6 +120647,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -115158,6 +120675,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext @@ -115171,6 +120690,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) conftest$ac_exeext conftest.$ac_ext <<<<<<< HEAD @@ -115232,6 +120752,9 @@ rm -f core conftest.err conftest.$ac_objext \ ======= conftest$ac_exeext conftest.$ac_ext >>>>>>> osgeo-main +======= + conftest$ac_exeext conftest.$ac_ext +>>>>>>> osgeo-main ======= rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -115254,6 +120777,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -115289,6 +120813,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main LIBS=${ac_save_libs} CFLAGS=${ac_save_cflags} @@ -115312,6 +120838,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h ======= <<<<<<< HEAD @@ -115354,6 +120881,8 @@ $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_LIBLAS 1" >>confdefs.h ======= $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h @@ -115372,6 +120901,7 @@ $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -115455,6 +120985,11 @@ $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h $as_echo "#define HAVE_LIBLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_LIBLAS 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -115482,6 +121017,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use PDAL" >&5 $as_echo_n "checking whether to use PDAL... " >&6; } ======= @@ -115525,6 +121061,8 @@ $as_echo_n "checking whether to use PDAL... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use PDAL" >&5 printf %s "checking whether to use PDAL... " >&6; } ======= @@ -115545,6 +121083,7 @@ $as_echo_n "checking whether to use PDAL... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -115574,6 +121113,8 @@ $as_echo_n "checking whether to use PDAL... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use PDAL" >&5 $as_echo_n "checking whether to use PDAL... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -115591,6 +121132,7 @@ $as_echo_n "checking whether to use PDAL... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -115633,6 +121175,8 @@ $as_echo_n "checking whether to use PDAL... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -115663,6 +121207,7 @@ if test "$with_pdal" = "no" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -115707,6 +121252,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -115734,6 +121281,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -115762,6 +121310,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -115781,6 +121331,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -115822,6 +121373,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -115883,6 +121436,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -115973,6 +121527,11 @@ fi >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi @@ -116014,6 +121573,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -116058,6 +121618,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" <<<<<<< HEAD @@ -116080,6 +121642,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -116108,6 +121671,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" ======= @@ -116127,6 +121692,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -116202,6 +121768,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -116229,6 +121797,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main int @@ -116281,6 +121850,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) ======= @@ -116301,6 +121872,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -116337,6 +121909,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { pdal::PointTable table; ; @@ -116358,6 +121932,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -116395,6 +121970,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_cxx_try_link "$LINENO" then : PDAL_LIBS="$PDAL_LIBS" @@ -116418,6 +121995,7 @@ int main() { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -116447,6 +122025,8 @@ int main() { ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () { @@ -116463,6 +122043,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -116548,6 +122129,8 @@ $as_echo "#define HAVE_PDAL 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main pdal::PointTable table; ; return 0; @@ -116587,6 +122170,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD @@ -116693,6 +122277,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -116760,6 +122346,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -116794,6 +122381,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi rm -f core conftest.err conftest.$ac_objext \ @@ -116810,6 +122399,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= as_fn_error $? "*** Unable to locate suitable (>=1.7.1) PDAL library." "$LINENO" 5 @@ -116873,6 +122463,11 @@ fi as_fn_error $? "*** Unable to locate suitable (>=1.7.1) PDAL library." "$LINENO" 5 >>>>>>> osgeo-main +======= +======= + + as_fn_error $? "*** Unable to locate suitable (>=1.7.1) PDAL library." "$LINENO" 5 +>>>>>>> osgeo-main fi rm -f core conftest.err conftest.$ac_objext \ @@ -116892,6 +122487,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -116943,6 +122539,9 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=${ac_save_libs} @@ -116961,6 +122560,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6b0657b022 (Fix missing function prototypes (#2727)) ======= @@ -116989,6 +122589,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD ======= @@ -117005,6 +122607,7 @@ $as_echo "#define HAVE_PDAL 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= CPPFLAGS=${ac_save_cppflags} @@ -117059,6 +122662,8 @@ $as_echo "#define HAVE_PDAL 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main $as_echo "#define HAVE_PDAL 1" >>confdefs.h @@ -117100,6 +122705,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NetCDF" >&5 @@ -117152,6 +122758,8 @@ $as_echo_n "checking whether to use NetCDF... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NetCDF" >&5 printf %s "checking whether to use NetCDF... " >&6; } ======= @@ -117172,6 +122780,7 @@ echo "configure:7225: checking whether to use NetCDF" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -117201,6 +122810,8 @@ echo "configure:7225: checking whether to use NetCDF" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NetCDF" >&5 $as_echo_n "checking whether to use NetCDF... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -117218,6 +122829,7 @@ $as_echo_n "checking whether to use NetCDF... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -117247,6 +122859,8 @@ $as_echo_n "checking whether to use NetCDF... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NetCDF" >&5 $as_echo_n "checking whether to use NetCDF... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -117264,6 +122878,7 @@ $as_echo_n "checking whether to use NetCDF... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -117312,6 +122927,8 @@ $as_echo_n "checking whether to use NetCDF... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main NETCDF_LIBS= NETCDF_CFLAGS= @@ -117338,6 +122955,7 @@ if test "$with_netcdf" = "no" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -117388,6 +123006,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -117417,6 +123037,7 @@ echo "configure:7242: checking for $ac_word" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -117445,6 +123066,8 @@ echo "configure:7242: checking for $ac_word" >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -117470,6 +123093,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -117498,6 +123122,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -117523,6 +123149,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -117571,6 +123198,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $NETCDF_CONFIG in [\\/]* | ?:[\\/]*) @@ -117598,6 +123227,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -117638,6 +123268,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -117663,6 +123295,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -117731,6 +123364,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -117754,6 +123391,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -117844,6 +123482,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -117872,6 +123515,7 @@ if test -n "$NETCDF_CONFIG"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NETCDF_CONFIG" >&5 $as_echo "$NETCDF_CONFIG" >&6; } @@ -117918,6 +123562,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NETCDF_CONFIG" >&5 printf "%s\n" "$NETCDF_CONFIG" >&6; } @@ -117945,6 +123591,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -117973,6 +123620,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NETCDF_CONFIG" >&5 $as_echo "$NETCDF_CONFIG" >&6; } @@ -117994,6 +123643,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -118036,6 +123686,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -118076,6 +123728,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -118124,6 +123777,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -118145,6 +123800,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -118194,6 +123850,8 @@ nc_create("foo", NC_CLOBBER, NULL); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include int main (void) @@ -118214,6 +123872,7 @@ nc_create("foo", NC_CLOBBER, NULL); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -118242,6 +123901,8 @@ nc_create("foo", NC_CLOBBER, NULL); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -118265,6 +123926,7 @@ nc_create("foo", NC_CLOBBER, NULL); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -118293,6 +123955,8 @@ nc_create("foo", NC_CLOBBER, NULL); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -118316,6 +123980,7 @@ nc_create("foo", NC_CLOBBER, NULL); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -118363,6 +124028,8 @@ nc_create("foo", NC_CLOBBER, NULL); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -118385,6 +124052,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : else @@ -118437,6 +124105,8 @@ nc_create("foo", NC_CLOBBER, NULL); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -118478,6 +124148,7 @@ nc_create("foo", NC_CLOBBER, NULL); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -118507,6 +124178,8 @@ nc_create("foo", NC_CLOBBER, NULL); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : else @@ -118533,6 +124206,7 @@ nc_create("foo", NC_CLOBBER, NULL); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -118562,6 +124236,8 @@ nc_create("foo", NC_CLOBBER, NULL); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : else @@ -118588,6 +124264,7 @@ nc_create("foo", NC_CLOBBER, NULL); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -118635,6 +124312,8 @@ nc_create("foo", NC_CLOBBER, NULL); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -118657,6 +124336,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : NETCDF_LIBS="$NETCDF_LIBS" else @@ -118701,6 +124381,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ======= @@ -118730,6 +124412,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -118759,6 +124442,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : NETCDF_LIBS="$NETCDF_LIBS" else @@ -118777,6 +124462,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -118818,6 +124504,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate NetCDF library." "$LINENO" 5 @@ -118840,6 +124528,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -118887,6 +124576,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -118906,6 +124597,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -118933,6 +124625,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext @@ -118946,6 +124640,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) conftest$ac_exeext conftest.$ac_ext <<<<<<< HEAD @@ -119007,6 +124702,9 @@ rm -f core conftest.err conftest.$ac_objext \ ======= conftest$ac_exeext conftest.$ac_ext >>>>>>> osgeo-main +======= + conftest$ac_exeext conftest.$ac_ext +>>>>>>> osgeo-main ======= rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -119029,6 +124727,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -119064,6 +124763,8 @@ rm -f core conftest.err conftest.$ac_objext \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main LIBS=${ac_save_libs} CFLAGS=${ac_save_cflags} @@ -119086,6 +124787,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_NETCDF 1" >>confdefs.h ======= <<<<<<< HEAD @@ -119128,6 +124830,8 @@ $as_echo "#define HAVE_NETCDF 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_NETCDF 1" >>confdefs.h ======= $as_echo "#define HAVE_NETCDF 1" >>confdefs.h @@ -119146,6 +124850,7 @@ $as_echo "#define HAVE_NETCDF 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_NETCDF 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -119229,6 +124934,11 @@ $as_echo "#define HAVE_NETCDF 1" >>confdefs.h $as_echo "#define HAVE_NETCDF 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_NETCDF 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -119259,6 +124969,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GEOS" >&5 @@ -119311,6 +125022,8 @@ $as_echo_n "checking whether to use GEOS... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use GEOS" >&5 printf %s "checking whether to use GEOS... " >&6; } ======= @@ -119331,6 +125044,7 @@ echo "configure:7342: checking whether to use GEOS" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -119360,6 +125074,8 @@ echo "configure:7342: checking whether to use GEOS" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GEOS" >&5 $as_echo_n "checking whether to use GEOS... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -119377,6 +125093,7 @@ $as_echo_n "checking whether to use GEOS... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -119406,6 +125123,8 @@ $as_echo_n "checking whether to use GEOS... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GEOS" >&5 $as_echo_n "checking whether to use GEOS... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -119423,6 +125142,7 @@ $as_echo_n "checking whether to use GEOS... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -119471,6 +125191,8 @@ $as_echo_n "checking whether to use GEOS... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GEOS_LIBS= GEOS_CFLAGS= @@ -119498,6 +125220,7 @@ if test "$with_geos" = "no" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -119548,6 +125271,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -119577,6 +125302,7 @@ echo "configure:7360: checking for $ac_word" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -119605,6 +125331,8 @@ echo "configure:7360: checking for $ac_word" >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -119630,6 +125358,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -119658,6 +125387,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -119683,6 +125414,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -119731,6 +125463,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $GEOS_CONFIG in [\\/]* | ?:[\\/]*) @@ -119758,6 +125492,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -119798,6 +125533,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -119823,6 +125560,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -119891,6 +125629,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -119914,6 +125656,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -120004,6 +125747,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -120032,6 +125780,7 @@ if test -n "$GEOS_CONFIG"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GEOS_CONFIG" >&5 $as_echo "$GEOS_CONFIG" >&6; } @@ -120078,6 +125827,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GEOS_CONFIG" >&5 printf "%s\n" "$GEOS_CONFIG" >&6; } @@ -120105,6 +125856,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -120133,6 +125885,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GEOS_CONFIG" >&5 $as_echo "$GEOS_CONFIG" >&6; } @@ -120154,6 +125908,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -120196,6 +125951,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -120234,6 +125991,7 @@ CPPFLAGS="$GEOS_CFLAGS $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -120283,6 +126041,8 @@ CPPFLAGS="$GEOS_CFLAGS $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in geos_c.h do : @@ -120314,6 +126074,7 @@ echo "configure:7408: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -120393,6 +126154,11 @@ echo "configure:7408: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in geos_c.h do : ac_fn_c_check_header_mongrel "$LINENO" "geos_c.h" "ac_cv_header_geos_c_h" "$ac_includes_default" @@ -120417,6 +126183,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -120452,6 +126219,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -120466,6 +126235,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -120511,6 +126281,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -120543,6 +126315,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -120577,6 +126350,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -120608,6 +126383,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -120724,6 +126500,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -120758,6 +126536,7 @@ LDFLAGS="$GEOS_LIBS $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initGEOS in -lgeos_c" >&5 @@ -120795,6 +126574,8 @@ $as_echo_n "checking for initGEOS in -lgeos_c... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for initGEOS in -lgeos_c" >&5 printf %s "checking for initGEOS in -lgeos_c... " >&6; } ======= @@ -120815,6 +126596,7 @@ ac_lib_var=`echo geos_c'_'initGEOS | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -120849,6 +126631,8 @@ ac_lib_var=`echo geos_c'_'initGEOS | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lgeos_c $LIBS" @@ -120866,6 +126650,7 @@ LIBS="-lgeos_c $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -120929,6 +126714,8 @@ LIBS="-lgeos_c $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -120972,6 +126759,7 @@ char initGEOS(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -120995,6 +126783,8 @@ char initGEOS(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initGEOS in -lgeos_c" >&5 $as_echo_n "checking for initGEOS in -lgeos_c... " >&6; } @@ -121028,6 +126818,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -121056,6 +126847,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -121086,6 +126879,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_geos_c_initGEOS=no fi @@ -121243,6 +127037,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -121276,6 +127072,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -121304,6 +127101,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_geos_c_initGEOS=no fi @@ -121322,6 +127121,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -121364,6 +127164,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -121389,6 +127191,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -121480,6 +127283,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -121511,6 +127319,7 @@ LDFLAGS=${ac_save_ldflags} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_GEOS 1" >>confdefs.h ======= <<<<<<< HEAD @@ -121553,6 +127362,8 @@ $as_echo "#define HAVE_GEOS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_GEOS 1" >>confdefs.h ======= $as_echo "#define HAVE_GEOS 1" >>confdefs.h @@ -121571,6 +127382,7 @@ $as_echo "#define HAVE_GEOS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_GEOS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -121654,6 +127466,11 @@ $as_echo "#define HAVE_GEOS 1" >>confdefs.h $as_echo "#define HAVE_GEOS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_GEOS 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -121685,6 +127502,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -121735,6 +127553,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use TIFF" >&5 printf %s "checking whether to use TIFF... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_tiff\"" >&5 @@ -121758,6 +127578,7 @@ echo "$ac_t"""$with_tiff"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -121837,6 +127658,11 @@ echo "$ac_t"""$with_tiff"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use TIFF" >&5 $as_echo_n "checking whether to use TIFF... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_tiff\"" >&5 @@ -121858,6 +127684,7 @@ $as_echo "\"$with_tiff\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -121956,6 +127783,11 @@ $as_echo "\"$with_tiff\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_tiff" in "no") USE_TIFF= ;; "yes") USE_TIFF="1" ;; @@ -121994,6 +127826,7 @@ if test -n "$USE_TIFF"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of TIFF includes" >&5 @@ -122046,6 +127879,8 @@ $as_echo_n "checking for location of TIFF includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of TIFF includes" >&5 printf %s "checking for location of TIFF includes... " >&6; } ======= @@ -122066,6 +127901,7 @@ echo "configure:7536: checking for location of TIFF includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -122095,6 +127931,8 @@ echo "configure:7536: checking for location of TIFF includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of TIFF includes" >&5 $as_echo_n "checking for location of TIFF includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -122112,6 +127950,7 @@ $as_echo_n "checking for location of TIFF includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -122141,6 +127980,8 @@ $as_echo_n "checking for location of TIFF includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of TIFF includes" >&5 $as_echo_n "checking for location of TIFF includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -122158,6 +127999,7 @@ $as_echo_n "checking for location of TIFF includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -122206,6 +128048,8 @@ $as_echo_n "checking for location of TIFF includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_tiff_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-tiff-includes." "$LINENO" 5 @@ -122228,6 +128072,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tiff_includes" >&5 $as_echo "$with_tiff_includes" >&6; } ======= @@ -122271,6 +128116,8 @@ $as_echo "$with_tiff_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tiff_includes" >&5 printf "%s\n" "$with_tiff_includes" >&6; } ======= @@ -122291,6 +128138,7 @@ $as_echo "$with_tiff_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -122320,6 +128168,8 @@ $as_echo "$with_tiff_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tiff_includes" >&5 $as_echo "$with_tiff_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -122337,6 +128187,7 @@ $as_echo "$with_tiff_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -122379,6 +128230,8 @@ $as_echo "$with_tiff_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_tiff_includes" ; then for dir in $with_tiff_includes; do @@ -122415,6 +128268,7 @@ CPPFLAGS="$TIFF_INCLUDE_DIRS $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -122464,6 +128318,8 @@ CPPFLAGS="$TIFF_INCLUDE_DIRS $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in tiffio.h do : @@ -122495,6 +128351,7 @@ echo "configure:7562: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -122574,6 +128431,11 @@ echo "configure:7562: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in tiffio.h do : ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" @@ -122598,6 +128460,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -122633,6 +128496,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -122647,6 +128512,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -122692,6 +128558,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -122724,6 +128592,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -122758,6 +128627,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -122789,6 +128660,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -122905,6 +128777,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -122934,6 +128808,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of TIFF library" >&5 @@ -122986,6 +128861,8 @@ $as_echo_n "checking for location of TIFF library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of TIFF library" >&5 printf %s "checking for location of TIFF library... " >&6; } ======= @@ -123006,6 +128883,7 @@ echo "configure:7604: checking for location of TIFF library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -123035,6 +128913,8 @@ echo "configure:7604: checking for location of TIFF library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of TIFF library" >&5 $as_echo_n "checking for location of TIFF library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -123052,6 +128932,7 @@ $as_echo_n "checking for location of TIFF library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -123081,6 +128962,8 @@ $as_echo_n "checking for location of TIFF library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of TIFF library" >&5 $as_echo_n "checking for location of TIFF library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -123098,6 +128981,7 @@ $as_echo_n "checking for location of TIFF library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -123146,6 +129030,8 @@ $as_echo_n "checking for location of TIFF library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_tiff_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-tiff-libs." "$LINENO" 5 @@ -123168,6 +129054,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tiff_libs" >&5 $as_echo "$with_tiff_libs" >&6; } ======= @@ -123211,6 +129098,8 @@ $as_echo "$with_tiff_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tiff_libs" >&5 printf "%s\n" "$with_tiff_libs" >&6; } ======= @@ -123231,6 +129120,7 @@ $as_echo "$with_tiff_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -123260,6 +129150,8 @@ $as_echo "$with_tiff_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tiff_libs" >&5 $as_echo "$with_tiff_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -123277,6 +129169,7 @@ $as_echo "$with_tiff_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -123319,6 +129212,8 @@ $as_echo "$with_tiff_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_tiff_libs"; then for dir in $with_tiff_libs; do @@ -123363,6 +129258,7 @@ LDFLAGS="$TIFF_LIBRARY_DIRS $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 @@ -123400,6 +129296,8 @@ $as_echo_n "checking for TIFFOpen in -ltiff... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 printf %s "checking for TIFFOpen in -ltiff... " >&6; } ======= @@ -123420,6 +129318,7 @@ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -123454,6 +129353,8 @@ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff $LIBS" @@ -123471,6 +129372,7 @@ LIBS="-ltiff $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -123534,6 +129436,8 @@ LIBS="-ltiff $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -123577,6 +129481,7 @@ char TIFFOpen(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -123600,6 +129505,8 @@ char TIFFOpen(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 $as_echo_n "checking for TIFFOpen in -ltiff... " >&6; } @@ -123633,6 +129540,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -123661,6 +129569,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -123691,6 +129601,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_tiff_TIFFOpen=no fi @@ -123848,6 +129759,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -123920,6 +129833,7 @@ char TIFFOpen(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -123942,6 +129856,8 @@ char TIFFOpen(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_tiff_TIFFOpen=no fi @@ -123963,6 +129879,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -124014,6 +129931,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -124033,6 +129952,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -124052,6 +129972,8 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 @@ -124073,6 +129995,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -124141,6 +130064,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -124172,6 +130100,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -124293,6 +130222,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -124364,6 +130295,7 @@ char TIFFOpen(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -124442,6 +130374,11 @@ char TIFFOpen(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_tiff_TIFFOpen=no fi @@ -124464,6 +130401,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -124483,6 +130421,8 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 @@ -124504,6 +130444,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -124572,6 +130513,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -124603,6 +130549,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -124724,6 +130671,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -124795,6 +130744,7 @@ char TIFFOpen(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -124873,6 +130823,11 @@ char TIFFOpen(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_tiff_TIFFOpen=no fi @@ -124895,6 +130850,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -124914,6 +130870,8 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 @@ -124935,6 +130893,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -125003,6 +130962,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -125034,6 +130998,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -125155,6 +131120,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -125226,6 +131193,7 @@ char TIFFOpen(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -125304,6 +131272,11 @@ char TIFFOpen(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_tiff_TIFFOpen=no fi @@ -125326,6 +131299,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -125345,6 +131319,8 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 @@ -125366,6 +131342,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -125434,6 +131411,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -125465,6 +131447,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -125586,6 +131569,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -125657,6 +131642,7 @@ char TIFFOpen(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -125735,6 +131721,11 @@ char TIFFOpen(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_tiff_TIFFOpen=no fi @@ -125757,6 +131748,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -125776,6 +131768,8 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 @@ -125797,6 +131791,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -125865,6 +131860,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -125896,6 +131896,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -126017,6 +132018,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -126088,6 +132091,7 @@ char TIFFOpen(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -126166,6 +132170,11 @@ char TIFFOpen(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_tiff_TIFFOpen=no fi @@ -126188,6 +132197,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -126207,6 +132217,8 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 @@ -126228,6 +132240,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -126296,6 +132309,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -126327,6 +132345,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -126448,6 +132467,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -126519,6 +132540,7 @@ char TIFFOpen(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -126597,6 +132619,11 @@ char TIFFOpen(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_tiff_TIFFOpen=no fi @@ -126619,6 +132646,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -126638,6 +132666,8 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5 @@ -126659,6 +132689,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -126727,6 +132758,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -126758,6 +132794,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -126881,6 +132918,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -126914,6 +132953,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -126942,6 +132982,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_tiff_TIFFOpen=no fi @@ -126960,6 +133002,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -127002,6 +133045,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -127027,6 +133072,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -127118,6 +133164,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -127216,6 +133267,7 @@ fi # $USE_TIFF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # Enable PostgreSQL option @@ -127269,6 +133321,8 @@ fi # $USE_TIFF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Enable PostgreSQL option @@ -127469,6 +133523,7 @@ echo "$ac_t"""$with_postgres"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -127498,6 +133553,8 @@ echo "$ac_t"""$with_postgres"" 1>&6 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Enable PostgreSQL option @@ -127515,6 +133572,7 @@ echo "$ac_t"""$with_postgres"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -127544,6 +133602,8 @@ echo "$ac_t"""$with_postgres"" 1>&6 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Enable PostgreSQL option @@ -127562,6 +133622,7 @@ echo "$ac_t"""$with_postgres"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -127604,6 +133665,8 @@ echo "$ac_t"""$with_postgres"" 1>&6 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use PostgreSQL" >&5 $as_echo_n "checking whether to use PostgreSQL... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_postgres\"" >&5 @@ -127625,6 +133688,7 @@ $as_echo "\"$with_postgres\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -127723,6 +133787,11 @@ $as_echo "\"$with_postgres\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_postgres" in "no") USE_POSTGRES= ;; "yes") USE_POSTGRES="1" ;; @@ -127750,6 +133819,7 @@ if test -n "$USE_POSTGRES"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h ======= <<<<<<< HEAD @@ -127792,6 +133862,8 @@ $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_POSTGRES 1" >>confdefs.h ======= $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h @@ -127810,6 +133882,7 @@ $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -127893,6 +133966,11 @@ $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h $as_echo "#define HAVE_POSTGRES 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_POSTGRES 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $USE_POSTGRES @@ -127926,6 +134004,7 @@ if test -n "$USE_POSTGRES"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL includes" >&5 @@ -127978,6 +134057,8 @@ $as_echo_n "checking for location of PostgreSQL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL includes" >&5 printf %s "checking for location of PostgreSQL includes... " >&6; } ======= @@ -127998,6 +134079,7 @@ echo "configure:8200: checking for location of PostgreSQL includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -128027,6 +134109,8 @@ echo "configure:8200: checking for location of PostgreSQL includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL includes" >&5 $as_echo_n "checking for location of PostgreSQL includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -128044,6 +134128,7 @@ $as_echo_n "checking for location of PostgreSQL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -128073,6 +134158,8 @@ $as_echo_n "checking for location of PostgreSQL includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL includes" >&5 $as_echo_n "checking for location of PostgreSQL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -128090,6 +134177,7 @@ $as_echo_n "checking for location of PostgreSQL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -128138,6 +134226,8 @@ $as_echo_n "checking for location of PostgreSQL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_postgres_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-postgres-includes." "$LINENO" 5 @@ -128160,6 +134250,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_postgres_includes" >&5 $as_echo "$with_postgres_includes" >&6; } ======= @@ -128203,6 +134294,8 @@ $as_echo "$with_postgres_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_postgres_includes" >&5 printf "%s\n" "$with_postgres_includes" >&6; } ======= @@ -128223,6 +134316,7 @@ $as_echo "$with_postgres_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -128252,6 +134346,8 @@ $as_echo "$with_postgres_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_postgres_includes" >&5 $as_echo "$with_postgres_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -128269,6 +134365,7 @@ $as_echo "$with_postgres_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -128311,6 +134408,8 @@ $as_echo "$with_postgres_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_postgres_includes" ; then for dir in $with_postgres_includes; do @@ -128347,6 +134446,7 @@ CPPFLAGS="$PQINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -128396,6 +134496,8 @@ CPPFLAGS="$PQINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in libpq-fe.h do : @@ -128427,6 +134529,7 @@ echo "configure:8226: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -128506,6 +134609,11 @@ echo "configure:8226: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in libpq-fe.h do : ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default" @@ -128530,6 +134638,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -128565,6 +134674,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -128579,6 +134690,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -128624,6 +134736,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -128656,6 +134770,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -128690,6 +134805,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -128721,6 +134838,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -128837,6 +134955,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -128870,6 +134990,7 @@ if test -n "$USE_POSTGRES"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL library" >&5 @@ -128922,6 +135043,8 @@ $as_echo_n "checking for location of PostgreSQL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL library" >&5 printf %s "checking for location of PostgreSQL library... " >&6; } ======= @@ -128942,6 +135065,7 @@ echo "configure:8272: checking for location of PostgreSQL library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -128971,6 +135095,8 @@ echo "configure:8272: checking for location of PostgreSQL library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL library" >&5 $as_echo_n "checking for location of PostgreSQL library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -128988,6 +135114,7 @@ $as_echo_n "checking for location of PostgreSQL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -129017,6 +135144,8 @@ $as_echo_n "checking for location of PostgreSQL library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of PostgreSQL library" >&5 $as_echo_n "checking for location of PostgreSQL library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -129034,6 +135163,7 @@ $as_echo_n "checking for location of PostgreSQL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -129082,6 +135212,8 @@ $as_echo_n "checking for location of PostgreSQL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_postgres_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-postgres-libs." "$LINENO" 5 @@ -129104,6 +135236,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_postgres_libs" >&5 $as_echo "$with_postgres_libs" >&6; } ======= @@ -129147,6 +135280,8 @@ $as_echo "$with_postgres_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_postgres_libs" >&5 printf "%s\n" "$with_postgres_libs" >&6; } ======= @@ -129167,6 +135302,7 @@ $as_echo "$with_postgres_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -129196,6 +135332,8 @@ $as_echo "$with_postgres_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_postgres_libs" >&5 $as_echo "$with_postgres_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -129213,6 +135351,7 @@ $as_echo "$with_postgres_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -129255,6 +135394,8 @@ $as_echo "$with_postgres_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_postgres_libs"; then for dir in $with_postgres_libs; do @@ -129297,6 +135438,7 @@ LDFLAGS="$PQLIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 @@ -129334,6 +135476,8 @@ $as_echo_n "checking for PQsetdbLogin in -lpq... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 printf %s "checking for PQsetdbLogin in -lpq... " >&6; } ======= @@ -129354,6 +135498,7 @@ ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -129388,6 +135533,8 @@ ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" @@ -129405,6 +135552,7 @@ LIBS="-lpq $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -129468,6 +135616,8 @@ LIBS="-lpq $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -129511,6 +135661,7 @@ char PQsetdbLogin(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -129534,6 +135685,8 @@ char PQsetdbLogin(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 $as_echo_n "checking for PQsetdbLogin in -lpq... " >&6; } @@ -129567,6 +135720,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -129595,6 +135749,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -129625,6 +135781,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_pq_PQsetdbLogin=no fi @@ -129782,6 +135939,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -129854,6 +136013,7 @@ char PQsetdbLogin(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -129876,6 +136036,8 @@ char PQsetdbLogin(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_pq_PQsetdbLogin=no fi @@ -129897,6 +136059,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -129948,6 +136111,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -129967,6 +136132,7 @@ if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -129986,6 +136152,8 @@ if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 @@ -130007,6 +136175,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -130075,6 +136244,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -130106,6 +136280,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -130227,6 +136402,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -130298,6 +136475,7 @@ char PQsetdbLogin(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -130376,6 +136554,11 @@ char PQsetdbLogin(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_pq_PQsetdbLogin=no fi @@ -130398,6 +136581,7 @@ if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -130417,6 +136601,8 @@ if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 @@ -130438,6 +136624,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -130506,6 +136693,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -130537,6 +136729,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -130658,6 +136851,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -130729,6 +136924,7 @@ char PQsetdbLogin(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -130807,6 +137003,11 @@ char PQsetdbLogin(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_pq_PQsetdbLogin=no fi @@ -130829,6 +137030,7 @@ if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -130848,6 +137050,8 @@ if test "x$ac_cv_lib_pq_PQsetdbLogin" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetdbLogin in -lpq" >&5 @@ -130869,6 +137073,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -130937,6 +137142,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -130968,6 +137178,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -131091,6 +137302,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -131124,6 +137337,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -131152,6 +137366,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_pq_PQsetdbLogin=no fi @@ -131170,6 +137386,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -131212,6 +137429,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -131237,6 +137456,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -131328,6 +137548,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -131388,6 +137613,7 @@ LDFLAGS="$LDFLAGS $PQLIBPATH" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 @@ -131425,6 +137651,8 @@ $as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 printf %s "checking for PQcmdTuples in -lpq... " >&6; } ======= @@ -131445,6 +137673,7 @@ ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -131479,6 +137708,8 @@ ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lpq $LIBS" @@ -131496,6 +137727,7 @@ LIBS="-lpq $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -131559,6 +137791,8 @@ LIBS="-lpq $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -131601,6 +137835,7 @@ char PQcmdTuples(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -131630,6 +137865,8 @@ char PQcmdTuples(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 $as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } @@ -131653,6 +137890,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -131682,6 +137920,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5 $as_echo_n "checking for PQcmdTuples in -lpq... " >&6; } @@ -131705,6 +137945,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -131743,6 +137984,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -131775,6 +138018,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_pq_PQcmdTuples=no ======= @@ -131989,6 +138233,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -132280,6 +138526,7 @@ ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -132299,6 +138546,8 @@ ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lpq -lcrypt $LIBS" @@ -132319,6 +138568,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main char PQcmdTuples (); @@ -132374,6 +138624,11 @@ char PQcmdTuples (); int main (void) >>>>>>> osgeo-main +======= +char PQcmdTuples (); +int +main (void) +>>>>>>> osgeo-main { return PQcmdTuples (); ; @@ -132390,6 +138645,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pq_PQcmdTuples=yes else @@ -132412,6 +138668,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pq_PQcmdTuples=yes @@ -132425,6 +138683,9 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -132511,6 +138772,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -132539,6 +138801,8 @@ if test "x$ac_cv_lib_pq_PQcmdTuples" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -132556,6 +138820,9 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -132593,6 +138860,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -132779,6 +139047,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -132794,6 +139064,7 @@ $as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -132808,6 +139079,8 @@ $as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else @@ -132855,6 +139128,7 @@ $as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD @@ -132933,6 +139207,11 @@ $as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -132975,6 +139254,7 @@ fi # $USE_POSTGRES <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -133025,6 +139305,8 @@ fi # $USE_POSTGRES >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use MySQL" >&5 printf %s "checking whether to use MySQL... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_mysql\"" >&5 @@ -133048,6 +139330,7 @@ echo "$ac_t"""$with_mysql"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -133127,6 +139410,11 @@ echo "$ac_t"""$with_mysql"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use MySQL" >&5 $as_echo_n "checking whether to use MySQL... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_mysql\"" >&5 @@ -133148,6 +139436,7 @@ $as_echo "\"$with_mysql\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -133246,6 +139535,11 @@ $as_echo "\"$with_mysql\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_mysql" in "no") USE_MYSQL= ;; "yes") USE_MYSQL="1" ;; @@ -133284,6 +139578,7 @@ if test -n "$USE_MYSQL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of MySQL includes" >&5 @@ -133336,6 +139631,8 @@ $as_echo_n "checking for location of MySQL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of MySQL includes" >&5 printf %s "checking for location of MySQL includes... " >&6; } ======= @@ -133356,6 +139653,7 @@ echo "configure:8602: checking for location of MySQL includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -133385,6 +139683,8 @@ echo "configure:8602: checking for location of MySQL includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of MySQL includes" >&5 $as_echo_n "checking for location of MySQL includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -133402,6 +139702,7 @@ $as_echo_n "checking for location of MySQL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -133431,6 +139732,8 @@ $as_echo_n "checking for location of MySQL includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of MySQL includes" >&5 $as_echo_n "checking for location of MySQL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -133448,6 +139751,7 @@ $as_echo_n "checking for location of MySQL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -133496,6 +139800,8 @@ $as_echo_n "checking for location of MySQL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_mysql_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-mysql-includes." "$LINENO" 5 @@ -133518,6 +139824,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_mysql_includes" >&5 $as_echo "$with_mysql_includes" >&6; } ======= @@ -133561,6 +139868,8 @@ $as_echo "$with_mysql_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_mysql_includes" >&5 printf "%s\n" "$with_mysql_includes" >&6; } ======= @@ -133581,6 +139890,7 @@ $as_echo "$with_mysql_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -133610,6 +139920,8 @@ $as_echo "$with_mysql_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_mysql_includes" >&5 $as_echo "$with_mysql_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -133627,6 +139939,7 @@ $as_echo "$with_mysql_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -133669,6 +139982,8 @@ $as_echo "$with_mysql_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_mysql_includes" ; then for dir in $with_mysql_includes; do @@ -133705,6 +140020,7 @@ CPPFLAGS="$MYSQLINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -133754,6 +140070,8 @@ CPPFLAGS="$MYSQLINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in mysql.h do : @@ -133785,6 +140103,7 @@ echo "configure:8628: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -133864,6 +140183,11 @@ echo "configure:8628: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in mysql.h do : ac_fn_c_check_header_mongrel "$LINENO" "mysql.h" "ac_cv_header_mysql_h" "$ac_includes_default" @@ -133888,6 +140212,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -133923,6 +140248,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -133937,6 +140264,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -133982,6 +140310,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -134014,6 +140344,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -134048,6 +140379,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -134079,6 +140412,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -134195,6 +140529,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -134226,6 +140562,7 @@ if test -n "$USE_MYSQL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main @@ -134279,6 +140616,8 @@ $as_echo_n "checking for location of MySQL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of MySQL library" >&5 printf %s "checking for location of MySQL library... " >&6; } @@ -134301,6 +140640,7 @@ echo "configure:8673: checking for location of MySQL library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -134330,6 +140670,8 @@ echo "configure:8673: checking for location of MySQL library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of MySQL library" >&5 $as_echo_n "checking for location of MySQL library... " >&6; } @@ -134348,6 +140690,7 @@ $as_echo_n "checking for location of MySQL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -134377,6 +140720,8 @@ $as_echo_n "checking for location of MySQL library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of MySQL library" >&5 $as_echo_n "checking for location of MySQL library... " >&6; } @@ -134395,6 +140740,7 @@ $as_echo_n "checking for location of MySQL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -134443,6 +140789,8 @@ $as_echo_n "checking for location of MySQL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_mysql_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-mysql-libs." "$LINENO" 5 @@ -134465,6 +140813,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_mysql_libs" >&5 $as_echo "$with_mysql_libs" >&6; } ======= @@ -134508,6 +140857,8 @@ $as_echo "$with_mysql_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_mysql_libs" >&5 printf "%s\n" "$with_mysql_libs" >&6; } ======= @@ -134528,6 +140879,7 @@ $as_echo "$with_mysql_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -134557,6 +140909,8 @@ $as_echo "$with_mysql_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_mysql_libs" >&5 $as_echo "$with_mysql_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -134574,6 +140928,7 @@ $as_echo "$with_mysql_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -134616,6 +140971,8 @@ $as_echo "$with_mysql_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_mysql_libs"; then for dir in $with_mysql_libs; do @@ -134660,6 +141017,7 @@ LDFLAGS="$MYSQLLIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 @@ -134697,6 +141055,8 @@ $as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 printf %s "checking for mysql_query in -lmysqlclient... " >&6; } ======= @@ -134717,6 +141077,7 @@ ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -134751,6 +141112,8 @@ ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lmysqlclient $LIBS" @@ -134768,6 +141131,7 @@ LIBS="-lmysqlclient $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -134831,6 +141195,8 @@ LIBS="-lmysqlclient $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -134874,6 +141240,7 @@ char mysql_query(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -134897,6 +141264,8 @@ char mysql_query(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 $as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } @@ -134930,6 +141299,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -134958,6 +141328,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -134988,6 +141360,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_mysqlclient_mysql_query=no fi @@ -135145,6 +141518,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -135217,6 +141592,7 @@ char mysql_query(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -135239,6 +141615,8 @@ char mysql_query(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_mysqlclient_mysql_query=no fi @@ -135260,6 +141638,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -135311,6 +141690,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -135330,6 +141711,7 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -135349,6 +141731,8 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 @@ -135370,6 +141754,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -135438,6 +141823,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -135469,6 +141859,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -135590,6 +141981,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -135661,6 +142054,7 @@ char mysql_query(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -135739,6 +142133,11 @@ char mysql_query(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_mysqlclient_mysql_query=no fi @@ -135761,6 +142160,7 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -135780,6 +142180,8 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 @@ -135801,6 +142203,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -135869,6 +142272,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -135900,6 +142308,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -136021,6 +142430,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -136092,6 +142503,7 @@ char mysql_query(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -136170,6 +142582,11 @@ char mysql_query(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_mysqlclient_mysql_query=no fi @@ -136192,6 +142609,7 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -136211,6 +142629,8 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 @@ -136232,6 +142652,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -136300,6 +142721,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -136331,6 +142757,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -136452,6 +142879,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -136523,6 +142952,7 @@ char mysql_query(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -136601,6 +143031,11 @@ char mysql_query(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_mysqlclient_mysql_query=no fi @@ -136623,6 +143058,7 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -136642,6 +143078,8 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 @@ -136663,6 +143101,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -136731,6 +143170,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -136762,6 +143206,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -136883,6 +143328,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -136954,6 +143401,7 @@ char mysql_query(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -137032,6 +143480,11 @@ char mysql_query(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_mysqlclient_mysql_query=no fi @@ -137054,6 +143507,7 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -137073,6 +143527,8 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 @@ -137094,6 +143550,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -137162,6 +143619,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -137193,6 +143655,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -137314,6 +143777,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -137385,6 +143850,7 @@ char mysql_query(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -137463,6 +143929,11 @@ char mysql_query(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_mysqlclient_mysql_query=no fi @@ -137485,6 +143956,7 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -137504,6 +143976,8 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 @@ -137525,6 +143999,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -137593,6 +144068,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -137624,6 +144104,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -137745,6 +144226,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -137816,6 +144299,7 @@ char mysql_query(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -137894,6 +144378,11 @@ char mysql_query(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_mysqlclient_mysql_query=no fi @@ -137916,6 +144405,7 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -137935,6 +144425,8 @@ if test "x$ac_cv_lib_mysqlclient_mysql_query" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 @@ -137956,6 +144448,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -138024,6 +144517,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -138055,6 +144553,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -138178,6 +144677,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -138211,6 +144712,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -138239,6 +144741,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_mysqlclient_mysql_query=no fi @@ -138257,6 +144761,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -138299,6 +144804,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -138324,6 +144831,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -138415,6 +144923,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -138508,6 +145021,7 @@ set dummy mysql_config; ac_word=$2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -138560,6 +145074,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } ======= @@ -138580,6 +145096,7 @@ echo "configure:9063: checking for $ac_word" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -138609,6 +145126,8 @@ echo "configure:9063: checking for $ac_word" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -138626,6 +145145,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -138655,6 +145175,8 @@ $as_echo_n "checking for $ac_word... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -138672,6 +145194,7 @@ $as_echo_n "checking for $ac_word... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -138720,6 +145243,8 @@ $as_echo_n "checking for $ac_word... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case $MYSQLD_CONFIG in [\\/]* | ?:[\\/]*) @@ -138747,6 +145272,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -138787,6 +145313,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -138812,6 +145340,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -138880,6 +145409,10 @@ do ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -138903,6 +145436,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -138993,6 +145527,11 @@ do >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break 2 fi @@ -139021,6 +145560,7 @@ if test -n "$MYSQLD_CONFIG"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLD_CONFIG" >&5 $as_echo "$MYSQLD_CONFIG" >&6; } @@ -139067,6 +145607,8 @@ $as_echo "no" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQLD_CONFIG" >&5 printf "%s\n" "$MYSQLD_CONFIG" >&6; } @@ -139094,6 +145636,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -139122,6 +145665,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLD_CONFIG" >&5 $as_echo "$MYSQLD_CONFIG" >&6; } @@ -139143,6 +145688,7 @@ $as_echo "no" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -139185,6 +145731,8 @@ $as_echo "no" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -139211,6 +145759,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -139251,6 +145800,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main mysql_version=`"$MYSQLD_CONFIG" --version` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using MySQL/MariaDB version \"$mysql_version\"" >&5 @@ -139271,6 +145822,7 @@ printf "%s\n" "using MySQL/MariaDB version \"$mysql_version\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -139339,6 +145891,10 @@ printf "%s\n" "using MySQL/MariaDB version \"$mysql_version\"" >&6; } ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -139371,6 +145927,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_cxx_check_func "$LINENO" "mysql_server_init" "ac_cv_func_mysql_server_init" @@ -139427,6 +145984,8 @@ $as_echo "$as_me: WARNING: libmysqld not found" >&2;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_fn_cxx_check_func "$LINENO" "mysql_server_init" "ac_cv_func_mysql_server_init" if test "x$ac_cv_func_mysql_server_init" = xyes @@ -139453,6 +146012,7 @@ echo "configure:9112: checking for mysql_server_init" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -139481,6 +146041,8 @@ echo "configure:9112: checking for mysql_server_init" >&5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_fn_cxx_check_func "$LINENO" "mysql_server_init" "ac_cv_func_mysql_server_init" if test "x$ac_cv_func_mysql_server_init" = xyes; then : @@ -139497,6 +146059,7 @@ if test "x$ac_cv_func_mysql_server_init" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -139582,6 +146145,11 @@ else >>>>>>> osgeo-main ======= +else +<<<<<<< HEAD +>>>>>>> osgeo-main +======= + else <<<<<<< HEAD >>>>>>> osgeo-main @@ -139614,6 +146182,7 @@ MYSQLDLIB=""; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -139642,6 +146211,8 @@ MYSQLDLIB=""; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= MYSQLDLIB=""; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmysqld not found" >&5 @@ -139661,6 +146232,7 @@ $as_echo "$as_me: WARNING: libmysqld not found" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -139689,6 +146261,8 @@ $as_echo "$as_me: WARNING: libmysqld not found" >&2;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_fn_cxx_check_func "$LINENO" "mysql_server_init" "ac_cv_func_mysql_server_init" if test "x$ac_cv_func_mysql_server_init" = xyes; then : @@ -139712,6 +146286,7 @@ $as_echo "$as_me: WARNING: libmysqld not found" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -139760,6 +146335,8 @@ $as_echo "$as_me: WARNING: libmysqld not found" >&2;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi LIBS=$ac_save_libs @@ -139806,6 +146383,7 @@ fi # $USE_MYSQL <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -139856,6 +146434,8 @@ fi # $USE_MYSQL >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use SQLite" >&5 printf %s "checking whether to use SQLite... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_sqlite\"" >&5 @@ -139879,6 +146459,7 @@ echo "$ac_t"""$with_sqlite"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -139958,6 +146539,11 @@ echo "$ac_t"""$with_sqlite"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use SQLite" >&5 $as_echo_n "checking whether to use SQLite... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_sqlite\"" >&5 @@ -139979,6 +146565,7 @@ $as_echo "\"$with_sqlite\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -140077,6 +146664,11 @@ $as_echo "\"$with_sqlite\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_sqlite" in "no") USE_SQLITE= ;; "yes") USE_SQLITE="1" ;; @@ -140115,6 +146707,7 @@ if test -n "$USE_SQLITE"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of SQLite includes" >&5 @@ -140167,6 +146760,8 @@ $as_echo_n "checking for location of SQLite includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of SQLite includes" >&5 printf %s "checking for location of SQLite includes... " >&6; } ======= @@ -140187,6 +146782,7 @@ echo "configure:9213: checking for location of SQLite includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -140216,6 +146812,8 @@ echo "configure:9213: checking for location of SQLite includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of SQLite includes" >&5 $as_echo_n "checking for location of SQLite includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -140233,6 +146831,7 @@ $as_echo_n "checking for location of SQLite includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -140262,6 +146861,8 @@ $as_echo_n "checking for location of SQLite includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of SQLite includes" >&5 $as_echo_n "checking for location of SQLite includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -140279,6 +146880,7 @@ $as_echo_n "checking for location of SQLite includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -140327,6 +146929,8 @@ $as_echo_n "checking for location of SQLite includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_sqlite_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-sqlite-includes." "$LINENO" 5 @@ -140349,6 +146953,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_includes" >&5 $as_echo "$with_sqlite_includes" >&6; } ======= @@ -140392,6 +146997,8 @@ $as_echo "$with_sqlite_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_includes" >&5 printf "%s\n" "$with_sqlite_includes" >&6; } ======= @@ -140412,6 +147019,7 @@ $as_echo "$with_sqlite_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -140441,6 +147049,8 @@ $as_echo "$with_sqlite_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_includes" >&5 $as_echo "$with_sqlite_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -140458,6 +147068,7 @@ $as_echo "$with_sqlite_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -140500,6 +147111,8 @@ $as_echo "$with_sqlite_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_sqlite_includes" ; then for dir in $with_sqlite_includes; do @@ -140536,6 +147149,7 @@ CPPFLAGS="$SQLITEINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -140585,6 +147199,8 @@ CPPFLAGS="$SQLITEINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in sqlite3.h do : @@ -140616,6 +147232,7 @@ echo "configure:9239: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -140695,6 +147312,11 @@ echo "configure:9239: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in sqlite3.h do : ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default" @@ -140719,6 +147341,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -140754,6 +147377,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -140768,6 +147393,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -140813,6 +147439,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -140845,6 +147473,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -140879,6 +147508,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -140910,6 +147541,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -141026,6 +147658,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -141049,6 +147683,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_SQLITE 1" >>confdefs.h ======= <<<<<<< HEAD @@ -141091,6 +147726,8 @@ $as_echo "#define HAVE_SQLITE 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_SQLITE 1" >>confdefs.h ======= $as_echo "#define HAVE_SQLITE 1" >>confdefs.h @@ -141109,6 +147746,7 @@ $as_echo "#define HAVE_SQLITE 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_SQLITE 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -141192,6 +147830,11 @@ $as_echo "#define HAVE_SQLITE 1" >>confdefs.h $as_echo "#define HAVE_SQLITE 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_SQLITE 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $USE_SQLITE @@ -141222,6 +147865,7 @@ if test -n "$USE_SQLITE"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of SQLite library" >&5 @@ -141274,6 +147918,8 @@ $as_echo_n "checking for location of SQLite library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of SQLite library" >&5 printf %s "checking for location of SQLite library... " >&6; } ======= @@ -141294,6 +147940,7 @@ echo "configure:9290: checking for location of SQLite library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -141323,6 +147970,8 @@ echo "configure:9290: checking for location of SQLite library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of SQLite library" >&5 $as_echo_n "checking for location of SQLite library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -141340,6 +147989,7 @@ $as_echo_n "checking for location of SQLite library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -141369,6 +148019,8 @@ $as_echo_n "checking for location of SQLite library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of SQLite library" >&5 $as_echo_n "checking for location of SQLite library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -141386,6 +148038,7 @@ $as_echo_n "checking for location of SQLite library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -141434,6 +148087,8 @@ $as_echo_n "checking for location of SQLite library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_sqlite_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-sqlite-libs." "$LINENO" 5 @@ -141456,6 +148111,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_libs" >&5 $as_echo "$with_sqlite_libs" >&6; } ======= @@ -141499,6 +148155,8 @@ $as_echo "$with_sqlite_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_libs" >&5 printf "%s\n" "$with_sqlite_libs" >&6; } ======= @@ -141519,6 +148177,7 @@ $as_echo "$with_sqlite_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -141548,6 +148207,8 @@ $as_echo "$with_sqlite_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sqlite_libs" >&5 $as_echo "$with_sqlite_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -141565,6 +148226,7 @@ $as_echo "$with_sqlite_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -141607,6 +148269,8 @@ $as_echo "$with_sqlite_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_sqlite_libs"; then for dir in $with_sqlite_libs; do @@ -141649,6 +148313,7 @@ LDFLAGS="$SQLITELIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 @@ -141686,6 +148351,8 @@ $as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 printf %s "checking for sqlite3_open in -lsqlite3... " >&6; } ======= @@ -141706,6 +148373,7 @@ ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -141740,6 +148408,8 @@ ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 $LIBS" @@ -141757,6 +148427,7 @@ LIBS="-lsqlite3 $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -141820,6 +148491,8 @@ LIBS="-lsqlite3 $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -141863,6 +148536,7 @@ char sqlite3_open(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -141886,6 +148560,8 @@ char sqlite3_open(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 $as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; } @@ -141919,6 +148595,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -141947,6 +148624,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -141977,6 +148656,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_sqlite3_sqlite3_open=no fi @@ -142134,6 +148814,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -142206,6 +148888,7 @@ char sqlite3_open(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -142228,6 +148911,8 @@ char sqlite3_open(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_sqlite3_sqlite3_open=no fi @@ -142249,6 +148934,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -142300,6 +148986,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -142319,6 +149007,7 @@ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -142338,6 +149027,8 @@ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 @@ -142359,6 +149050,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -142427,6 +149119,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -142458,6 +149155,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -142579,6 +149277,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -142650,6 +149350,7 @@ char sqlite3_open(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -142728,6 +149429,11 @@ char sqlite3_open(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_sqlite3_sqlite3_open=no fi @@ -142750,6 +149456,7 @@ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -142769,6 +149476,8 @@ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 @@ -142790,6 +149499,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -142858,6 +149568,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -142889,6 +149604,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -143010,6 +149726,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -143081,6 +149799,7 @@ char sqlite3_open(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -143159,6 +149878,11 @@ char sqlite3_open(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_sqlite3_sqlite3_open=no fi @@ -143181,6 +149905,7 @@ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -143200,6 +149925,8 @@ if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 @@ -143221,6 +149948,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -143289,6 +150017,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -143320,6 +150053,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -143443,6 +150177,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -143476,6 +150212,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -143504,6 +150241,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_sqlite3_sqlite3_open=no fi @@ -143522,6 +150261,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -143564,6 +150304,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -143589,6 +150331,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -143680,6 +150423,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -143758,6 +150506,7 @@ OPENGL_WINDOWS= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -143808,6 +150557,8 @@ OPENGL_WINDOWS= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use OpenGL" >&5 printf %s "checking whether to use OpenGL... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_opengl\"" >&5 @@ -143831,6 +150582,7 @@ echo "$ac_t"""$with_opengl"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -143910,6 +150662,11 @@ echo "$ac_t"""$with_opengl"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use OpenGL" >&5 $as_echo_n "checking whether to use OpenGL... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_opengl\"" >&5 @@ -143931,6 +150688,7 @@ $as_echo "\"$with_opengl\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -144029,6 +150787,11 @@ $as_echo "\"$with_opengl\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_opengl" in n|no) OPENGL_TYPE=none @@ -144081,6 +150844,7 @@ if test "$OPENGL_X11" = 1 ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 @@ -144133,6 +150897,8 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 printf %s "checking for location of OpenGL includes... " >&6; } ======= @@ -144153,6 +150919,7 @@ echo "configure:9553: checking for location of OpenGL includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -144182,6 +150949,8 @@ echo "configure:9553: checking for location of OpenGL includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -144199,6 +150968,7 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -144228,6 +150998,8 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -144245,6 +151017,7 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -144293,6 +151066,8 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opengl_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opengl-includes." "$LINENO" 5 @@ -144315,6 +151090,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 $as_echo "$with_opengl_includes" >&6; } ======= @@ -144358,6 +151134,8 @@ $as_echo "$with_opengl_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 printf "%s\n" "$with_opengl_includes" >&6; } ======= @@ -144378,6 +151156,7 @@ $as_echo "$with_opengl_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -144407,6 +151186,8 @@ $as_echo "$with_opengl_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 $as_echo "$with_opengl_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -144424,6 +151205,7 @@ $as_echo "$with_opengl_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -144466,6 +151248,8 @@ $as_echo "$with_opengl_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opengl_includes" ; then for dir in $with_opengl_includes; do @@ -144502,6 +151286,7 @@ CPPFLAGS="$OPENGLINC $X_CFLAGS $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -144551,6 +151336,8 @@ CPPFLAGS="$OPENGLINC $X_CFLAGS $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in GL/gl.h GL/glu.h do : @@ -144585,6 +151372,7 @@ echo "configure:9579: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -144664,6 +151452,11 @@ echo "configure:9579: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in GL/gl.h GL/glu.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -144689,6 +151482,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -144724,6 +151518,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -144738,6 +151534,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -144783,6 +151580,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -144815,6 +151614,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -144849,6 +151649,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -144880,6 +151682,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -144996,6 +151799,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -145025,6 +151830,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 @@ -145077,6 +151883,8 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 printf %s "checking for location of OpenGL library... " >&6; } ======= @@ -145097,6 +151905,7 @@ echo "configure:9621: checking for location of OpenGL library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -145126,6 +151935,8 @@ echo "configure:9621: checking for location of OpenGL library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -145143,6 +151954,7 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -145172,6 +151984,8 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -145189,6 +152003,7 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -145237,6 +152052,8 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opengl_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opengl-libs." "$LINENO" 5 @@ -145259,6 +152076,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 $as_echo "$with_opengl_libs" >&6; } ======= @@ -145302,6 +152120,8 @@ $as_echo "$with_opengl_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 printf "%s\n" "$with_opengl_libs" >&6; } ======= @@ -145322,6 +152142,7 @@ $as_echo "$with_opengl_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -145351,6 +152172,8 @@ $as_echo "$with_opengl_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 $as_echo "$with_opengl_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -145368,6 +152191,7 @@ $as_echo "$with_opengl_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -145410,6 +152234,8 @@ $as_echo "$with_opengl_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opengl_libs"; then for dir in $with_opengl_libs; do @@ -145452,6 +152278,7 @@ LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 @@ -145489,6 +152316,8 @@ $as_echo_n "checking for glBegin in -lGL... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 printf %s "checking for glBegin in -lGL... " >&6; } ======= @@ -145509,6 +152338,7 @@ ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -145543,6 +152373,8 @@ ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" @@ -145560,6 +152392,7 @@ LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -145623,6 +152456,8 @@ LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -145666,6 +152501,7 @@ char glBegin(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -145689,6 +152525,8 @@ char glBegin(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 $as_echo_n "checking for glBegin in -lGL... " >&6; } @@ -145722,6 +152560,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -145750,6 +152589,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -145780,6 +152621,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_GL_glBegin=no fi @@ -145937,6 +152779,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -146009,6 +152853,7 @@ char glBegin(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -146031,6 +152876,8 @@ char glBegin(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_GL_glBegin=no fi @@ -146052,6 +152899,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -146103,6 +152951,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -146122,6 +152972,7 @@ if test "x$ac_cv_lib_GL_glBegin" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -146141,6 +152992,8 @@ if test "x$ac_cv_lib_GL_glBegin" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 @@ -146162,6 +153015,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -146230,6 +153084,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -146261,6 +153120,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -146382,6 +153242,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -146453,6 +153315,7 @@ char glBegin(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -146531,6 +153394,11 @@ char glBegin(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_GL_glBegin=no fi @@ -146553,6 +153421,7 @@ if test "x$ac_cv_lib_GL_glBegin" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -146572,6 +153441,8 @@ if test "x$ac_cv_lib_GL_glBegin" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 @@ -146593,6 +153464,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -146661,6 +153533,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -146692,6 +153569,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -146813,6 +153691,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -146884,6 +153764,7 @@ char glBegin(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -146962,6 +153843,11 @@ char glBegin(); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ac_cv_lib_GL_glBegin=no fi @@ -146984,6 +153870,7 @@ if test "x$ac_cv_lib_GL_glBegin" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -147003,6 +153890,8 @@ if test "x$ac_cv_lib_GL_glBegin" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 @@ -147024,6 +153913,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -147092,6 +153982,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -147123,6 +154018,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -147246,6 +154142,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -147279,6 +154177,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -147307,6 +154206,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_GL_glBegin=no fi @@ -147325,6 +154226,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -147367,6 +154269,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -147392,6 +154296,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -147483,6 +154388,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -147548,6 +154458,7 @@ LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 @@ -147585,6 +154496,8 @@ $as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 printf %s "checking for gluBeginCurve in -lGLU... " >&6; } ======= @@ -147605,93 +154518,14 @@ ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD -======= <<<<<<< HEAD ->>>>>>> main ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= ->>>>>>> e17ab3c1a1 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD ->>>>>>> f6958f78a7 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main >>>>>>> main -======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main -======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= ->>>>>>> osgeo-main -======= ->>>>>>> osgeo-main - -ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> main -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -======= -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) -======= ->>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 -printf %s "checking for gluBeginCurve in -lGLU... " >&6; } -======= -echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6 -echo "configure:9837: checking for gluBeginCurve in -lGLU" >&5 -ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'` ->>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) - -ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" -<<<<<<< HEAD -======= ->>>>>>> osgeo-main -======= >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= >>>>>>> osgeo-main @@ -147719,6 +154553,91 @@ LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main + +ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> main +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 +printf %s "checking for gluBeginCurve in -lGLU... " >&6; } +======= +echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6 +echo "configure:9837: checking for gluBeginCurve in -lGLU" >&5 +ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'` +>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) + +ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS" +<<<<<<< HEAD +======= +>>>>>>> osgeo-main +======= +>>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> e17ab3c1a1 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +======= +<<<<<<< HEAD +>>>>>>> f6958f78a7 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +>>>>>>> main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -147762,6 +154681,7 @@ char gluBeginCurve(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -147785,6 +154705,8 @@ char gluBeginCurve(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 $as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; } @@ -147818,6 +154740,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -147846,6 +154769,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -147876,6 +154801,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_GLU_gluBeginCurve=no fi @@ -148033,6 +154959,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -148105,6 +155033,7 @@ char gluBeginCurve(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -148127,6 +155056,8 @@ char gluBeginCurve(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_GLU_gluBeginCurve=no fi @@ -148148,6 +155079,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -148199,6 +155131,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -148218,6 +155152,7 @@ if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -148237,6 +155172,8 @@ if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 @@ -148258,6 +155195,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -148326,6 +155264,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -148357,6 +155300,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -148480,6 +155424,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -148513,6 +155459,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -148541,6 +155488,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_GLU_gluBeginCurve=no fi @@ -148559,6 +155508,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -148601,6 +155551,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -148626,6 +155578,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -148717,6 +155670,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -148767,6 +155725,7 @@ LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "glXCreatePbuffer" "ac_cv_func_glXCreatePbuffer" @@ -148821,6 +155780,8 @@ if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "glXCreatePbuffer" "ac_cv_func_glXCreatePbuffer" if test "x$ac_cv_func_glXCreatePbuffer" = xyes then : @@ -148841,6 +155802,7 @@ echo "configure:9937: checking for glXCreatePbuffer" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -148870,6 +155832,8 @@ echo "configure:9937: checking for glXCreatePbuffer" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "glXCreatePbuffer" "ac_cv_func_glXCreatePbuffer" if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -148885,6 +155849,7 @@ if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -148971,6 +155936,11 @@ if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= + + <<<<<<< HEAD >>>>>>> osgeo-main int main() { @@ -149027,6 +155997,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -149056,6 +156027,8 @@ else $as_nop ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "glXCreatePbuffer" "ac_cv_func_glXCreatePbuffer" if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : @@ -149075,6 +156048,7 @@ if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -149117,6 +156091,8 @@ if test "x$ac_cv_func_glXCreatePbuffer" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main $as_echo "#define HAVE_PBUFFERS 1" >>confdefs.h @@ -149140,6 +156116,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -149231,6 +156208,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_fn_error $? "*** Unable to locate glXCreatePbuffer." "$LINENO" 5 @@ -149265,6 +156247,7 @@ LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "glXCreateGLXPixmap" "ac_cv_func_glXCreateGLXPixmap" @@ -149319,6 +156302,8 @@ if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "glXCreateGLXPixmap" "ac_cv_func_glXCreateGLXPixmap" if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes then : @@ -149339,6 +156324,7 @@ echo "configure:10000: checking for glXCreateGLXPixmap" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -149368,6 +156354,8 @@ echo "configure:10000: checking for glXCreateGLXPixmap" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "glXCreateGLXPixmap" "ac_cv_func_glXCreateGLXPixmap" if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -149383,6 +156371,7 @@ if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -149469,6 +156458,11 @@ if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= + + <<<<<<< HEAD >>>>>>> osgeo-main int main() { @@ -149525,6 +156519,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -149554,6 +156549,8 @@ else $as_nop ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "glXCreateGLXPixmap" "ac_cv_func_glXCreateGLXPixmap" if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : @@ -149573,6 +156570,7 @@ if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -149615,6 +156613,8 @@ if test "x$ac_cv_func_glXCreateGLXPixmap" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main $as_echo "#define HAVE_PIXMAPS 1" >>confdefs.h @@ -149638,6 +156638,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -149729,6 +156730,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_fn_error $? "*** Unable to locate glXCreateGLXPixmap." "$LINENO" 5 @@ -149756,6 +156762,7 @@ LDFLAGS=${ac_save_ldflags} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define OPENGL_X11 1" >>confdefs.h ======= <<<<<<< HEAD @@ -149798,6 +156805,8 @@ $as_echo "#define OPENGL_X11 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define OPENGL_X11 1" >>confdefs.h ======= $as_echo "#define OPENGL_X11 1" >>confdefs.h @@ -149816,6 +156825,7 @@ $as_echo "#define OPENGL_X11 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define OPENGL_X11 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -149899,6 +156909,11 @@ $as_echo "#define OPENGL_X11 1" >>confdefs.h $as_echo "#define OPENGL_X11 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define OPENGL_X11 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $OPENGL_X11 @@ -149927,6 +156942,7 @@ if test "$OPENGL_AQUA" = 1 ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL framework" >&5 @@ -149979,6 +156995,8 @@ $as_echo_n "checking for location of OpenGL framework... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL framework" >&5 printf %s "checking for location of OpenGL framework... " >&6; } ======= @@ -149999,6 +157017,7 @@ echo "configure:10069: checking for location of OpenGL framework" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -150028,6 +157047,8 @@ echo "configure:10069: checking for location of OpenGL framework" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL framework" >&5 $as_echo_n "checking for location of OpenGL framework... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -150045,6 +157066,7 @@ $as_echo_n "checking for location of OpenGL framework... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -150074,6 +157096,8 @@ $as_echo_n "checking for location of OpenGL framework... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL framework" >&5 $as_echo_n "checking for location of OpenGL framework... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -150091,6 +157115,7 @@ $as_echo_n "checking for location of OpenGL framework... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -150139,6 +157164,8 @@ $as_echo_n "checking for location of OpenGL framework... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opengl_framework" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opengl-framework." "$LINENO" 5 @@ -150161,6 +157188,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_framework" >&5 $as_echo "$with_opengl_framework" >&6; } ======= @@ -150204,6 +157232,8 @@ $as_echo "$with_opengl_framework" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_framework" >&5 printf "%s\n" "$with_opengl_framework" >&6; } ======= @@ -150224,6 +157254,7 @@ $as_echo "$with_opengl_framework" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -150253,6 +157284,8 @@ $as_echo "$with_opengl_framework" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_framework" >&5 $as_echo "$with_opengl_framework" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -150270,6 +157303,7 @@ $as_echo "$with_opengl_framework" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -150312,6 +157346,8 @@ $as_echo "$with_opengl_framework" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opengl_framework"; then if test -d $with_opengl_framework; then @@ -150346,6 +157382,7 @@ CPPFLAGS="$OPENGLPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -150395,6 +157432,8 @@ CPPFLAGS="$OPENGLPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in OpenGL/gl.h OpenGL/glu.h do : @@ -150429,6 +157468,7 @@ echo "configure:10093: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -150508,6 +157548,11 @@ echo "configure:10093: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in OpenGL/gl.h OpenGL/glu.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -150533,6 +157578,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -150568,6 +157614,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -150582,6 +157630,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -150627,6 +157676,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -150659,6 +157710,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -150693,6 +157745,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -150724,6 +157778,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -150840,6 +157895,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -150871,6 +157928,7 @@ LDFLAGS="$OPENGLPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "glBegin" "ac_cv_func_glBegin" @@ -150924,6 +157982,8 @@ if test "x$ac_cv_func_glBegin" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "glBegin" "ac_cv_func_glBegin" if test "x$ac_cv_func_glBegin" = xyes then : @@ -150985,6 +158045,7 @@ if eval "test \"`echo '$ac_cv_func_'glBegin`\" = yes"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -151014,6 +158075,8 @@ if eval "test \"`echo '$ac_cv_func_'glBegin`\" = yes"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "glBegin" "ac_cv_func_glBegin" if test "x$ac_cv_func_glBegin" = xyes; then : @@ -151032,6 +158095,7 @@ if test "x$ac_cv_func_glBegin" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -151061,6 +158125,8 @@ if test "x$ac_cv_func_glBegin" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "glBegin" "ac_cv_func_glBegin" if test "x$ac_cv_func_glBegin" = xyes; then : @@ -151079,6 +158145,7 @@ if test "x$ac_cv_func_glBegin" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -151126,6 +158193,8 @@ if test "x$ac_cv_func_glBegin" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main OPENGLLIB="$OPENGLLIB -framework OpenGL -framework AGL -framework ApplicationServices" @@ -151152,6 +158221,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -151243,6 +158313,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_fn_error $? "*** Unable to locate OpenGL library." "$LINENO" 5 @@ -151280,6 +158355,7 @@ LDFLAGS="$OPENGLPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "gluBeginCurve" "ac_cv_func_gluBeginCurve" @@ -151333,6 +158409,8 @@ if test "x$ac_cv_func_gluBeginCurve" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "gluBeginCurve" "ac_cv_func_gluBeginCurve" if test "x$ac_cv_func_gluBeginCurve" = xyes then : @@ -151394,6 +158472,7 @@ if eval "test \"`echo '$ac_cv_func_'gluBeginCurve`\" = yes"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -151423,6 +158502,8 @@ if eval "test \"`echo '$ac_cv_func_'gluBeginCurve`\" = yes"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "gluBeginCurve" "ac_cv_func_gluBeginCurve" if test "x$ac_cv_func_gluBeginCurve" = xyes; then : @@ -151441,6 +158522,7 @@ if test "x$ac_cv_func_gluBeginCurve" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -151470,6 +158552,8 @@ if test "x$ac_cv_func_gluBeginCurve" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "gluBeginCurve" "ac_cv_func_gluBeginCurve" if test "x$ac_cv_func_gluBeginCurve" = xyes; then : @@ -151488,6 +158572,7 @@ if test "x$ac_cv_func_gluBeginCurve" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -151535,6 +158620,8 @@ if test "x$ac_cv_func_gluBeginCurve" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main OPENGLLIB="$OPENGLLIB " @@ -151561,6 +158648,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -151652,6 +158740,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_fn_error $? "*** Unable to locate GLU library." "$LINENO" 5 @@ -151685,6 +158778,7 @@ OPENGLLIBPATH="$OPENGLPATH" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define OPENGL_AQUA 1" >>confdefs.h ======= <<<<<<< HEAD @@ -151727,6 +158821,8 @@ $as_echo "#define OPENGL_AQUA 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define OPENGL_AQUA 1" >>confdefs.h ======= $as_echo "#define OPENGL_AQUA 1" >>confdefs.h @@ -151745,6 +158841,7 @@ $as_echo "#define OPENGL_AQUA 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define OPENGL_AQUA 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -151828,6 +158925,11 @@ $as_echo "#define OPENGL_AQUA 1" >>confdefs.h $as_echo "#define OPENGL_AQUA 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define OPENGL_AQUA 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $OPENGL_AQUA @@ -151858,6 +158960,7 @@ if test "$OPENGL_WINDOWS" = 1 ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 @@ -151910,6 +159013,8 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 printf %s "checking for location of OpenGL includes... " >&6; } ======= @@ -151930,6 +159035,7 @@ echo "configure:10274: checking for location of OpenGL includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -151959,6 +159065,8 @@ echo "configure:10274: checking for location of OpenGL includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -151976,6 +159084,7 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -152005,6 +159114,8 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL includes" >&5 $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -152022,6 +159133,7 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -152070,6 +159182,8 @@ $as_echo_n "checking for location of OpenGL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opengl_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opengl-includes." "$LINENO" 5 @@ -152092,6 +159206,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 $as_echo "$with_opengl_includes" >&6; } ======= @@ -152135,6 +159250,8 @@ $as_echo "$with_opengl_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 printf "%s\n" "$with_opengl_includes" >&6; } ======= @@ -152155,6 +159272,7 @@ $as_echo "$with_opengl_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -152184,6 +159302,8 @@ $as_echo "$with_opengl_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_includes" >&5 $as_echo "$with_opengl_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -152201,6 +159321,7 @@ $as_echo "$with_opengl_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -152243,6 +159364,8 @@ $as_echo "$with_opengl_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opengl_includes" ; then for dir in $with_opengl_includes; do @@ -152279,6 +159402,7 @@ CPPFLAGS="$OPENGLINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -152328,6 +159452,8 @@ CPPFLAGS="$OPENGLINC $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in GL/gl.h GL/glu.h do : @@ -152362,6 +159488,7 @@ echo "configure:10300: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -152441,6 +159568,11 @@ echo "configure:10300: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in GL/gl.h GL/glu.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -152466,6 +159598,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -152501,6 +159634,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -152515,6 +159650,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -152560,6 +159696,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -152592,6 +159730,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -152626,6 +159765,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -152657,6 +159798,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -152773,6 +159915,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -152802,6 +159946,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 @@ -152854,6 +159999,8 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 printf %s "checking for location of OpenGL library... " >&6; } ======= @@ -152874,6 +160021,7 @@ echo "configure:10342: checking for location of OpenGL library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -152903,6 +160051,8 @@ echo "configure:10342: checking for location of OpenGL library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -152920,6 +160070,7 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -152949,6 +160100,8 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenGL library" >&5 $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -152966,6 +160119,7 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -153014,6 +160168,8 @@ $as_echo_n "checking for location of OpenGL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opengl_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opengl-libs." "$LINENO" 5 @@ -153036,6 +160192,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 $as_echo "$with_opengl_libs" >&6; } ======= @@ -153079,6 +160236,8 @@ $as_echo "$with_opengl_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 printf "%s\n" "$with_opengl_libs" >&6; } ======= @@ -153099,6 +160258,7 @@ $as_echo "$with_opengl_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -153128,6 +160288,8 @@ $as_echo "$with_opengl_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opengl_libs" >&5 $as_echo "$with_opengl_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -153145,6 +160307,7 @@ $as_echo "$with_opengl_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -153187,6 +160350,8 @@ $as_echo "$with_opengl_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opengl_libs"; then for dir in $with_opengl_libs; do @@ -153225,6 +160390,7 @@ ac_save_libs="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL library" >&5 @@ -153299,6 +160465,8 @@ glEnd(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenGL library" >&5 printf %s "checking for OpenGL library... " >&6; } LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" @@ -153334,6 +160502,7 @@ glEnd(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -153363,6 +160532,8 @@ glEnd(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL library" >&5 $as_echo_n "checking for OpenGL library... " >&6; } LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" @@ -153389,6 +160560,7 @@ glEnd(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -153418,6 +160590,8 @@ glEnd(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL library" >&5 $as_echo_n "checking for OpenGL library... " >&6; } LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" @@ -153444,6 +160618,7 @@ glEnd(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -153491,6 +160666,8 @@ glEnd(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -153513,6 +160690,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -153554,6 +160732,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -153585,6 +160765,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -153654,6 +160835,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 @@ -153678,6 +160863,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -153768,6 +160954,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -153792,6 +160983,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ ======= <<<<<<< HEAD @@ -153834,6 +161026,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= rm -f core conftest.err conftest.$ac_objext \ @@ -153852,6 +161046,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -153934,6 +161129,11 @@ rm -f core conftest.err conftest.$ac_objext \ ======= rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +rm -f core conftest.err conftest.$ac_objext \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext LIBS=${ac_save_libs} @@ -153963,6 +161163,7 @@ ac_save_libs="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLU library" >&5 @@ -154037,6 +161238,8 @@ gluNewQuadric(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLU library" >&5 printf %s "checking for GLU library... " >&6; } LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" @@ -154072,6 +161275,7 @@ gluNewQuadric(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -154101,6 +161305,8 @@ gluNewQuadric(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLU library" >&5 $as_echo_n "checking for GLU library... " >&6; } LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" @@ -154127,6 +161333,7 @@ gluNewQuadric(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -154156,6 +161363,8 @@ gluNewQuadric(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLU library" >&5 $as_echo_n "checking for GLU library... " >&6; } LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS" @@ -154182,6 +161391,7 @@ gluNewQuadric(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -154229,6 +161439,8 @@ gluNewQuadric(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -154251,6 +161463,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -154292,6 +161505,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -154323,6 +161538,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -154392,6 +161608,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 @@ -154416,6 +161636,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -154506,6 +161727,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -154530,6 +161756,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ ======= <<<<<<< HEAD @@ -154572,6 +161799,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= rm -f core conftest.err conftest.$ac_objext \ @@ -154590,6 +161819,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -154672,6 +161902,11 @@ rm -f core conftest.err conftest.$ac_objext \ ======= rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +rm -f core conftest.err conftest.$ac_objext \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext LIBS=${ac_save_libs} @@ -154700,6 +161935,7 @@ OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h ======= <<<<<<< HEAD @@ -154742,6 +161978,8 @@ $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define OPENGL_WINDOWS 1" >>confdefs.h ======= $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h @@ -154760,6 +161998,7 @@ $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -154843,6 +162082,11 @@ $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h $as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define OPENGL_WINDOWS 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $OPENGL_WINDOWS @@ -154884,6 +162128,7 @@ fi # $USE_OPENGL <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -154934,6 +162179,8 @@ fi # $USE_OPENGL >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use ODBC" >&5 printf %s "checking whether to use ODBC... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_odbc\"" >&5 @@ -154957,6 +162204,7 @@ echo "$ac_t"""$with_odbc"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -155036,6 +162284,11 @@ echo "$ac_t"""$with_odbc"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ODBC" >&5 $as_echo_n "checking whether to use ODBC... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_odbc\"" >&5 @@ -155057,6 +162310,7 @@ $as_echo "\"$with_odbc\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -155155,6 +162409,11 @@ $as_echo "\"$with_odbc\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_odbc" in "no") USE_ODBC= ;; "yes") USE_ODBC="1" ;; @@ -155192,6 +162451,7 @@ if test -n "$USE_ODBC"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ODBC includes" >&5 @@ -155244,6 +162504,8 @@ $as_echo_n "checking for location of ODBC includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of ODBC includes" >&5 printf %s "checking for location of ODBC includes... " >&6; } ======= @@ -155264,6 +162526,7 @@ echo "configure:10481: checking for location of ODBC includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -155293,6 +162556,8 @@ echo "configure:10481: checking for location of ODBC includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ODBC includes" >&5 $as_echo_n "checking for location of ODBC includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -155310,6 +162575,7 @@ $as_echo_n "checking for location of ODBC includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -155339,6 +162605,8 @@ $as_echo_n "checking for location of ODBC includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ODBC includes" >&5 $as_echo_n "checking for location of ODBC includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -155356,6 +162624,7 @@ $as_echo_n "checking for location of ODBC includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -155404,6 +162673,8 @@ $as_echo_n "checking for location of ODBC includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_odbc_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-odbc-includes." "$LINENO" 5 @@ -155426,6 +162697,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_odbc_includes" >&5 $as_echo "$with_odbc_includes" >&6; } ======= @@ -155469,6 +162741,8 @@ $as_echo "$with_odbc_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_odbc_includes" >&5 printf "%s\n" "$with_odbc_includes" >&6; } ======= @@ -155489,6 +162763,7 @@ $as_echo "$with_odbc_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -155518,6 +162793,8 @@ $as_echo "$with_odbc_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_odbc_includes" >&5 $as_echo "$with_odbc_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -155535,6 +162812,7 @@ $as_echo "$with_odbc_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -155577,6 +162855,8 @@ $as_echo "$with_odbc_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_odbc_includes" ; then for dir in $with_odbc_includes; do @@ -155606,6 +162886,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" if test "x$ac_cv_header_windows_h" = xyes; then : @@ -155664,6 +162945,8 @@ if test "x$ac_cv_header_sql_h" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" if test "x$ac_cv_header_windows_h" = xyes then : @@ -155745,6 +163028,7 @@ $as_echo "#define HAVE_WINDOWS_H 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -155774,6 +163058,8 @@ $as_echo "#define HAVE_WINDOWS_H 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" if test "x$ac_cv_header_windows_h" = xyes; then : @@ -155792,6 +163078,7 @@ $as_echo "#define HAVE_WINDOWS_H 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -155942,6 +163229,11 @@ fi fi +>>>>>>> osgeo-main +======= + +fi + >>>>>>> osgeo-main @@ -155994,6 +163286,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -156063,6 +163356,10 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main CPPFLAGS=$ac_save_cppflags @@ -156090,6 +163387,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ODBC library" >&5 @@ -156142,6 +163440,8 @@ $as_echo_n "checking for location of ODBC library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of ODBC library" >&5 printf %s "checking for location of ODBC library... " >&6; } ======= @@ -156162,6 +163462,7 @@ echo "configure:10549: checking for location of ODBC library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -156191,6 +163492,8 @@ echo "configure:10549: checking for location of ODBC library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ODBC library" >&5 $as_echo_n "checking for location of ODBC library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -156208,6 +163511,7 @@ $as_echo_n "checking for location of ODBC library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -156237,6 +163541,8 @@ $as_echo_n "checking for location of ODBC library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ODBC library" >&5 $as_echo_n "checking for location of ODBC library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -156254,6 +163560,7 @@ $as_echo_n "checking for location of ODBC library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -156302,6 +163609,8 @@ $as_echo_n "checking for location of ODBC library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_odbc_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-odbc-libs." "$LINENO" 5 @@ -156324,6 +163633,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_odbc_libs" >&5 $as_echo "$with_odbc_libs" >&6; } ======= @@ -156367,6 +163677,8 @@ $as_echo "$with_odbc_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_odbc_libs" >&5 printf "%s\n" "$with_odbc_libs" >&6; } ======= @@ -156387,6 +163699,7 @@ $as_echo "$with_odbc_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -156416,6 +163729,8 @@ $as_echo "$with_odbc_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_odbc_libs" >&5 $as_echo "$with_odbc_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -156433,6 +163748,7 @@ $as_echo "$with_odbc_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -156475,6 +163791,8 @@ $as_echo "$with_odbc_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_odbc_libs"; then for dir in $with_odbc_libs; do @@ -156513,6 +163831,7 @@ LDFLAGS="$ODBCLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5 @@ -156550,6 +163869,8 @@ $as_echo_n "checking for SQLConnect in -lodbc... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5 printf %s "checking for SQLConnect in -lodbc... " >&6; } ======= @@ -156570,6 +163891,7 @@ ac_lib_var=`echo odbc'_'SQLConnect | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -156604,6 +163926,8 @@ ac_lib_var=`echo odbc'_'SQLConnect | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lodbc $ICONVLIB $LIBS" @@ -156621,6 +163945,7 @@ LIBS="-lodbc $ICONVLIB $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -156684,6 +164009,8 @@ LIBS="-lodbc $ICONVLIB $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -156727,6 +164054,7 @@ char SQLConnect(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -156750,6 +164078,8 @@ char SQLConnect(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5 $as_echo_n "checking for SQLConnect in -lodbc... " >&6; } @@ -156783,6 +164113,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -156811,6 +164142,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -156841,6 +164174,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_odbc_SQLConnect=no fi @@ -156998,6 +164332,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -157031,6 +164367,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -157059,6 +164396,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_odbc_SQLConnect=no fi @@ -157077,6 +164416,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -157119,6 +164459,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -157144,6 +164486,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -157235,6 +164578,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -157263,6 +164611,7 @@ LDFLAGS="$ODBCLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5 @@ -157300,6 +164649,8 @@ $as_echo_n "checking for SQLConnect in -liodbc... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5 printf %s "checking for SQLConnect in -liodbc... " >&6; } ======= @@ -157320,6 +164671,7 @@ ac_lib_var=`echo iodbc'_'SQLConnect | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -157354,6 +164706,8 @@ ac_lib_var=`echo iodbc'_'SQLConnect | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-liodbc $LIBS" @@ -157371,6 +164725,7 @@ LIBS="-liodbc $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -157434,6 +164789,8 @@ LIBS="-liodbc $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -157477,6 +164834,7 @@ char SQLConnect(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -157500,6 +164858,8 @@ char SQLConnect(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5 $as_echo_n "checking for SQLConnect in -liodbc... " >&6; } @@ -157533,6 +164893,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -157561,6 +164922,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -157591,6 +164954,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_iodbc_SQLConnect=no fi @@ -157748,6 +165112,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -157781,6 +165147,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -157809,6 +165176,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_iodbc_SQLConnect=no fi @@ -157827,6 +165196,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -157869,6 +165239,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -157894,6 +165266,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -157985,6 +165358,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} ac_save_cflags="$CFLAGS" @@ -158013,6 +165391,7 @@ ac_save_libs="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC library" >&5 @@ -158056,6 +165435,8 @@ $as_echo_n "checking for ODBC library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ODBC library" >&5 printf %s "checking for ODBC library... " >&6; } >>>>>>> osgeo-main @@ -158523,6 +165904,29 @@ LDFLAGS="$ODBCLIB $LDFLAGS" LIBS="-lodbc32 " cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +======= +echo $ac_n "checking for ODBC library""... $ac_c" 1>&6 +echo "configure:10658: checking for ODBC library" >&5 +LDFLAGS="$ODBCLIB $LDFLAGS" +LIBS="-lodbc32 " +cat > conftest.$ac_ext <>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +#include +#include +int +main (void) +{ +SQLAllocEnv((SQLHENV *)0); +<<<<<<< HEAD +======= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC library" >&5 +$as_echo_n "checking for ODBC library... " >&6; } +LDFLAGS="$ODBCLIB $LDFLAGS" +LIBS="-lodbc32 " +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include int @@ -158535,6 +165939,7 @@ SQLAllocEnv((SQLHENV *)0); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD >>>>>>> osgeo-main @@ -158552,6 +165957,8 @@ SQLAllocEnv((SQLHENV *)0); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC library" >&5 @@ -158572,6 +165979,9 @@ SQLAllocEnv((SQLHENV *)0); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -158604,6 +166014,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -158645,6 +166056,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : @@ -158676,6 +166089,7 @@ else $as_nop <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -158745,6 +166159,10 @@ else $as_nop ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 @@ -158769,6 +166187,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -158859,6 +166278,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -158883,6 +166307,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD rm -f core conftest.err conftest.$ac_objext \ ======= <<<<<<< HEAD @@ -158925,6 +166350,8 @@ rm -f core conftest.err conftest.$ac_objext \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext conftest.beam \ ======= rm -f core conftest.err conftest.$ac_objext \ @@ -158943,6 +166370,7 @@ rm -f core conftest.err conftest.$ac_objext \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -159025,6 +166453,11 @@ rm -f core conftest.err conftest.$ac_objext \ ======= rm -f core conftest.err conftest.$ac_objext \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +rm -f core conftest.err conftest.$ac_objext \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main conftest$ac_exeext conftest.$ac_ext LIBS=${ac_save_libs} @@ -159079,6 +166512,7 @@ fi # $USE_ODBC <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -159129,6 +166563,8 @@ fi # $USE_ODBC >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use FFTW" >&5 printf %s "checking whether to use FFTW... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_fftw\"" >&5 @@ -159152,6 +166588,7 @@ echo "$ac_t"""$with_fftw"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -159231,6 +166668,11 @@ echo "$ac_t"""$with_fftw"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use FFTW" >&5 $as_echo_n "checking whether to use FFTW... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_fftw\"" >&5 @@ -159252,6 +166694,7 @@ $as_echo "\"$with_fftw\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -159350,6 +166793,11 @@ $as_echo "\"$with_fftw\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_fftw" in "no") USE_FFTW= ;; "yes") USE_FFTW="1" ;; @@ -159387,6 +166835,7 @@ if test -n "$USE_FFTW"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FFTW includes" >&5 @@ -159439,6 +166888,8 @@ $as_echo_n "checking for location of FFTW includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of FFTW includes" >&5 printf %s "checking for location of FFTW includes... " >&6; } ======= @@ -159459,6 +166910,7 @@ echo "configure:10738: checking for location of FFTW includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -159488,6 +166940,8 @@ echo "configure:10738: checking for location of FFTW includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FFTW includes" >&5 $as_echo_n "checking for location of FFTW includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -159505,6 +166959,7 @@ $as_echo_n "checking for location of FFTW includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -159534,6 +166989,8 @@ $as_echo_n "checking for location of FFTW includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FFTW includes" >&5 $as_echo_n "checking for location of FFTW includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -159551,6 +167008,7 @@ $as_echo_n "checking for location of FFTW includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -159599,6 +167057,8 @@ $as_echo_n "checking for location of FFTW includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_fftw_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-fftw-includes." "$LINENO" 5 @@ -159621,6 +167081,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_fftw_includes" >&5 $as_echo "$with_fftw_includes" >&6; } ======= @@ -159664,6 +167125,8 @@ $as_echo "$with_fftw_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_fftw_includes" >&5 printf "%s\n" "$with_fftw_includes" >&6; } ======= @@ -159684,6 +167147,7 @@ $as_echo "$with_fftw_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -159713,6 +167177,8 @@ $as_echo "$with_fftw_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_fftw_includes" >&5 $as_echo "$with_fftw_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -159730,6 +167196,7 @@ $as_echo "$with_fftw_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -159772,6 +167239,8 @@ $as_echo "$with_fftw_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_fftw_includes" ; then for dir in $with_fftw_includes; do @@ -159808,6 +167277,7 @@ CPPFLAGS="$FFTWINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -159857,6 +167327,8 @@ CPPFLAGS="$FFTWINC $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in fftw3.h do : @@ -159910,6 +167382,7 @@ echo "configure:10764: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -159989,6 +167462,11 @@ echo "configure:10764: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in fftw3.h do : ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default" @@ -160013,6 +167491,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -160093,6 +167572,11 @@ _ACEOF ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main else @@ -160134,6 +167618,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -160260,6 +167745,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -160292,6 +167779,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -160326,6 +167814,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -160355,6 +167845,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -160474,6 +167965,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -160497,6 +167990,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -160571,6 +168065,8 @@ done ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= done @@ -160582,6 +168078,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -160598,6 +168095,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -160624,6 +168123,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -160698,6 +168198,8 @@ done ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= done @@ -160709,6 +168211,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -160725,6 +168228,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -160757,6 +168262,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FFTW library" >&5 @@ -160809,6 +168315,8 @@ $as_echo_n "checking for location of FFTW library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of FFTW library" >&5 printf %s "checking for location of FFTW library... " >&6; } ======= @@ -160829,6 +168337,7 @@ echo "configure:10890: checking for location of FFTW library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -160858,6 +168367,8 @@ echo "configure:10890: checking for location of FFTW library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FFTW library" >&5 $as_echo_n "checking for location of FFTW library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -160875,6 +168386,7 @@ $as_echo_n "checking for location of FFTW library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -160904,6 +168416,8 @@ $as_echo_n "checking for location of FFTW library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FFTW library" >&5 $as_echo_n "checking for location of FFTW library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -160921,6 +168435,7 @@ $as_echo_n "checking for location of FFTW library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -160969,6 +168484,8 @@ $as_echo_n "checking for location of FFTW library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_fftw_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-fftw-libs." "$LINENO" 5 @@ -160991,6 +168508,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_fftw_libs" >&5 $as_echo "$with_fftw_libs" >&6; } ======= @@ -161034,6 +168552,8 @@ $as_echo "$with_fftw_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_fftw_libs" >&5 printf "%s\n" "$with_fftw_libs" >&6; } ======= @@ -161054,6 +168574,7 @@ $as_echo "$with_fftw_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -161083,6 +168604,8 @@ $as_echo "$with_fftw_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_fftw_libs" >&5 $as_echo "$with_fftw_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -161100,6 +168623,7 @@ $as_echo "$with_fftw_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -161142,6 +168666,8 @@ $as_echo "$with_fftw_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_fftw_libs"; then for dir in $with_fftw_libs; do @@ -161180,6 +168706,7 @@ LDFLAGS="$FFTWLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 @@ -161217,6 +168744,8 @@ $as_echo_n "checking for fftw_execute in -lfftw3... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 printf %s "checking for fftw_execute in -lfftw3... " >&6; } ======= @@ -161237,6 +168766,7 @@ ac_lib_var=`echo fftw3'_'fftw_execute | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -161271,6 +168801,8 @@ ac_lib_var=`echo fftw3'_'fftw_execute | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw3 $MATHLIB $LIBS" @@ -161288,6 +168820,7 @@ LIBS="-lfftw3 $MATHLIB $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -161351,6 +168884,8 @@ LIBS="-lfftw3 $MATHLIB $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -161394,6 +168929,7 @@ char fftw_execute(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -161417,6 +168953,8 @@ char fftw_execute(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_execute in -lfftw3" >&5 $as_echo_n "checking for fftw_execute in -lfftw3... " >&6; } @@ -161450,6 +168988,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -161478,6 +169017,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -161508,6 +169049,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_fftw3_fftw_execute=no fi @@ -161665,6 +169207,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -161698,6 +169242,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -161726,6 +169271,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_fftw3_fftw_execute=no fi @@ -161744,6 +169291,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -161786,6 +169334,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -161811,6 +169361,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -161902,6 +169453,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -161930,6 +169486,7 @@ LDFLAGS="$FFTWLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -lfftw" >&5 @@ -161967,6 +169524,8 @@ $as_echo_n "checking for fftwnd_one in -lfftw... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -lfftw" >&5 printf %s "checking for fftwnd_one in -lfftw... " >&6; } ======= @@ -161987,6 +169546,7 @@ ac_lib_var=`echo fftw'_'fftwnd_one | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -162021,6 +169581,8 @@ ac_lib_var=`echo fftw'_'fftwnd_one | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw $MATHLIB $LIBS" @@ -162038,6 +169600,7 @@ LIBS="-lfftw $MATHLIB $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -162101,6 +169664,8 @@ LIBS="-lfftw $MATHLIB $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -162144,6 +169709,7 @@ char fftwnd_one(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -162167,6 +169733,8 @@ char fftwnd_one(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -lfftw" >&5 $as_echo_n "checking for fftwnd_one in -lfftw... " >&6; } @@ -162200,6 +169768,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -162228,6 +169797,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -162258,6 +169829,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_fftw_fftwnd_one=no fi @@ -162415,6 +169987,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -162448,6 +170022,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -162476,6 +170051,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_fftw_fftwnd_one=no fi @@ -162494,6 +170071,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -162536,6 +170114,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -162561,6 +170141,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -162652,6 +170233,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -162680,6 +170266,7 @@ LDFLAGS="$FFTWLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -ldfftw" >&5 @@ -162717,6 +170304,8 @@ $as_echo_n "checking for fftwnd_one in -ldfftw... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -ldfftw" >&5 printf %s "checking for fftwnd_one in -ldfftw... " >&6; } ======= @@ -162737,6 +170326,7 @@ ac_lib_var=`echo dfftw'_'fftwnd_one | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -162771,6 +170361,8 @@ ac_lib_var=`echo dfftw'_'fftwnd_one | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-ldfftw $MATHLIB $LIBS" @@ -162788,6 +170380,7 @@ LIBS="-ldfftw $MATHLIB $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -162851,6 +170444,8 @@ LIBS="-ldfftw $MATHLIB $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -162894,6 +170489,7 @@ char fftwnd_one(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -162917,6 +170513,8 @@ char fftwnd_one(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftwnd_one in -ldfftw" >&5 $as_echo_n "checking for fftwnd_one in -ldfftw... " >&6; } @@ -162950,6 +170548,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -162978,6 +170577,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -163008,6 +170609,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_dfftw_fftwnd_one=no fi @@ -163165,6 +170767,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -163198,6 +170802,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -163226,6 +170831,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_dfftw_fftwnd_one=no fi @@ -163244,6 +170851,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -163286,6 +170894,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -163311,6 +170921,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -163402,6 +171013,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -163468,6 +171084,7 @@ printf "%s\n" "$with_blas" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -163518,6 +171135,8 @@ printf "%s\n" "$with_blas" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use BLAS" >&5 printf %s "checking whether to use BLAS... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_blas\"" >&5 @@ -163541,6 +171160,7 @@ echo "$ac_t"""$with_blas"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -163620,6 +171240,11 @@ echo "$ac_t"""$with_blas"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use BLAS" >&5 $as_echo_n "checking whether to use BLAS... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_blas\"" >&5 @@ -163641,6 +171266,7 @@ $as_echo "\"$with_blas\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -163739,6 +171365,11 @@ $as_echo "\"$with_blas\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_blas" in "no") USE_BLAS= ;; "yes") USE_BLAS="1" ;; @@ -163801,6 +171432,7 @@ if test -n "$USE_BLAS"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of BLAS includes" >&5 @@ -163851,6 +171483,8 @@ $as_echo_n "checking for location of BLAS includes... " >&6; } >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if test -z "$BLAS_PKG" ; then as_fn_error $? "*** Unable to locate (C)BLAS pkg-conf package(s) @@ -163863,6 +171497,9 @@ $as_echo_n "checking for location of BLAS includes... " >&6; } >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -163886,6 +171523,7 @@ echo "configure:11094: checking for location of BLAS includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -163915,6 +171553,8 @@ echo "configure:11094: checking for location of BLAS includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of BLAS includes" >&5 $as_echo_n "checking for location of BLAS includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -163932,6 +171572,7 @@ $as_echo_n "checking for location of BLAS includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -163961,6 +171602,8 @@ $as_echo_n "checking for location of BLAS includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of BLAS includes" >&5 $as_echo_n "checking for location of BLAS includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -163978,6 +171621,7 @@ $as_echo_n "checking for location of BLAS includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -164026,6 +171670,8 @@ $as_echo_n "checking for location of BLAS includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_blas_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-blas-includes." "$LINENO" 5 @@ -164048,6 +171694,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_blas_includes" >&5 $as_echo "$with_blas_includes" >&6; } ======= @@ -164092,12 +171739,17 @@ printf "%s\n" "$with_blas_includes" >&6; } ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_blas_includes" >&5 printf "%s\n" "$with_blas_includes" >&6; } <<<<<<< HEAD >>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -164119,6 +171771,7 @@ $as_echo "$with_blas_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -164152,6 +171805,10 @@ $as_echo "$with_blas_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_blas_includes" >&5 $as_echo "$with_blas_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -164169,6 +171826,7 @@ $as_echo "$with_blas_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -164212,6 +171870,9 @@ $as_echo "$with_blas_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main BLASLIB=$(${PKG_CONFIG} --libs ${BLAS_PKG}) @@ -164241,6 +171902,7 @@ $as_echo "$with_blas_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of BLAS library" >&5 @@ -164291,6 +171953,8 @@ $as_echo_n "checking for location of BLAS library... " >&6; } >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in cblas.h do : @@ -164302,6 +171966,9 @@ do : >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -164325,6 +171992,7 @@ echo "configure:11114: checking for location of BLAS library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -164354,6 +172022,8 @@ echo "configure:11114: checking for location of BLAS library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of BLAS library" >&5 $as_echo_n "checking for location of BLAS library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -164371,6 +172041,7 @@ $as_echo_n "checking for location of BLAS library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -164400,6 +172071,8 @@ $as_echo_n "checking for location of BLAS library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of BLAS library" >&5 $as_echo_n "checking for location of BLAS library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -164417,6 +172090,7 @@ $as_echo_n "checking for location of BLAS library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -164465,6 +172139,8 @@ $as_echo_n "checking for location of BLAS library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_blas_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-blas-libs." "$LINENO" 5 @@ -164487,6 +172163,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_blas_libs" >&5 $as_echo "$with_blas_libs" >&6; } ======= @@ -164530,6 +172207,8 @@ $as_echo "$with_blas_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_blas_libs" >&5 printf "%s\n" "$with_blas_libs" >&6; } ======= @@ -164550,6 +172229,7 @@ $as_echo "$with_blas_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -164579,6 +172259,8 @@ $as_echo "$with_blas_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_blas_libs" >&5 $as_echo "$with_blas_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -164596,6 +172278,7 @@ $as_echo "$with_blas_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -164638,6 +172321,8 @@ $as_echo "$with_blas_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_blas_libs"; then for dir in $with_blas_libs; do @@ -164674,6 +172359,7 @@ CPPFLAGS="$BLASINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main for ac_header in cblas.h @@ -164732,18 +172418,23 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_header_compile "$LINENO" "cblas.h" "ac_cv_header_cblas_h" "$ac_includes_default" >>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) if test "x$ac_cv_header_cblas_h" = xyes then : printf "%s\n" "#define HAVE_CBLAS_H 1" >>confdefs.h +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else $as_nop for ac_header in cblas-atlas.h do : @@ -164756,6 +172447,9 @@ else $as_nop as_fn_error $? "*** Failed to find either \"cblas.h\" or \"cblas-atlas.h\" with \"$CFLAGS\"" "$LINENO" 5 ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -164786,9 +172480,12 @@ else >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) fi ======= @@ -164811,6 +172508,7 @@ _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main fi ======= @@ -164920,16 +172618,21 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD done >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done fi @@ -164968,6 +172671,7 @@ LDFLAGS="$BLASLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnrm2_ in -lblas" >&5 @@ -165005,6 +172709,8 @@ $as_echo_n "checking for dnrm2_ in -lblas... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnrm2_ in -lblas" >&5 printf %s "checking for dnrm2_ in -lblas... " >&6; } ======= @@ -165025,6 +172731,7 @@ ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -165058,6 +172765,8 @@ ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'` ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $MATHLIB $LIBS" @@ -165105,6 +172814,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnrm2_ in -lblas" >&5 $as_echo_n "checking for dnrm2_ in -lblas... " >&6; } <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS @@ -165258,6 +172968,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext $as_echo_n "checking for dnrm2_ in -lblas... " >&6; } ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $MATHLIB $LIBS" @@ -165278,6 +172990,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -165304,6 +173017,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -165333,6 +173048,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_blas_dnrm2_=no fi @@ -165493,6 +173209,8 @@ else <<<<<<< HEAD >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -165501,6 +173219,10 @@ else >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +>>>>>>> osgeo-main ======= >>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) >>>>>>> osgeo-main @@ -165516,8 +173238,11 @@ printf "%s\n" "$BLAS_PKG" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main CFLAGS="$save_CFLAGS" LIBS="$save_LIBS" @@ -165525,6 +173250,9 @@ printf "%s\n" "$BLAS_PKG" >&6; } ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -165582,6 +173310,7 @@ char dnrm2_(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -165604,6 +173333,8 @@ char dnrm2_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_blas_dnrm2_=no fi @@ -165625,6 +173356,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -165676,6 +173408,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -165695,6 +173429,7 @@ if test "x$ac_cv_lib_blas_dnrm2_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -165714,6 +173449,8 @@ if test "x$ac_cv_lib_blas_dnrm2_" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnrm2_ in -lblas" >&5 @@ -165735,6 +173472,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -165803,6 +173541,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -165834,6 +173577,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -165957,6 +173701,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -165990,6 +173736,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -166018,6 +173765,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_blas_dnrm2_=no fi @@ -166036,6 +173785,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -166078,6 +173828,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -166103,6 +173855,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -166194,6 +173947,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -166241,6 +173999,7 @@ LDFLAGS="$BLASLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 @@ -166367,6 +174126,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 printf %s "checking for ATL_xerbla in -latlas... " >&6; } ======= @@ -166379,6 +174140,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-latlas $LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -166409,6 +174171,8 @@ LIBS="-latlas $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -166452,6 +174216,7 @@ char ATL_xerbla(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -166475,6 +174240,8 @@ char ATL_xerbla(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 $as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } @@ -166508,6 +174275,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -166536,6 +174304,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -166566,6 +174336,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_atlas_ATL_xerbla=no fi @@ -166732,6 +174503,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -166764,6 +174537,7 @@ printf %s "checking for sgemm_ in -lf77blas... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -166792,6 +174566,8 @@ printf %s "checking for sgemm_ in -lf77blas... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_atlas_ATL_xerbla=no fi @@ -166819,6 +174595,7 @@ $as_echo_n "checking for sgemm_ in -lf77blas... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -166861,6 +174638,8 @@ $as_echo_n "checking for sgemm_ in -lf77blas... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lf77blas -latlas $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -166880,6 +174659,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -166918,6 +174698,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -166958,6 +174740,7 @@ ac_save_LIBS="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -166986,6 +174769,8 @@ ac_save_LIBS="$LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_atlas_ATL_xerbla=no fi @@ -167009,6 +174794,7 @@ $as_echo_n "checking for sgemm_ in -lf77blas... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -167105,6 +174891,8 @@ char sgemm_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -167145,6 +174933,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD @@ -167253,6 +175042,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -167285,6 +175076,7 @@ printf %s "checking for cblas_dgemm in -lcblas... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -167313,6 +175105,8 @@ printf %s "checking for cblas_dgemm in -lcblas... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_f77blas_sgemm_=no fi @@ -167340,6 +175134,7 @@ $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -167382,6 +175177,8 @@ $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lcblas -lf77blas -latlas $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -167401,6 +175198,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -167439,6 +175237,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -167479,6 +175279,7 @@ ac_save_LIBS="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -167507,6 +175308,8 @@ ac_save_LIBS="$LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_f77blas_sgemm_=no fi @@ -167530,6 +175333,7 @@ $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -167617,6 +175421,8 @@ char cblas_dgemm(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -167657,6 +175463,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD @@ -167765,6 +175572,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -167796,6 +175605,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -167824,6 +175634,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_cblas_cblas_dgemm=no fi @@ -167842,6 +175654,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -167884,6 +175697,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -167907,6 +175722,7 @@ if test "x$ac_cv_lib_cblas_cblas_dgemm" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -167997,6 +175813,11 @@ if test "x$ac_cv_lib_cblas_cblas_dgemm" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main blas_ok=yes; BLASLIB="-lcblas -lf77blas -latlas" fi @@ -168028,6 +175849,7 @@ if test $blas_ok = yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h ======= <<<<<<< HEAD @@ -168070,6 +175892,8 @@ $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_LIBATLAS 1" >>confdefs.h ======= $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h @@ -168088,6 +175912,7 @@ $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -168171,6 +175996,11 @@ $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h $as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_LIBATLAS 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi @@ -168202,6 +176032,7 @@ if test $blas_ok = no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm in $vlib_flags" >&5 @@ -168260,6 +176091,8 @@ sgemm ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sgemm in $vlib_flags" >&5 printf %s "checking for sgemm in $vlib_flags... " >&6; } @@ -168292,6 +176125,7 @@ sgemm <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -168320,6 +176154,8 @@ sgemm >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm in $vlib_flags" >&5 $as_echo_n "checking for sgemm in $vlib_flags... " >&6; } @@ -168345,6 +176181,7 @@ sgemm <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -168373,6 +176210,8 @@ sgemm >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm in $vlib_flags" >&5 $as_echo_n "checking for sgemm in $vlib_flags... " >&6; } @@ -168398,6 +176237,7 @@ sgemm <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -168445,6 +176285,8 @@ sgemm ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -168467,6 +176309,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : blas_ok=yes; BLASLIB="$vlib_flags" else @@ -168513,6 +176356,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ======= @@ -168549,6 +176394,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -168578,6 +176424,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_link "$LINENO"; then : blas_ok=yes; BLASLIB="$vlib_flags" else @@ -168598,6 +176446,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -168640,6 +176489,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $blas_ok" >&5 @@ -168661,6 +176512,7 @@ $as_echo "$blas_ok" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -168751,6 +176603,11 @@ $as_echo "$blas_ok" >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main LIBS="$save_LIBS" fi @@ -168779,6 +176636,7 @@ if test $blas_ok = no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 @@ -168904,6 +176762,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 printf %s "checking for sgemm_ in -lblas... " >&6; } @@ -168917,6 +176777,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -168947,6 +176808,8 @@ LIBS="-lblas $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -168990,6 +176853,7 @@ char sgemm_(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -169012,6 +176876,8 @@ char sgemm_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 $as_echo_n "checking for sgemm_ in -lblas... " >&6; } @@ -169046,6 +176912,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -169074,6 +176941,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -169104,6 +176973,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_blas_sgemm_=no fi @@ -169270,6 +177140,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -169302,6 +177174,7 @@ printf %s "checking for dgemm_ in -ldgemm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -169330,6 +177203,8 @@ printf %s "checking for dgemm_ in -ldgemm... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_blas_sgemm_=no fi @@ -169357,6 +177232,7 @@ $as_echo_n "checking for dgemm_ in -ldgemm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -169399,6 +177275,8 @@ $as_echo_n "checking for dgemm_ in -ldgemm... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-ldgemm -lblas $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -169418,6 +177296,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -169456,6 +177335,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -169496,6 +177377,7 @@ ac_save_LIBS="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -169524,6 +177406,8 @@ ac_save_LIBS="$LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_blas_sgemm_=no fi @@ -169547,6 +177431,7 @@ $as_echo_n "checking for dgemm_ in -ldgemm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -169643,6 +177528,8 @@ char dgemm_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -169683,6 +177570,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD @@ -169791,6 +177679,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -169823,6 +177713,7 @@ printf %s "checking for sgemm_ in -lsgemm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -169851,6 +177742,8 @@ printf %s "checking for sgemm_ in -lsgemm... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_dgemm_dgemm_=no fi @@ -169878,6 +177771,7 @@ $as_echo_n "checking for sgemm_ in -lsgemm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -169920,6 +177814,8 @@ $as_echo_n "checking for sgemm_ in -lsgemm... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lsgemm -lblas $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -169939,6 +177835,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -169977,6 +177874,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -170017,6 +177916,7 @@ ac_save_LIBS="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -170045,6 +177945,8 @@ ac_save_LIBS="$LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_dgemm_dgemm_=no fi @@ -170068,6 +177970,7 @@ $as_echo_n "checking for sgemm_ in -lsgemm... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -170155,6 +178058,8 @@ char sgemm_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -170195,6 +178100,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD @@ -170303,6 +178209,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -170334,6 +178242,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -170362,6 +178271,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_sgemm_sgemm_=no fi @@ -170380,6 +178291,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -170422,6 +178334,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -170445,6 +178359,7 @@ if test "x$ac_cv_lib_sgemm_sgemm_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -170535,6 +178450,11 @@ if test "x$ac_cv_lib_sgemm_sgemm_" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main blas_ok=yes; BLASLIB="-lsgemm -ldgemm -lblas" fi @@ -170570,6 +178490,7 @@ if test $blas_ok = no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5 @@ -170695,6 +178616,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5 printf %s "checking for acosp in -lsunmath... " >&6; } @@ -170708,6 +178631,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsunmath $LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -170738,6 +178662,8 @@ LIBS="-lsunmath $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -170781,6 +178707,7 @@ char acosp(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -170803,6 +178730,8 @@ char acosp(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5 $as_echo_n "checking for acosp in -lsunmath... " >&6; } @@ -170837,6 +178766,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -170865,6 +178795,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -170895,6 +178827,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_sunmath_acosp=no fi @@ -171061,6 +178994,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -171093,6 +179028,7 @@ printf %s "checking for sgemm_ in -lsunperf... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -171121,6 +179057,8 @@ printf %s "checking for sgemm_ in -lsunperf... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_sunmath_acosp=no fi @@ -171148,6 +179086,7 @@ $as_echo_n "checking for sgemm_ in -lsunperf... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -171190,6 +179129,8 @@ $as_echo_n "checking for sgemm_ in -lsunperf... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lsunperf -lsunmath $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -171209,6 +179150,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -171247,6 +179189,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -171287,6 +179231,7 @@ ac_save_LIBS="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -171315,6 +179260,8 @@ ac_save_LIBS="$LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_sunmath_acosp=no fi @@ -171338,6 +179285,7 @@ $as_echo_n "checking for sgemm_ in -lsunperf... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -171425,6 +179373,8 @@ char sgemm_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -171465,6 +179415,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD @@ -171573,6 +179524,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -171604,6 +179557,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -171632,6 +179586,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_sunperf_sgemm_=no fi @@ -171650,6 +179606,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -171692,6 +179649,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -171715,6 +179674,7 @@ if test "x$ac_cv_lib_sunperf_sgemm_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -171805,6 +179765,11 @@ if test "x$ac_cv_lib_sunperf_sgemm_" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main blas_ok=yes; BLASLIB="-xlic_lib=sunperf -lsunmath" fi @@ -171838,6 +179803,7 @@ if test $blas_ok = no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 @@ -171963,6 +179929,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 printf %s "checking for sgemm_ in -lblas... " >&6; } @@ -171976,6 +179944,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lblas $LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -172006,6 +179975,8 @@ LIBS="-lblas $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -172049,6 +180020,7 @@ char sgemm_(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -172071,6 +180043,8 @@ char sgemm_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lblas" >&5 $as_echo_n "checking for sgemm_ in -lblas... " >&6; } @@ -172105,6 +180079,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -172133,6 +180108,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -172163,6 +180140,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_blas_sgemm_=no fi @@ -172320,6 +180298,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -172351,6 +180331,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -172379,6 +180360,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_blas_sgemm_=no fi @@ -172397,6 +180380,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -172439,6 +180423,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -172462,6 +180448,7 @@ if test "x$ac_cv_lib_blas_sgemm_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -172552,6 +180539,11 @@ if test "x$ac_cv_lib_blas_sgemm_" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main blas_ok=yes; BLASLIB="-lblas" fi @@ -172578,6 +180570,7 @@ if test $blas_ok = yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h ======= <<<<<<< HEAD @@ -172620,6 +180613,8 @@ $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_LIBBLAS 1" >>confdefs.h ======= $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h @@ -172638,6 +180633,7 @@ $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -172721,6 +180717,11 @@ $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h $as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_LIBBLAS 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $USE_BLAS @@ -172760,6 +180761,7 @@ printf "%s\n" "$with_lapack" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -172810,6 +180812,8 @@ printf "%s\n" "$with_lapack" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use LAPACK" >&5 printf %s "checking whether to use LAPACK... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_lapack\"" >&5 @@ -172833,6 +180837,7 @@ echo "$ac_t"""$with_lapack"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -172912,6 +180917,11 @@ echo "$ac_t"""$with_lapack"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use LAPACK" >&5 $as_echo_n "checking whether to use LAPACK... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_lapack\"" >&5 @@ -172933,6 +180943,7 @@ $as_echo "\"$with_lapack\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -173031,6 +181042,11 @@ $as_echo "\"$with_lapack\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_lapack" in "no") USE_LAPACK= ;; "yes") USE_LAPACK="1" ;; @@ -173096,6 +181112,7 @@ lapack_ok=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK includes" >&5 @@ -173148,6 +181165,8 @@ $as_echo_n "checking for location of LAPACK includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK includes" >&5 printf %s "checking for location of LAPACK includes... " >&6; } ======= @@ -173168,6 +181187,7 @@ echo "configure:11709: checking for location of LAPACK includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -173197,6 +181217,8 @@ echo "configure:11709: checking for location of LAPACK includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK includes" >&5 $as_echo_n "checking for location of LAPACK includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -173214,6 +181236,7 @@ $as_echo_n "checking for location of LAPACK includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -173243,6 +181266,8 @@ $as_echo_n "checking for location of LAPACK includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK includes" >&5 $as_echo_n "checking for location of LAPACK includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -173260,6 +181285,7 @@ $as_echo_n "checking for location of LAPACK includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -173308,6 +181334,8 @@ $as_echo_n "checking for location of LAPACK includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_lapack_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-lapack-includes." "$LINENO" 5 @@ -173330,6 +181358,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lapack_includes" >&5 $as_echo "$with_lapack_includes" >&6; } ======= @@ -173373,6 +181402,8 @@ $as_echo "$with_lapack_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_lapack_includes" >&5 printf "%s\n" "$with_lapack_includes" >&6; } ======= @@ -173393,6 +181424,7 @@ $as_echo "$with_lapack_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -173422,6 +181454,8 @@ $as_echo "$with_lapack_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lapack_includes" >&5 $as_echo "$with_lapack_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -173439,6 +181473,7 @@ $as_echo "$with_lapack_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -173481,6 +181516,8 @@ $as_echo "$with_lapack_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_lapack_includes" ; then for dir in $with_lapack_includes; do @@ -173516,6 +181553,7 @@ if test -n "$USE_BLAS" && test -n "$USE_LAPACK"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK library" >&5 @@ -173566,6 +181604,8 @@ $as_echo_n "checking for location of LAPACK library... " >&6; } >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main lapack_ok=no ======= @@ -173575,6 +181615,9 @@ $as_echo_n "checking for location of LAPACK library... " >&6; } >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -173598,6 +181641,7 @@ echo "configure:11729: checking for location of LAPACK library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -173627,6 +181671,8 @@ echo "configure:11729: checking for location of LAPACK library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK library" >&5 $as_echo_n "checking for location of LAPACK library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -173644,6 +181690,7 @@ $as_echo_n "checking for location of LAPACK library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -173673,6 +181720,8 @@ $as_echo_n "checking for location of LAPACK library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of LAPACK library" >&5 $as_echo_n "checking for location of LAPACK library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -173690,6 +181739,7 @@ $as_echo_n "checking for location of LAPACK library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -173738,6 +181788,8 @@ $as_echo_n "checking for location of LAPACK library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_lapack_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-lapack-libs." "$LINENO" 5 @@ -173760,6 +181812,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lapack_libs" >&5 $as_echo "$with_lapack_libs" >&6; } ======= @@ -173804,12 +181857,17 @@ printf "%s\n" "$with_lapack_libs" >&6; } ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_lapack_libs" >&5 printf "%s\n" "$with_lapack_libs" >&6; } <<<<<<< HEAD >>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -173831,6 +181889,7 @@ $as_echo "$with_lapack_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -173864,6 +181923,10 @@ $as_echo "$with_lapack_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lapack_libs" >&5 $as_echo "$with_lapack_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -173881,6 +181944,7 @@ $as_echo "$with_lapack_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -173924,6 +181988,9 @@ $as_echo "$with_lapack_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for lapack_chk in ${LAPACK_PKGS} @@ -173977,6 +182044,7 @@ CPPFLAGS="$LAPACKINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main for ac_header in clapack.h @@ -174035,12 +182103,15 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_header_compile "$LINENO" "clapack.h" "ac_cv_header_clapack_h" "$ac_includes_default" if test "x$ac_cv_header_clapack_h" = xyes >>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) then : printf "%s\n" "#define HAVE_LAPACKE_H 1" >>confdefs.h +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @@ -174055,6 +182126,11 @@ else $as_nop ======= >>>>>>> osgeo-main ======= +else $as_nop + as_fn_error $? "*** Unable to find \"lapacke.h\" with \"$CFLAGS\"." "$LINENO" 5 +======= +>>>>>>> osgeo-main +======= for ac_hdr in clapack.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` @@ -174081,7 +182157,10 @@ else >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main >>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -174106,6 +182185,7 @@ _ACEOF >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main fi ======= @@ -174215,6 +182295,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi done @@ -174222,11 +182304,14 @@ done done <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) done ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for linking to LAPACK(E)" >&5 @@ -174269,6 +182354,7 @@ if test lapack_ok=no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "dsegv_" "ac_cv_func_dsegv_" @@ -174320,6 +182406,8 @@ if test "x$ac_cv_func_dsegv_" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "dsegv_" "ac_cv_func_dsegv_" if test "x$ac_cv_func_dsegv_" = xyes @@ -174381,6 +182469,7 @@ if eval "test \"`echo '$ac_cv_func_'dsegv_`\" = yes"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -174409,6 +182498,8 @@ if eval "test \"`echo '$ac_cv_func_'dsegv_`\" = yes"; then >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_fn_c_check_func "$LINENO" "dsegv_" "ac_cv_func_dsegv_" if test "x$ac_cv_func_dsegv_" = xyes; then : @@ -174427,6 +182518,7 @@ if test "x$ac_cv_func_dsegv_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -174455,6 +182547,8 @@ if test "x$ac_cv_func_dsegv_" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_fn_c_check_func "$LINENO" "dsegv_" "ac_cv_func_dsegv_" if test "x$ac_cv_func_dsegv_" = xyes; then : @@ -174473,6 +182567,7 @@ if test "x$ac_cv_func_dsegv_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -174520,6 +182615,8 @@ if test "x$ac_cv_func_dsegv_" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main lapack_ok=yes <<<<<<< HEAD @@ -174558,6 +182655,7 @@ if test $lapack_ok = no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for desgv_ in -llapack" >&5 @@ -174683,6 +182781,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for desgv_ in -llapack" >&5 printf %s "checking for desgv_ in -llapack... " >&6; } @@ -174696,6 +182796,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-llapack $FLIBS $LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -174726,6 +182827,8 @@ LIBS="-llapack $FLIBS $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -174769,6 +182872,7 @@ char desgv_(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -174791,6 +182895,8 @@ char desgv_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for desgv_ in -llapack" >&5 $as_echo_n "checking for desgv_ in -llapack... " >&6; } @@ -174825,6 +182931,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -174853,6 +182960,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -174883,6 +182992,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_lapack_desgv_=no fi @@ -175040,6 +183150,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -175048,6 +183160,10 @@ else >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) +>>>>>>> osgeo-main ======= >>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) >>>>>>> osgeo-main @@ -175083,6 +183199,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -175111,6 +183228,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_lapack_desgv_=no fi @@ -175129,6 +183248,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -175171,6 +183291,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -175194,6 +183316,7 @@ if test "x$ac_cv_lib_lapack_desgv_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -175284,6 +183407,11 @@ if test "x$ac_cv_lib_lapack_desgv_" = xyes; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main lapack_ok=yes; LAPACKLIB="-llapack" fi @@ -175326,6 +183454,7 @@ LDFLAGS="$LAPACKLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgesv_ in -llapack" >&5 @@ -175452,6 +183581,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dgesv_ in -llapack" >&5 printf %s "checking for dgesv_ in -llapack... " >&6; } ======= @@ -175464,6 +183595,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-llapack $BLASLIB $MATHLIB $LIBS" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -175494,6 +183626,8 @@ LIBS="-llapack $BLASLIB $MATHLIB $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -175537,6 +183671,7 @@ char dgesv_(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -175560,6 +183695,8 @@ char dgesv_(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgesv_ in -llapack" >&5 $as_echo_n "checking for dgesv_ in -llapack... " >&6; } @@ -175593,6 +183730,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -175621,6 +183759,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -175651,6 +183791,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_lapack_dgesv_=no fi @@ -175808,6 +183949,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -175880,6 +184023,7 @@ char dgesv_(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -175902,6 +184046,8 @@ char dgesv_(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_lapack_dgesv_=no fi @@ -175923,6 +184069,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -175974,6 +184121,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -175993,6 +184142,7 @@ if test "x$ac_cv_lib_lapack_dgesv_" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -176012,6 +184162,8 @@ if test "x$ac_cv_lib_lapack_dgesv_" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgesv_ in -llapack" >&5 @@ -176033,6 +184185,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -176101,6 +184254,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -176132,6 +184290,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -176255,6 +184414,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -176288,6 +184449,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -176316,6 +184478,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_lapack_dgesv_=no fi @@ -176334,6 +184498,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -176376,6 +184541,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -176401,6 +184568,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -176492,6 +184660,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -176533,6 +184706,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h ======= <<<<<<< HEAD @@ -176575,6 +184749,8 @@ $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define HAVE_LIBLAPACK 1" >>confdefs.h ======= $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h @@ -176593,6 +184769,7 @@ $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -176676,6 +184853,11 @@ $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +$as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $USE_BLAS $USE_LAPACK @@ -176868,6 +185050,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -176918,6 +185101,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use Cairo" >&5 printf %s "checking whether to use Cairo... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_cairo\"" >&5 @@ -176941,6 +185126,7 @@ echo "$ac_t"""$with_cairo"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -177020,6 +185206,11 @@ echo "$ac_t"""$with_cairo"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Cairo" >&5 $as_echo_n "checking whether to use Cairo... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_cairo\"" >&5 @@ -177041,6 +185232,7 @@ $as_echo "\"$with_cairo\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -177139,6 +185331,11 @@ $as_echo "\"$with_cairo\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_cairo" in "no") USE_CAIRO= ;; "yes") USE_CAIRO="1" ;; @@ -177189,6 +185386,7 @@ CAIROINC=`$PKG_CONFIG --cflags $cairo` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of cairo includes" >&5 @@ -177241,6 +185439,8 @@ $as_echo_n "checking for location of cairo includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of cairo includes" >&5 printf %s "checking for location of cairo includes... " >&6; } ======= @@ -177261,6 +185461,7 @@ echo "configure:12038: checking for location of cairo includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -177290,6 +185491,8 @@ echo "configure:12038: checking for location of cairo includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of cairo includes" >&5 $as_echo_n "checking for location of cairo includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -177307,6 +185510,7 @@ $as_echo_n "checking for location of cairo includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -177336,6 +185540,8 @@ $as_echo_n "checking for location of cairo includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of cairo includes" >&5 $as_echo_n "checking for location of cairo includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -177353,6 +185559,7 @@ $as_echo_n "checking for location of cairo includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -177401,6 +185608,8 @@ $as_echo_n "checking for location of cairo includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_cairo_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-cairo-includes." "$LINENO" 5 @@ -177423,6 +185632,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_includes" >&5 $as_echo "$with_cairo_includes" >&6; } ======= @@ -177466,6 +185676,8 @@ $as_echo "$with_cairo_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_cairo_includes" >&5 printf "%s\n" "$with_cairo_includes" >&6; } ======= @@ -177486,6 +185698,7 @@ $as_echo "$with_cairo_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -177515,6 +185728,8 @@ $as_echo "$with_cairo_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_includes" >&5 $as_echo "$with_cairo_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -177532,6 +185747,7 @@ $as_echo "$with_cairo_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -177574,6 +185790,8 @@ $as_echo "$with_cairo_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_cairo_includes" ; then for dir in $with_cairo_includes; do @@ -177610,6 +185828,7 @@ CPPFLAGS="$CAIROINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -177659,6 +185878,8 @@ CPPFLAGS="$CAIROINC $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in cairo.h do : @@ -177690,6 +185911,7 @@ echo "configure:12064: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -177769,6 +185991,11 @@ echo "configure:12064: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in cairo.h do : ac_fn_c_check_header_mongrel "$LINENO" "cairo.h" "ac_cv_header_cairo_h" "$ac_includes_default" @@ -177793,6 +186020,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -177828,6 +186056,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -177842,6 +186072,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -177887,6 +186118,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -177919,6 +186152,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -177953,6 +186187,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -177984,6 +186220,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -178100,6 +186337,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -178131,6 +186370,7 @@ CAIROLIB=`$PKG_CONFIG --libs $cairo` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of cairo library" >&5 @@ -178183,6 +186423,8 @@ $as_echo_n "checking for location of cairo library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of cairo library" >&5 printf %s "checking for location of cairo library... " >&6; } ======= @@ -178203,6 +186445,7 @@ echo "configure:12108: checking for location of cairo library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -178232,6 +186475,8 @@ echo "configure:12108: checking for location of cairo library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of cairo library" >&5 $as_echo_n "checking for location of cairo library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -178249,6 +186494,7 @@ $as_echo_n "checking for location of cairo library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -178278,6 +186524,8 @@ $as_echo_n "checking for location of cairo library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of cairo library" >&5 $as_echo_n "checking for location of cairo library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -178295,6 +186543,7 @@ $as_echo_n "checking for location of cairo library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -178343,6 +186592,8 @@ $as_echo_n "checking for location of cairo library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_cairo_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-cairo-libs." "$LINENO" 5 @@ -178365,6 +186616,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_libs" >&5 $as_echo "$with_cairo_libs" >&6; } ======= @@ -178408,6 +186660,8 @@ $as_echo "$with_cairo_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_cairo_libs" >&5 printf "%s\n" "$with_cairo_libs" >&6; } ======= @@ -178428,6 +186682,7 @@ $as_echo "$with_cairo_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -178457,6 +186712,8 @@ $as_echo "$with_cairo_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_libs" >&5 $as_echo "$with_cairo_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -178474,6 +186731,7 @@ $as_echo "$with_cairo_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -178516,6 +186774,8 @@ $as_echo "$with_cairo_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_cairo_libs"; then for dir in $with_cairo_libs; do @@ -178549,6 +186809,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo linking flags" >&5 @@ -178601,6 +186862,8 @@ $as_echo_n "checking for cairo linking flags... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cairo linking flags" >&5 printf %s "checking for cairo linking flags... " >&6; } ======= @@ -178621,6 +186884,7 @@ echo "configure:12128: checking for cairo linking flags" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -178650,6 +186914,8 @@ echo "configure:12128: checking for cairo linking flags" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo linking flags" >&5 $as_echo_n "checking for cairo linking flags... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -178667,6 +186933,7 @@ $as_echo_n "checking for cairo linking flags... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -178696,6 +186963,8 @@ $as_echo_n "checking for cairo linking flags... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo linking flags" >&5 $as_echo_n "checking for cairo linking flags... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -178713,6 +186982,7 @@ $as_echo_n "checking for cairo linking flags... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -178761,6 +187031,8 @@ $as_echo_n "checking for cairo linking flags... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_cairo_ldflags" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-cairo-ldflags." "$LINENO" 5 @@ -178783,6 +187055,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_ldflags" >&5 $as_echo "$with_cairo_ldflags" >&6; } ======= @@ -178826,6 +187099,8 @@ $as_echo "$with_cairo_ldflags" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_cairo_ldflags" >&5 printf "%s\n" "$with_cairo_ldflags" >&6; } ======= @@ -178846,6 +187121,7 @@ $as_echo "$with_cairo_ldflags" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -178875,6 +187151,8 @@ $as_echo "$with_cairo_ldflags" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cairo_ldflags" >&5 $as_echo "$with_cairo_ldflags" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -178892,6 +187170,7 @@ $as_echo "$with_cairo_ldflags" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -178934,6 +187213,8 @@ $as_echo "$with_cairo_ldflags" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main CAIROLIB="$CAIROLIB $with_cairo_ldflags" @@ -178963,6 +187244,7 @@ LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "cairo_create" "ac_cv_func_cairo_create" @@ -179019,6 +187301,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "cairo_create" "ac_cv_func_cairo_create" if test "x$ac_cv_func_cairo_create" = xyes then : @@ -179091,6 +187375,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -179120,6 +187405,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "cairo_create" "ac_cv_func_cairo_create" if test "x$ac_cv_func_cairo_create" = xyes; then : @@ -179141,6 +187428,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -179183,6 +187471,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main as_fn_error $? "*** Unable to locate cairo_create." "$LINENO" 5 @@ -179219,6 +187509,7 @@ LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "cairo_xlib_surface_create_with_xrender_format" "ac_cv_func_cairo_xlib_surface_create_with_xrender_format" @@ -179275,6 +187566,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "cairo_xlib_surface_create_with_xrender_format" "ac_cv_func_cairo_xlib_surface_create_with_xrender_format" if test "x$ac_cv_func_cairo_xlib_surface_create_with_xrender_format" = xyes then : @@ -179347,6 +187640,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -179376,6 +187670,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "cairo_xlib_surface_create_with_xrender_format" "ac_cv_func_cairo_xlib_surface_create_with_xrender_format" if test "x$ac_cv_func_cairo_xlib_surface_create_with_xrender_format" = xyes; then : @@ -179397,6 +187693,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -179439,6 +187736,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main CAIRO_HAS_XRENDER= @@ -179474,6 +187773,7 @@ LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "cairo_xlib_surface_get_xrender_format" "ac_cv_func_cairo_xlib_surface_get_xrender_format" @@ -179530,6 +187830,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "cairo_xlib_surface_get_xrender_format" "ac_cv_func_cairo_xlib_surface_get_xrender_format" if test "x$ac_cv_func_cairo_xlib_surface_get_xrender_format" = xyes then : @@ -179602,6 +187904,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -179631,6 +187934,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "cairo_xlib_surface_get_xrender_format" "ac_cv_func_cairo_xlib_surface_get_xrender_format" if test "x$ac_cv_func_cairo_xlib_surface_get_xrender_format" = xyes; then : @@ -179652,6 +187957,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -179694,6 +188000,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main CAIRO_HAS_XRENDER_SURFACE= @@ -179738,6 +188046,7 @@ fi # $USE_CAIRO <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -179788,6 +188097,8 @@ fi # $USE_CAIRO >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use FreeType" >&5 printf %s "checking whether to use FreeType... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_freetype\"" >&5 @@ -179811,6 +188122,7 @@ echo "$ac_t"""$with_freetype"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -179890,6 +188202,11 @@ echo "$ac_t"""$with_freetype"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use FreeType" >&5 $as_echo_n "checking whether to use FreeType... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_freetype\"" >&5 @@ -179911,6 +188228,7 @@ $as_echo "\"$with_freetype\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -180009,6 +188327,11 @@ $as_echo "\"$with_freetype\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_freetype" in "no") USE_FREETYPE= ;; "yes") USE_FREETYPE="1" ;; @@ -180047,6 +188370,7 @@ FTINC=`$PKG_CONFIG --cflags freetype2` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main @@ -180100,6 +188424,8 @@ $as_echo_n "checking for location of FreeType includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of FreeType includes" >&5 printf %s "checking for location of FreeType includes... " >&6; } @@ -180121,6 +188447,7 @@ echo "configure:12350: checking for location of FreeType includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -180150,6 +188477,8 @@ echo "configure:12350: checking for location of FreeType includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FreeType includes" >&5 $as_echo_n "checking for location of FreeType includes... " >&6; } @@ -180168,6 +188497,7 @@ $as_echo_n "checking for location of FreeType includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -180197,6 +188527,8 @@ $as_echo_n "checking for location of FreeType includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FreeType includes" >&5 $as_echo_n "checking for location of FreeType includes... " >&6; } @@ -180215,6 +188547,7 @@ $as_echo_n "checking for location of FreeType includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -180263,6 +188596,8 @@ $as_echo_n "checking for location of FreeType includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_freetype_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-freetype-includes." "$LINENO" 5 @@ -180285,6 +188620,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_freetype_includes" >&5 $as_echo "$with_freetype_includes" >&6; } ======= @@ -180328,6 +188664,8 @@ $as_echo "$with_freetype_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_freetype_includes" >&5 printf "%s\n" "$with_freetype_includes" >&6; } ======= @@ -180348,6 +188686,7 @@ $as_echo "$with_freetype_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -180377,6 +188716,8 @@ $as_echo "$with_freetype_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_freetype_includes" >&5 $as_echo "$with_freetype_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -180394,6 +188735,7 @@ $as_echo "$with_freetype_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -180436,6 +188778,8 @@ $as_echo "$with_freetype_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_freetype_includes" ; then for dir in $with_freetype_includes; do @@ -180472,6 +188816,7 @@ CPPFLAGS="$FTINC $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -180521,6 +188866,8 @@ CPPFLAGS="$FTINC $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in ft2build.h do : @@ -180552,6 +188899,7 @@ echo "configure:12376: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -180631,6 +188979,11 @@ echo "configure:12376: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in ft2build.h do : ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default" @@ -180655,6 +189008,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -180690,6 +189044,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -180704,6 +189060,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -180749,6 +189106,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -180781,6 +189140,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -180815,6 +189175,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -180846,6 +189208,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -180962,6 +189325,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -180992,6 +189357,7 @@ FTLIB=`$PKG_CONFIG --libs freetype2` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main @@ -181045,6 +189411,8 @@ $as_echo_n "checking for location of FreeType library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of FreeType library" >&5 printf %s "checking for location of FreeType library... " >&6; } @@ -181066,6 +189434,7 @@ echo "configure:12418: checking for location of FreeType library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -181095,6 +189464,8 @@ echo "configure:12418: checking for location of FreeType library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FreeType library" >&5 $as_echo_n "checking for location of FreeType library... " >&6; } @@ -181113,6 +189484,7 @@ $as_echo_n "checking for location of FreeType library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -181142,6 +189514,8 @@ $as_echo_n "checking for location of FreeType library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of FreeType library" >&5 $as_echo_n "checking for location of FreeType library... " >&6; } @@ -181160,6 +189534,7 @@ $as_echo_n "checking for location of FreeType library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -181208,6 +189583,8 @@ $as_echo_n "checking for location of FreeType library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_freetype_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-freetype-libs." "$LINENO" 5 @@ -181230,6 +189607,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_freetype_libs" >&5 $as_echo "$with_freetype_libs" >&6; } ======= @@ -181273,6 +189651,8 @@ $as_echo "$with_freetype_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_freetype_libs" >&5 printf "%s\n" "$with_freetype_libs" >&6; } ======= @@ -181293,6 +189673,7 @@ $as_echo "$with_freetype_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -181322,6 +189703,8 @@ $as_echo "$with_freetype_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_freetype_libs" >&5 $as_echo "$with_freetype_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -181339,6 +189722,7 @@ $as_echo "$with_freetype_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -181381,6 +189765,8 @@ $as_echo "$with_freetype_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_freetype_libs"; then for dir in $with_freetype_libs; do @@ -181419,6 +189805,7 @@ LDFLAGS="$FTLIB $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 @@ -181456,6 +189843,8 @@ $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 printf %s "checking for FT_Init_FreeType in -lfreetype... " >&6; } ======= @@ -181476,6 +189865,7 @@ ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -181510,6 +189900,8 @@ ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" @@ -181527,6 +189919,7 @@ LIBS="-lfreetype $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -181590,6 +189983,8 @@ LIBS="-lfreetype $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -181633,6 +190028,7 @@ char FT_Init_FreeType(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -181656,6 +190052,8 @@ char FT_Init_FreeType(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } @@ -181689,6 +190087,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -181717,6 +190116,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -181747,6 +190148,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_freetype_FT_Init_FreeType=no fi @@ -181904,6 +190306,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -181937,6 +190341,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -181965,6 +190370,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_freetype_FT_Init_FreeType=no fi @@ -181983,6 +190390,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -182025,6 +190433,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -182050,6 +190460,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -182141,6 +190552,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -182185,6 +190601,7 @@ fi # $USE_FREETYPE <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -182235,6 +190652,8 @@ fi # $USE_FREETYPE >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 printf %s "checking whether to use NLS... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_nls\"" >&5 @@ -182258,6 +190677,7 @@ echo "$ac_t"""$with_nls"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -182337,6 +190757,11 @@ echo "$ac_t"""$with_nls"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 $as_echo_n "checking whether to use NLS... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_nls\"" >&5 @@ -182358,6 +190783,7 @@ $as_echo "\"$with_nls\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -182456,6 +190882,11 @@ $as_echo "\"$with_nls\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_nls" in "no") USE_NLS= ;; "yes") USE_NLS="1" ;; @@ -182486,6 +190917,7 @@ if test -n "${USE_NLS}" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo "#define USE_NLS 1" >>confdefs.h ======= <<<<<<< HEAD @@ -182511,6 +190943,8 @@ $as_echo "#define USE_NLS 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" "#define USE_NLS 1" >>confdefs.h >>>>>>> osgeo-main @@ -182538,6 +190972,7 @@ echo "configure:12521: checking for gettext" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -182617,6 +191052,8 @@ $as_echo_n "checking for gettext in -lintl... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat > conftest.$ac_ext <>>>>>> main @@ -182704,6 +191142,8 @@ else $as_nop >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5 printf %s "checking for gettext in -lintl... " >&6; } ======= @@ -182724,6 +191164,7 @@ ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -182758,6 +191199,8 @@ ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" @@ -182775,6 +191218,7 @@ LIBS="-lintl $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -182910,6 +191354,8 @@ LIBS="-lintl $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -182953,6 +191399,7 @@ char gettext(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -182976,6 +191423,8 @@ char gettext(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= $as_echo "#define USE_NLS 1" >>confdefs.h @@ -183022,6 +191471,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -183175,6 +191625,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -183208,6 +191660,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -183237,6 +191690,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= $as_echo "#define USE_NLS 1" >>confdefs.h @@ -183288,6 +191743,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -183330,6 +191786,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -183355,6 +191813,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -183445,6 +191904,11 @@ else >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate gettext() function." "$LINENO" 5 @@ -183481,6 +191945,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # Enable openDWG option @@ -183534,12 +191999,17 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -183730,6 +192200,7 @@ echo "$ac_t"""$with_opendwg"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -183759,6 +192230,8 @@ echo "$ac_t"""$with_opendwg"" 1>&6 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Enable openDWG option @@ -183776,6 +192249,7 @@ echo "$ac_t"""$with_opendwg"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -183805,6 +192279,8 @@ echo "$ac_t"""$with_opendwg"" 1>&6 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # Enable openDWG option @@ -183823,6 +192299,7 @@ echo "$ac_t"""$with_opendwg"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -183865,6 +192342,8 @@ echo "$ac_t"""$with_opendwg"" 1>&6 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use openDWG" >&5 $as_echo_n "checking whether to use openDWG... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_opendwg\"" >&5 @@ -183886,6 +192365,7 @@ $as_echo "\"$with_opendwg\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -183984,6 +192464,11 @@ $as_echo "\"$with_opendwg\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_opendwg" in "no") USE_OPENDWG= ;; "yes") USE_OPENDWG="1" ;; @@ -184022,6 +192507,7 @@ if test -n "${USE_OPENDWG}"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of openDGW includes" >&5 @@ -184074,6 +192560,8 @@ $as_echo_n "checking for location of openDGW includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of openDGW includes" >&5 printf %s "checking for location of openDGW includes... " >&6; } ======= @@ -184094,6 +192582,7 @@ echo "configure:12795: checking for location of openDGW includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -184123,6 +192612,8 @@ echo "configure:12795: checking for location of openDGW includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of openDGW includes" >&5 $as_echo_n "checking for location of openDGW includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -184140,6 +192631,7 @@ $as_echo_n "checking for location of openDGW includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -184169,6 +192661,8 @@ $as_echo_n "checking for location of openDGW includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of openDGW includes" >&5 $as_echo_n "checking for location of openDGW includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -184186,6 +192680,7 @@ $as_echo_n "checking for location of openDGW includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -184234,6 +192729,8 @@ $as_echo_n "checking for location of openDGW includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opendwg_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opendwg-includes." "$LINENO" 5 @@ -184256,6 +192753,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_includes" >&5 $as_echo "$with_opendwg_includes" >&6; } ======= @@ -184299,6 +192797,8 @@ $as_echo "$with_opendwg_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_includes" >&5 printf "%s\n" "$with_opendwg_includes" >&6; } ======= @@ -184319,6 +192819,7 @@ $as_echo "$with_opendwg_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -184348,6 +192849,8 @@ $as_echo "$with_opendwg_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_includes" >&5 $as_echo "$with_opendwg_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -184365,6 +192868,7 @@ $as_echo "$with_opendwg_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -184407,6 +192911,8 @@ $as_echo "$with_opendwg_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opendwg_includes" ; then for dir in $with_opendwg_includes; do @@ -184443,6 +192949,7 @@ CPPFLAGS="$OPENDWGINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -184492,6 +192999,8 @@ CPPFLAGS="$OPENDWGINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in ad2.h do : @@ -184523,6 +193032,7 @@ echo "configure:12821: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -184602,6 +193112,11 @@ echo "configure:12821: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in ad2.h do : ac_fn_c_check_header_mongrel "$LINENO" "ad2.h" "ac_cv_header_ad2_h" "$ac_includes_default" @@ -184626,6 +193141,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -184661,6 +193177,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -184675,6 +193193,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -184826,6 +193345,8 @@ else >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -184855,6 +193376,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -184869,6 +193391,9 @@ fi ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main else @@ -184882,6 +193407,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -184895,6 +193421,8 @@ done ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_error $? "*** Unable to locate openDWG includes." "$LINENO" 5 @@ -184907,6 +193435,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -184937,6 +193466,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -184966,6 +193497,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of openDWG library" >&5 @@ -185018,6 +193550,8 @@ $as_echo_n "checking for location of openDWG library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of openDWG library" >&5 printf %s "checking for location of openDWG library... " >&6; } ======= @@ -185038,6 +193572,7 @@ echo "configure:12863: checking for location of openDWG library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -185067,6 +193602,8 @@ echo "configure:12863: checking for location of openDWG library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of openDWG library" >&5 $as_echo_n "checking for location of openDWG library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -185084,6 +193621,7 @@ $as_echo_n "checking for location of openDWG library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -185113,6 +193651,8 @@ $as_echo_n "checking for location of openDWG library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of openDWG library" >&5 $as_echo_n "checking for location of openDWG library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -185130,6 +193670,7 @@ $as_echo_n "checking for location of openDWG library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -185178,6 +193719,8 @@ $as_echo_n "checking for location of openDWG library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opendwg_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opendwg-libs." "$LINENO" 5 @@ -185200,6 +193743,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_libs" >&5 $as_echo "$with_opendwg_libs" >&6; } ======= @@ -185243,6 +193787,8 @@ $as_echo "$with_opendwg_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_libs" >&5 printf "%s\n" "$with_opendwg_libs" >&6; } ======= @@ -185263,6 +193809,7 @@ $as_echo "$with_opendwg_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -185292,6 +193839,8 @@ $as_echo "$with_opendwg_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_libs" >&5 $as_echo "$with_opendwg_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -185309,6 +193858,7 @@ $as_echo "$with_opendwg_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -185351,6 +193901,8 @@ $as_echo "$with_opendwg_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opendwg_libs"; then for dir in $with_opendwg_libs; do @@ -185406,6 +193958,7 @@ fi # $USE_OPENDWG <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -185456,6 +194009,8 @@ fi # $USE_OPENDWG >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use POSIX threads" >&5 printf %s "checking whether to use POSIX threads... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_pthread\"" >&5 @@ -185479,6 +194034,7 @@ echo "$ac_t"""$with_pthread"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -185558,6 +194114,11 @@ echo "$ac_t"""$with_pthread"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use POSIX threads" >&5 $as_echo_n "checking whether to use POSIX threads... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_pthread\"" >&5 @@ -185579,6 +194140,7 @@ $as_echo "\"$with_pthread\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -185677,6 +194239,11 @@ $as_echo "\"$with_pthread\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_pthread" in "no") USE_PTHREAD= ;; "yes") USE_PTHREAD="1" ;; @@ -185715,6 +194282,7 @@ if test -n "$USE_PTHREAD"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads includes" >&5 @@ -185767,6 +194335,8 @@ $as_echo_n "checking for location of POSIX threads includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads includes" >&5 printf %s "checking for location of POSIX threads includes... " >&6; } ======= @@ -185787,6 +194357,7 @@ echo "configure:12924: checking for location of POSIX threads includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -185816,6 +194387,8 @@ echo "configure:12924: checking for location of POSIX threads includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads includes" >&5 $as_echo_n "checking for location of POSIX threads includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -185833,6 +194406,7 @@ $as_echo_n "checking for location of POSIX threads includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -185862,6 +194436,8 @@ $as_echo_n "checking for location of POSIX threads includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads includes" >&5 $as_echo_n "checking for location of POSIX threads includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -185879,6 +194455,7 @@ $as_echo_n "checking for location of POSIX threads includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -185927,6 +194504,8 @@ $as_echo_n "checking for location of POSIX threads includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_pthread_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-pthread-includes." "$LINENO" 5 @@ -185949,6 +194528,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pthread_includes" >&5 $as_echo "$with_pthread_includes" >&6; } ======= @@ -185992,6 +194572,8 @@ $as_echo "$with_pthread_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_pthread_includes" >&5 printf "%s\n" "$with_pthread_includes" >&6; } ======= @@ -186012,6 +194594,7 @@ $as_echo "$with_pthread_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -186041,6 +194624,8 @@ $as_echo "$with_pthread_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pthread_includes" >&5 $as_echo "$with_pthread_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -186058,6 +194643,7 @@ $as_echo "$with_pthread_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -186100,6 +194686,8 @@ $as_echo "$with_pthread_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_pthread_includes" ; then for dir in $with_pthread_includes; do @@ -186136,6 +194724,7 @@ CPPFLAGS="$PTHREADINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -186185,6 +194774,8 @@ CPPFLAGS="$PTHREADINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in pthread.h do : @@ -186216,6 +194807,7 @@ echo "configure:12950: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -186295,6 +194887,11 @@ echo "configure:12950: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in pthread.h do : ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" @@ -186319,6 +194916,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -186354,6 +194952,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -186368,6 +194968,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -186413,6 +195014,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -186445,6 +195048,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -186479,6 +195083,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -186510,6 +195116,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -186626,6 +195233,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -186655,6 +195264,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads library" >&5 @@ -186707,6 +195317,8 @@ $as_echo_n "checking for location of POSIX threads library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads library" >&5 printf %s "checking for location of POSIX threads library... " >&6; } ======= @@ -186727,6 +195339,7 @@ echo "configure:12992: checking for location of POSIX threads library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -186756,6 +195369,8 @@ echo "configure:12992: checking for location of POSIX threads library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads library" >&5 $as_echo_n "checking for location of POSIX threads library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -186773,6 +195388,7 @@ $as_echo_n "checking for location of POSIX threads library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -186802,6 +195418,8 @@ $as_echo_n "checking for location of POSIX threads library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of POSIX threads library" >&5 $as_echo_n "checking for location of POSIX threads library... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -186819,6 +195437,7 @@ $as_echo_n "checking for location of POSIX threads library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -186867,6 +195486,8 @@ $as_echo_n "checking for location of POSIX threads library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_pthread_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-pthread-libs." "$LINENO" 5 @@ -186889,6 +195510,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pthread_libs" >&5 $as_echo "$with_pthread_libs" >&6; } ======= @@ -186932,6 +195554,8 @@ $as_echo "$with_pthread_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_pthread_libs" >&5 printf "%s\n" "$with_pthread_libs" >&6; } ======= @@ -186952,6 +195576,7 @@ $as_echo "$with_pthread_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -186981,6 +195606,8 @@ $as_echo "$with_pthread_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pthread_libs" >&5 $as_echo "$with_pthread_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -186998,6 +195625,7 @@ $as_echo "$with_pthread_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -187040,6 +195668,8 @@ $as_echo "$with_pthread_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_pthread_libs"; then for dir in $with_pthread_libs; do @@ -187078,6 +195708,7 @@ LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" @@ -187131,6 +195762,8 @@ if test "x$ac_cv_func_pthread_create" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" if test "x$ac_cv_func_pthread_create" = xyes then : @@ -187192,6 +195825,7 @@ if eval "test \"`echo '$ac_cv_func_'pthread_create`\" = yes"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -187221,6 +195855,8 @@ if eval "test \"`echo '$ac_cv_func_'pthread_create`\" = yes"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" if test "x$ac_cv_func_pthread_create" = xyes; then : @@ -187239,6 +195875,7 @@ if test "x$ac_cv_func_pthread_create" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -187268,6 +195905,8 @@ if test "x$ac_cv_func_pthread_create" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" if test "x$ac_cv_func_pthread_create" = xyes; then : @@ -187286,6 +195925,7 @@ if test "x$ac_cv_func_pthread_create" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -187333,6 +195973,8 @@ if test "x$ac_cv_func_pthread_create" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main PTHREADLIB="$PTHREADLIB " @@ -187359,6 +196001,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -187450,6 +196093,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ac_save_ldflags="$LDFLAGS" @@ -187477,6 +196125,7 @@ LDFLAGS="$PTHREADLIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 @@ -187514,6 +196163,8 @@ $as_echo_n "checking for pthread_create in -lpthread... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 printf %s "checking for pthread_create in -lpthread... " >&6; } ======= @@ -187534,6 +196185,7 @@ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -187568,6 +196220,8 @@ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" @@ -187585,6 +196239,7 @@ LIBS="-lpthread $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -187648,6 +196303,8 @@ LIBS="-lpthread $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -187691,6 +196348,7 @@ char pthread_create(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -187714,6 +196372,8 @@ char pthread_create(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 $as_echo_n "checking for pthread_create in -lpthread... " >&6; } @@ -187747,6 +196407,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -187775,6 +196436,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -187805,6 +196468,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_pthread_pthread_create=no fi @@ -187962,6 +196626,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -187995,6 +196661,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -188023,6 +196690,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_pthread_pthread_create=no fi @@ -188041,6 +196710,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -188083,6 +196753,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -188108,6 +196780,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -188199,6 +196872,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -188252,6 +196930,7 @@ fi # $USE_PTHREAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -188302,6 +196981,8 @@ fi # $USE_PTHREAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use OpenMP" >&5 printf %s "checking whether to use OpenMP... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_openmp\"" >&5 @@ -188325,6 +197006,7 @@ echo "$ac_t"""$with_openmp"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -188404,6 +197086,11 @@ echo "$ac_t"""$with_openmp"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use OpenMP" >&5 $as_echo_n "checking whether to use OpenMP... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_openmp\"" >&5 @@ -188425,6 +197112,7 @@ $as_echo "\"$with_openmp\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -188523,6 +197211,11 @@ $as_echo "\"$with_openmp\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_openmp" in "no") USE_OPENMP= ;; "yes") USE_OPENMP="1" ;; @@ -188562,6 +197255,7 @@ OPENMP_CFLAGS= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP includes" >&5 @@ -188614,6 +197308,8 @@ $as_echo_n "checking for location of OpenMP includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP includes" >&5 printf %s "checking for location of OpenMP includes... " >&6; } ======= @@ -188634,6 +197330,7 @@ echo "configure:13158: checking for location of OpenMP includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -188663,6 +197360,8 @@ echo "configure:13158: checking for location of OpenMP includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP includes" >&5 $as_echo_n "checking for location of OpenMP includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -188680,6 +197379,7 @@ $as_echo_n "checking for location of OpenMP includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -188709,6 +197409,8 @@ $as_echo_n "checking for location of OpenMP includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP includes" >&5 $as_echo_n "checking for location of OpenMP includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -188726,6 +197428,7 @@ $as_echo_n "checking for location of OpenMP includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -188774,6 +197477,8 @@ $as_echo_n "checking for location of OpenMP includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_openmp_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-openmp-includes." "$LINENO" 5 @@ -188796,6 +197501,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_openmp_includes" >&5 $as_echo "$with_openmp_includes" >&6; } ======= @@ -188839,6 +197545,8 @@ $as_echo "$with_openmp_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_openmp_includes" >&5 printf "%s\n" "$with_openmp_includes" >&6; } ======= @@ -188859,6 +197567,7 @@ $as_echo "$with_openmp_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -188888,6 +197597,8 @@ $as_echo "$with_openmp_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_openmp_includes" >&5 $as_echo "$with_openmp_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -188905,6 +197616,7 @@ $as_echo "$with_openmp_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -188947,6 +197659,8 @@ $as_echo "$with_openmp_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_openmp_includes" ; then for dir in $with_openmp_includes; do @@ -188980,6 +197694,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -189010,6 +197725,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP library" >&5 printf %s "checking for location of OpenMP library... " >&6; } ======= @@ -189028,6 +197745,7 @@ printf %s "checking for location of OpenMP library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -189092,6 +197810,8 @@ printf %s "checking for location of OpenMP library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP library" >&5 $as_echo_n "checking for location of OpenMP library... " >&6; } case "$with_openmp_libs" in @@ -189161,6 +197881,7 @@ echo "configure:13230: checking for location of OpenMP library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f6958f78a7 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= ======= @@ -189444,6 +198165,8 @@ echo "configure:13230: checking for location of OpenMP library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenMP library" >&5 $as_echo_n "checking for location of OpenMP library... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -189467,6 +198190,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -189506,6 +198230,8 @@ esac >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_openmp_libs" >&5 printf "%s\n" "$with_openmp_libs" >&6; } ======= @@ -189526,6 +198252,7 @@ $as_echo "$with_openmp_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -189555,6 +198282,8 @@ $as_echo "$with_openmp_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_openmp_libs" >&5 $as_echo "$with_openmp_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -189570,6 +198299,7 @@ $as_echo "$with_openmp_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -189607,6 +198337,8 @@ $as_echo "$with_openmp_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_openmp_libs"; then for dir in $with_openmp_libs; do @@ -189650,6 +198382,7 @@ ac_save_libs="$LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -189673,6 +198406,8 @@ ac_save_libs="$LIBS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ac_save_ldflags="$LDFLAGS" LDFLAGS="$OPENMP_LIBPATH $LDFLAGS" @@ -189689,6 +198424,7 @@ LDFLAGS="$OPENMP_LIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -189762,6 +198498,8 @@ LDFLAGS="$OPENMP_LIBPATH $LDFLAGS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat > conftest.$ac_ext <>>>>>> main @@ -189838,6 +198577,8 @@ extern "C" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main() { @@ -189862,6 +198603,7 @@ GOMP_parallel_start(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -189927,6 +198669,10 @@ GOMP_parallel_start(); >>>>>>> osgeo-main ======= +<<<<<<< HEAD +>>>>>>> osgeo-main +======= + <<<<<<< HEAD >>>>>>> osgeo-main ; return 0; } @@ -189948,6 +198694,7 @@ if { (eval echo configure:13281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -189977,6 +198724,8 @@ if { (eval echo configure:13281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= ac_save_ldflags="$LDFLAGS" LDFLAGS="$OPENMP_LIBPATH $LDFLAGS" @@ -190010,6 +198759,7 @@ extern "C" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -190046,6 +198796,8 @@ extern "C" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char omp_get_num_threads (); int main () @@ -190072,6 +198824,7 @@ if ac_fn_c_try_link "$LINENO"; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -190120,6 +198873,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else ac_cv_lib_omp_omp_get_num_threads=no fi @@ -190144,6 +198899,7 @@ if test "x$ac_cv_lib_omp_omp_get_num_threads" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -190181,6 +198937,8 @@ if test "x$ac_cv_lib_omp_omp_get_num_threads" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -190208,6 +198966,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -190258,6 +199017,10 @@ CPPFLAGS=$ac_save_cppflags ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for omp_get_num_threads in -lomp" >&5 $as_echo_n "checking for omp_get_num_threads in -lomp... " >&6; } @@ -190304,6 +199067,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -190555,6 +199319,13 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) + ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main @@ -190585,6 +199356,7 @@ LDFLAGS="$OPENMP_LIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lgomp" >&5 @@ -190643,6 +199415,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for omp_get_num_threads in -lomp" >&5 printf %s "checking for omp_get_num_threads in -lomp... " >&6; } ======= @@ -190739,6 +199513,7 @@ char GOMP_parallel_start(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -190762,6 +199537,8 @@ char GOMP_parallel_start(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOMP_parallel_start in -lgomp" >&5 $as_echo_n "checking for GOMP_parallel_start in -lgomp... " >&6; } @@ -190795,6 +199572,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -190823,6 +199601,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -190853,6 +199633,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_gomp_GOMP_parallel_start=no fi @@ -191010,6 +199791,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -191043,6 +199826,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -191071,6 +199855,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_gomp_GOMP_parallel_start=no fi @@ -191089,6 +199875,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -191131,6 +199918,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -191156,6 +199945,7 @@ if test "x$ac_cv_lib_gomp_GOMP_parallel_start" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main OPENMP_LIB="$OPENMP_LIB -lgomp " @@ -191209,6 +199999,9 @@ else ======= OPENMP_LIB="$OPENMP_LIB -lgomp " >>>>>>> osgeo-main +======= + OPENMP_LIB="$OPENMP_LIB -lgomp " +>>>>>>> osgeo-main ======= <<<<<<< HEAD OMPLIB="$OMPLIB -lgomp " @@ -191228,6 +200021,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -191268,6 +200062,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -191285,6 +200081,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -191345,6 +200142,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -191384,6 +200183,7 @@ CFLAGS="${CFLAGS} ${OPENMP_INCPATH} ${OPENMP_LIBPATH} ${OPENMP_LIB}" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -191425,6 +200225,8 @@ CFLAGS="${CFLAGS} ${OPENMP_INCPATH} ${OPENMP_LIBPATH} ${OPENMP_LIB}" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -e penmp || test -e mp; then as_fn_error $? "AC_OPENMP clobbers files named 'mp' and 'penmp'. Aborting configure because one of these files already exists." "$LINENO" 5 fi @@ -191446,6 +200248,7 @@ then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -191481,6 +200284,8 @@ then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main OPENMP_CFLAGS= @@ -191501,6 +200306,7 @@ if test "${enable_openmp+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -191543,6 +200349,9 @@ if test "${enable_openmp+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main enableval=$enable_openmp; fi @@ -191560,6 +200369,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if test "$enable_openmp" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to support OpenMP" >&5 @@ -191617,6 +200427,8 @@ fi ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main OPENMP_CFLAGS= if test "$enable_openmp" != no; then @@ -191637,6 +200449,7 @@ printf %s "checking for $CC option to support OpenMP... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= @@ -191699,6 +200512,10 @@ printf %s "checking for $CC option to support OpenMP... " >&6; } ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main # try to build a test program with "$CC $OMPCLFAGS" to confirm it works #...how? #echo "int main() {return 0;}" > test.c @@ -191718,6 +200535,7 @@ printf %s "checking for $CC option to support OpenMP... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -191752,6 +200570,8 @@ printf %s "checking for $CC option to support OpenMP... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ac_cv_prog_c_openmp='not found' @@ -191836,6 +200656,7 @@ $as_echo_n "checking for $CC option to support OpenMP... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -191865,6 +200686,8 @@ $as_echo_n "checking for $CC option to support OpenMP... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= if test "$enable_openmp" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to support OpenMP" >&5 @@ -191886,6 +200709,7 @@ $as_echo_n "checking for $CC option to support OpenMP... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -191928,6 +200752,8 @@ $as_echo_n "checking for $CC option to support OpenMP... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -191994,6 +200820,7 @@ $as_echo "$ac_cv_prog_c_openmp" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -192084,6 +200911,11 @@ $as_echo "$ac_cv_prog_c_openmp" >&6; } >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main fi @@ -192136,6 +200968,7 @@ fi # enable_openmp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -192186,6 +201019,8 @@ fi # enable_openmp >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use OpenCL" >&5 printf %s "checking whether to use OpenCL... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_opencl\"" >&5 @@ -192209,6 +201044,7 @@ echo "$ac_t"""$with_opencl"" 1>&6 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -192288,6 +201124,11 @@ echo "$ac_t"""$with_opencl"" 1>&6 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use OpenCL" >&5 $as_echo_n "checking whether to use OpenCL... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$with_opencl\"" >&5 @@ -192309,6 +201150,7 @@ $as_echo "\"$with_opencl\"" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -192407,6 +201249,11 @@ $as_echo "\"$with_opencl\"" >&6; } ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main case "$with_opencl" in "no") USE_OPENCL= ;; "yes") USE_OPENCL="1" ;; @@ -192445,6 +201292,7 @@ if test -n "$USE_OPENCL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL includes" >&5 @@ -192497,6 +201345,8 @@ $as_echo_n "checking for location of OpenCL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL includes" >&5 printf %s "checking for location of OpenCL includes... " >&6; } ======= @@ -192517,6 +201367,7 @@ echo "configure:13418: checking for location of OpenCL includes" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -192546,6 +201397,8 @@ echo "configure:13418: checking for location of OpenCL includes" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL includes" >&5 $as_echo_n "checking for location of OpenCL includes... " >&6; } >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -192563,6 +201416,7 @@ $as_echo_n "checking for location of OpenCL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -192592,6 +201446,8 @@ $as_echo_n "checking for location of OpenCL includes... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL includes" >&5 $as_echo_n "checking for location of OpenCL includes... " >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -192609,6 +201465,7 @@ $as_echo_n "checking for location of OpenCL includes... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -192657,6 +201514,8 @@ $as_echo_n "checking for location of OpenCL includes... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opencl_includes" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opencl-includes." "$LINENO" 5 @@ -192679,6 +201538,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opencl_includes" >&5 $as_echo "$with_opencl_includes" >&6; } ======= @@ -192722,6 +201582,8 @@ $as_echo "$with_opencl_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opencl_includes" >&5 printf "%s\n" "$with_opencl_includes" >&6; } ======= @@ -192742,6 +201604,7 @@ $as_echo "$with_opencl_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -192771,6 +201634,8 @@ $as_echo "$with_opencl_includes" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opencl_includes" >&5 $as_echo "$with_opencl_includes" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -192788,6 +201653,7 @@ $as_echo "$with_opencl_includes" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -192830,6 +201696,8 @@ $as_echo "$with_opencl_includes" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opencl_includes" ; then for dir in $with_opencl_includes; do @@ -192867,6 +201735,7 @@ CPPFLAGS="$OCLINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -192916,6 +201785,8 @@ CPPFLAGS="$OCLINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in OpenCL/opencl.h do : @@ -192947,6 +201818,7 @@ echo "configure:13445: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -193026,6 +201898,11 @@ echo "configure:13445: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in OpenCL/opencl.h do : ac_fn_c_check_header_mongrel "$LINENO" "OpenCL/opencl.h" "ac_cv_header_OpenCL_opencl_h" "$ac_includes_default" @@ -193050,6 +201927,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -193085,6 +201963,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -193099,6 +201979,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -193144,6 +202025,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -193176,6 +202059,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -193210,6 +202094,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -193241,6 +202127,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -193357,6 +202244,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -193392,6 +202281,7 @@ LDFLAGS=" $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ac_fn_c_check_func "$LINENO" "clGetPlatformInfo" "ac_cv_func_clGetPlatformInfo" @@ -193445,6 +202335,8 @@ if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_fn_c_check_func "$LINENO" "clGetPlatformInfo" "ac_cv_func_clGetPlatformInfo" if test "x$ac_cv_func_clGetPlatformInfo" = xyes then : @@ -193506,6 +202398,7 @@ if eval "test \"`echo '$ac_cv_func_'clGetPlatformInfo`\" = yes"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -193535,6 +202428,8 @@ if eval "test \"`echo '$ac_cv_func_'clGetPlatformInfo`\" = yes"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "clGetPlatformInfo" "ac_cv_func_clGetPlatformInfo" if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : @@ -193553,6 +202448,7 @@ if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -193582,6 +202478,8 @@ if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ac_fn_c_check_func "$LINENO" "clGetPlatformInfo" "ac_cv_func_clGetPlatformInfo" if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : @@ -193600,6 +202498,7 @@ if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -193647,6 +202546,8 @@ if test "x$ac_cv_func_clGetPlatformInfo" = xyes; then : ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main OCLLIB="$OCLLIB -framework OpenCL" @@ -193673,6 +202574,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -193764,6 +202666,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_fn_error $? "*** Unable to locate OpenCL library." "$LINENO" 5 @@ -193800,6 +202707,7 @@ CPPFLAGS="$OCLINCPATH $CPPFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -193849,6 +202757,8 @@ CPPFLAGS="$OCLINCPATH $CPPFLAGS" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for ac_header in CL/cl.h do : @@ -193880,6 +202790,7 @@ echo "configure:13558: checking for $ac_hdr" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -193959,6 +202870,11 @@ echo "configure:13558: checking for $ac_hdr" >&5 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main for ac_header in CL/cl.h do : ac_fn_c_check_header_mongrel "$LINENO" "CL/cl.h" "ac_cv_header_CL_cl_h" "$ac_includes_default" @@ -193983,6 +202899,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else @@ -194018,6 +202935,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) else @@ -194032,6 +202951,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -194077,6 +202997,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "$ac_err" >&5 echo "configure: failed program was:" >&5 @@ -194109,6 +203031,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -194143,6 +203066,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi ======= @@ -194174,6 +203099,7 @@ done <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD done ======= @@ -194290,6 +203216,8 @@ done >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main done CPPFLAGS=$ac_save_cppflags @@ -194317,6 +203245,7 @@ CPPFLAGS=$ac_save_cppflags <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main @@ -194370,6 +203299,8 @@ $as_echo_n "checking for location of OpenCL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL library" >&5 printf %s "checking for location of OpenCL library... " >&6; } @@ -194392,6 +203323,7 @@ echo "configure:13599: checking for location of OpenCL library" >&5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -194421,6 +203353,8 @@ echo "configure:13599: checking for location of OpenCL library" >&5 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL library" >&5 $as_echo_n "checking for location of OpenCL library... " >&6; } @@ -194439,6 +203373,7 @@ $as_echo_n "checking for location of OpenCL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -194468,6 +203403,8 @@ $as_echo_n "checking for location of OpenCL library... " >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of OpenCL library" >&5 $as_echo_n "checking for location of OpenCL library... " >&6; } @@ -194486,6 +203423,7 @@ $as_echo_n "checking for location of OpenCL library... " >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -194534,6 +203472,8 @@ $as_echo_n "checking for location of OpenCL library... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main case "$with_opencl_libs" in y | ye | yes | n | no) as_fn_error $? "*** You must supply a directory to --with-opencl-libs." "$LINENO" 5 @@ -194556,6 +203496,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opencl_libs" >&5 $as_echo "$with_opencl_libs" >&6; } ======= @@ -194599,6 +203540,8 @@ $as_echo "$with_opencl_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opencl_libs" >&5 printf "%s\n" "$with_opencl_libs" >&6; } ======= @@ -194619,6 +203562,7 @@ $as_echo "$with_opencl_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -194648,6 +203592,8 @@ $as_echo "$with_opencl_libs" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_opencl_libs" >&5 $as_echo "$with_opencl_libs" >&6; } >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -194665,6 +203611,7 @@ $as_echo "$with_opencl_libs" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -194707,6 +203654,8 @@ $as_echo "$with_opencl_libs" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test -n "$with_opencl_libs"; then for dir in $with_opencl_libs; do @@ -194744,6 +203693,7 @@ LDFLAGS="$OCLLIBPATH $LDFLAGS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 @@ -194781,6 +203731,8 @@ $as_echo_n "checking for clGetPlatformInfo in -lOpenCL... " >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 printf %s "checking for clGetPlatformInfo in -lOpenCL... " >&6; } ======= @@ -194801,6 +203753,7 @@ ac_lib_var=`echo OpenCL'_'clGetPlatformInfo | sed 'y%./+-%__p_%'` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -194835,6 +203788,8 @@ ac_lib_var=`echo OpenCL'_'clGetPlatformInfo | sed 'y%./+-%__p_%'` >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_check_lib_save_LIBS=$LIBS LIBS="-lOpenCL $LIBS" @@ -194852,6 +203807,7 @@ LIBS="-lOpenCL $LIBS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -194915,6 +203871,8 @@ LIBS="-lOpenCL $LIBS" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -194958,6 +203916,7 @@ char clGetPlatformInfo(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -194981,6 +203940,8 @@ char clGetPlatformInfo(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 $as_echo_n "checking for clGetPlatformInfo in -lOpenCL... " >&6; } @@ -195014,6 +203975,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -195042,6 +204004,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ @@ -195072,6 +204036,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_cv_lib_OpenCL_clGetPlatformInfo=no fi @@ -195229,6 +204194,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -195262,6 +204229,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -195290,6 +204258,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_cv_lib_OpenCL_clGetPlatformInfo=no fi @@ -195308,6 +204278,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -195350,6 +204321,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS @@ -195375,6 +204348,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -195466,6 +204440,11 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LDFLAGS=${ac_save_ldflags} @@ -195512,6 +204491,7 @@ fi # $USE_OPENCL <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test "${enable_largefile+set}" = set; then : ======= <<<<<<< HEAD @@ -195554,6 +204534,8 @@ if test "${enable_largefile+set}" = set; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test ${enable_largefile+y} then : ======= @@ -195573,6 +204555,7 @@ if test "${enable_largefile+set}" = set; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test "${enable_largefile+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -195655,6 +204638,11 @@ if test "${enable_largefile+set}" = set; then : ======= if test "${enable_largefile+set}" = set; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test "${enable_largefile+set}" = set; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main enableval=$enable_largefile; fi @@ -195688,6 +204676,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 @@ -195739,6 +204728,8 @@ $as_echo_n "checking for special C compiler options needed for large files... " ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 printf %s "checking for special C compiler options needed for large files... " >&6; } @@ -195760,6 +204751,7 @@ echo "configure:13700: checking for special C compiler options needed for large <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -195788,6 +204780,8 @@ echo "configure:13700: checking for special C compiler options needed for large >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 $as_echo_n "checking for special C compiler options needed for large files... " >&6; } @@ -195806,6 +204800,7 @@ $as_echo_n "checking for special C compiler options needed for large files... " <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -195834,6 +204829,8 @@ $as_echo_n "checking for special C compiler options needed for large files... " >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 $as_echo_n "checking for special C compiler options needed for large files... " >&6; } @@ -195852,6 +204849,7 @@ $as_echo_n "checking for special C compiler options needed for large files... " <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -195900,6 +204898,8 @@ $as_echo_n "checking for special C compiler options needed for large files... " >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_cv_sys_largefile_CC=no largefile_cc_opt="" @@ -195927,6 +204927,7 @@ ac_cv_sys_largefile_CC=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -196026,6 +205027,11 @@ ac_cv_sys_largefile_CC=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ ======= +>>>>>>> osgeo-main +======= + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +======= >>>>>>> osgeo-main cat > conftest.$ac_ext <>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -196073,6 +205080,8 @@ ac_cv_sys_largefile_CC=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -196091,6 +205100,7 @@ ac_cv_sys_largefile_CC=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -196119,6 +205129,8 @@ ac_cv_sys_largefile_CC=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -196137,6 +205149,7 @@ ac_cv_sys_largefile_CC=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -196185,6 +205198,8 @@ ac_cv_sys_largefile_CC=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include /* Check that off_t can represent 2**63 - 1 correctly. We can't simply "#define LARGE_OFF_T 9223372036854775807", @@ -196216,6 +205231,7 @@ ac_cv_sys_largefile_CC=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main int @@ -196268,6 +205284,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) ======= @@ -196288,6 +205306,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -196317,6 +205336,8 @@ main () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -196334,6 +205355,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -196376,6 +205398,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { ; @@ -196399,6 +205423,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : else @@ -196443,6 +205468,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -196466,6 +205493,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -196501,6 +205529,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_save_CC="${CC-cc}" CC="$CC -n32" @@ -196522,6 +205552,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -196579,6 +205610,9 @@ else ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main ; return 0; } EOF if { (eval echo configure:13724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then @@ -196597,6 +205631,7 @@ if { (eval echo configure:13724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -196626,6 +205661,8 @@ if { (eval echo configure:13724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -196641,6 +205678,7 @@ if ac_fn_c_try_compile "$LINENO"; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -196664,6 +205702,8 @@ if ac_fn_c_try_compile "$LINENO"; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else ac_save_CC="${CC-cc}" CC="$CC -n32" @@ -196678,6 +205718,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) @@ -196732,6 +205773,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cat > conftest.$ac_ext <>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -196779,6 +205823,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -196797,6 +205843,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -196872,6 +205919,10 @@ else ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #include /* Check that off_t can represent 2**63 - 1 correctly. We can't simply "#define LARGE_OFF_T 9223372036854775807", @@ -196903,6 +205954,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main int @@ -196955,6 +206007,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) ======= @@ -196975,6 +206029,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -197004,6 +206059,8 @@ main () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -197021,6 +206078,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -197063,6 +206121,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { ; @@ -197086,6 +206146,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32' fi @@ -197137,6 +206198,8 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ======= @@ -197180,6 +206243,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -197209,6 +206273,8 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32' fi @@ -197234,6 +206300,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -197275,6 +206342,8 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if test "$ac_cv_sys_largefile_CC" != no; then CC="$CC$ac_cv_sys_largefile_CC" @@ -197309,6 +206378,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 @@ -197364,6 +206434,8 @@ ac_cv_sys_file_offset_bits=no ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } @@ -197394,6 +206466,7 @@ ac_cv_sys_file_offset_bits=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -197422,6 +206495,8 @@ ac_cv_sys_file_offset_bits=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } @@ -197444,6 +206519,7 @@ ac_cv_sys_file_offset_bits=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -197472,6 +206548,8 @@ ac_cv_sys_file_offset_bits=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } @@ -197494,6 +206572,7 @@ ac_cv_sys_file_offset_bits=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -197542,6 +206621,8 @@ ac_cv_sys_file_offset_bits=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include /* Check that off_t can represent 2**63 - 1 correctly. We can't simply "#define LARGE_OFF_T 9223372036854775807", @@ -197573,6 +206654,7 @@ ac_cv_sys_file_offset_bits=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main int @@ -197625,6 +206707,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) ======= @@ -197645,6 +206729,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -197674,6 +206759,8 @@ main () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -197691,6 +206778,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -197733,6 +206821,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { ; @@ -197756,6 +206846,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : else @@ -197802,6 +206893,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -197835,6 +206928,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -197864,6 +206958,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : else @@ -197884,6 +206980,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -197913,6 +207010,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : else @@ -197933,6 +207032,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -197981,6 +207081,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #define _FILE_OFFSET_BITS 64 #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -198013,6 +207115,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main @@ -198066,6 +207169,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) @@ -198088,6 +207193,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -198117,6 +207223,8 @@ main () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () @@ -198135,6 +207243,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -198177,6 +207286,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { ; @@ -198200,6 +207311,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=64 fi @@ -198254,6 +207366,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ======= @@ -198301,6 +207415,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -198330,6 +207445,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=64 fi @@ -198358,6 +207475,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -198399,6 +207517,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @@ -198430,6 +207550,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 @@ -198485,6 +207606,8 @@ ac_cv_sys_large_files=no ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } @@ -198515,6 +207638,7 @@ ac_cv_sys_large_files=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -198543,6 +207667,8 @@ ac_cv_sys_large_files=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } @@ -198565,6 +207691,7 @@ ac_cv_sys_large_files=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -198593,6 +207720,8 @@ ac_cv_sys_large_files=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } @@ -198615,6 +207744,7 @@ ac_cv_sys_large_files=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -198663,6 +207793,8 @@ ac_cv_sys_large_files=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include /* Check that off_t can represent 2**63 - 1 correctly. We can't simply "#define LARGE_OFF_T 9223372036854775807", @@ -198694,6 +207826,7 @@ ac_cv_sys_large_files=no <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main int @@ -198746,6 +207879,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) ======= @@ -198766,6 +207901,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -198795,6 +207931,8 @@ main () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -198812,6 +207950,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -198854,6 +207993,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { ; @@ -198877,6 +208018,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : else @@ -198923,6 +208065,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -198956,6 +208100,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -198985,6 +208130,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : else @@ -199005,6 +208152,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -199034,6 +208182,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : else @@ -199054,6 +208204,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -199102,6 +208253,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #define _LARGE_FILES 1 #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -199134,6 +208287,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main @@ -199187,6 +208341,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) @@ -199209,6 +208365,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -199238,6 +208395,8 @@ main () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () @@ -199256,6 +208415,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -199298,6 +208458,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { ; @@ -199321,6 +208483,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=1 fi @@ -199375,6 +208538,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ======= @@ -199422,6 +208587,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -199451,6 +208617,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=1 fi @@ -199479,6 +208647,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -199520,6 +208689,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @@ -199551,6 +208722,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 @@ -199628,6 +208800,8 @@ return !fseeko; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } @@ -199651,6 +208825,7 @@ echo "configure:13918: checking for _LARGEFILE_SOURCE value needed for large fil <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -199692,6 +208867,8 @@ ac_cv_sys_largefile_source=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_cv_sys_largefile_source=no cat > conftest.$ac_ext <>>>>>> main @@ -199742,6 +208920,8 @@ ac_cv_sys_largefile_source=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include int main () @@ -199760,6 +208940,7 @@ return !fseeko; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -199803,6 +208984,9 @@ return !fseeko; >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } @@ -199827,6 +209011,7 @@ return !fseeko; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -199851,6 +209036,8 @@ return !fseeko; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 @@ -199875,6 +209062,7 @@ return !fseeko; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -199939,6 +209127,8 @@ return !fseeko; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -199960,6 +209150,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -199994,6 +209185,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -200022,6 +209215,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -200057,6 +209251,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ; return 0; } EOF if { (eval echo configure:13929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then @@ -200075,6 +209271,7 @@ if { (eval echo configure:13929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -200104,6 +209301,8 @@ if { (eval echo configure:13929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -200140,6 +209339,7 @@ rm -f conftest* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ac_cv_sys_largefile_source=no @@ -200307,6 +209507,8 @@ rm -f conftest* >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) @@ -200329,6 +209531,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -200358,6 +209561,8 @@ main () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () @@ -200375,6 +209580,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -200415,6 +209621,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { return !fseeko; ; @@ -200437,6 +209645,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_source=1 fi @@ -200491,6 +209700,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ac_cv_sys_largefile_source=1 @@ -200532,6 +209743,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -200561,6 +209773,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_source=1 fi @@ -200589,6 +209803,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -200630,6 +209845,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @@ -200667,6 +209884,7 @@ CFLAGS="$LFS_CFLAGS ${ac_save_cflags}" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 @@ -200745,6 +209963,8 @@ return !fseeko; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } @@ -200767,6 +209987,7 @@ echo "configure:13977: checking for _LARGEFILE_SOURCE value needed for large fil <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -200808,6 +210029,8 @@ ac_cv_sys_largefile_source=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_cv_sys_largefile_source=no cat > conftest.$ac_ext <>>>>>> main @@ -200858,6 +210082,8 @@ ac_cv_sys_largefile_source=no >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include int main () @@ -200876,6 +210102,7 @@ return !fseeko; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -200920,6 +210147,9 @@ return !fseeko; ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } @@ -200943,6 +210173,7 @@ return !fseeko; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -200967,6 +210198,8 @@ return !fseeko; >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 @@ -200991,6 +210224,7 @@ return !fseeko; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -201055,6 +210289,8 @@ return !fseeko; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -201076,6 +210312,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -201110,6 +210347,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : @@ -201138,6 +210377,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -201173,6 +210413,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ; return 0; } EOF if { (eval echo configure:13988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then @@ -201191,6 +210433,7 @@ if { (eval echo configure:13988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -201220,6 +210463,8 @@ if { (eval echo configure:13988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -201256,6 +210501,7 @@ rm -f conftest* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ac_cv_sys_largefile_source=no @@ -201423,6 +210669,8 @@ rm -f conftest* >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int main (void) @@ -201445,6 +210693,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -201474,6 +210723,8 @@ main () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int main () @@ -201491,6 +210742,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -201531,6 +210783,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { return !fseeko; ; @@ -201553,6 +210807,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_source=1 fi @@ -201607,6 +210862,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ac_cv_sys_largefile_source=1 @@ -201648,6 +210905,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -201677,6 +210935,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_source=1 fi @@ -201705,6 +210965,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -201746,6 +211007,8 @@ _ACEOF ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @@ -201781,6 +211044,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 @@ -201854,6 +211118,8 @@ return fseeko && fseeko (stdin, 0, 0); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 printf %s "checking for fseeko... " >&6; } @@ -201890,6 +211156,7 @@ return fseeko && fseeko (stdin, 0, 0); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -201918,6 +211185,8 @@ return fseeko && fseeko (stdin, 0, 0); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 $as_echo_n "checking for fseeko... " >&6; } @@ -201945,6 +211214,7 @@ return fseeko && fseeko (stdin, 0, 0); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -201973,6 +211243,8 @@ return fseeko && fseeko (stdin, 0, 0); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fseeko" >&5 $as_echo_n "checking for fseeko... " >&6; } @@ -202000,6 +211272,7 @@ return fseeko && fseeko (stdin, 0, 0); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -202047,6 +211320,8 @@ return fseeko && fseeko (stdin, 0, 0); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -202069,6 +211344,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_fseeko=yes fi @@ -202131,6 +211407,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_link "$LINENO" then : ======= @@ -202176,6 +211454,7 @@ cat > conftest.$ac_ext <>>>>>> main @@ -202258,6 +211537,8 @@ main (void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include #include int @@ -202289,6 +211570,9 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -202321,6 +211605,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main #include @@ -202451,6 +211736,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #include #include int @@ -202465,6 +211752,7 @@ main () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -202495,6 +211783,8 @@ main () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { /* @@ -202542,6 +211832,7 @@ return !ftello; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -202581,6 +211872,8 @@ return !ftello; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -202598,6 +211891,7 @@ return !ftello; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -202651,6 +211945,8 @@ return !ftello; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ; return 0; @@ -202673,6 +211969,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if ac_fn_c_try_compile "$LINENO"; then : ac_cv_largefiles=yes else @@ -202725,6 +212022,8 @@ $as_echo "#define HAVE_LARGEFILES 1" >>confdefs.h >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if ac_fn_c_try_compile "$LINENO" then : ======= @@ -202770,6 +212069,7 @@ $as_echo "#define HAVE_LARGEFILES 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -202799,6 +212099,8 @@ $as_echo "#define HAVE_LARGEFILES 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if ac_fn_c_try_compile "$LINENO"; then : ac_cv_largefiles=yes else @@ -202825,6 +212127,7 @@ $as_echo "#define HAVE_LARGEFILES 1" >>confdefs.h <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -202866,6 +212169,8 @@ $as_echo "#define HAVE_LARGEFILES 1" >>confdefs.h ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main USE_LARGEFILES=1 @@ -202920,6 +212225,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_i=`$as_echo "$ac_i" | sed "$ac_script"` ======= @@ -202962,6 +212268,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` ======= @@ -202981,6 +212289,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ac_i=`$as_echo "$ac_i" | sed "$ac_script"` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -203063,6 +212372,11 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ======= ac_i=`$as_echo "$ac_i" | sed "$ac_script"` >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. @@ -203096,6 +212410,7 @@ ac_clean_files="$ac_clean_files $CONFIG_STATUS" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ======= @@ -203139,6 +212454,8 @@ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} ======= @@ -203159,6 +212476,7 @@ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -203188,6 +212506,8 @@ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -203205,6 +212525,7 @@ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -203247,6 +212568,8 @@ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -203286,6 +212609,7 @@ DUALCASE=1; export DUALCASE # for MKS sh <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : ======= <<<<<<< HEAD @@ -203328,6 +212652,8 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : @@ -203348,6 +212674,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -203430,6 +212757,11 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : ======= if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main emulate sh NULLCMD=: @@ -203454,6 +212786,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD @@ -203496,6 +212829,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -203514,6 +212849,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -203596,6 +212932,11 @@ else ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +else +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main case `(set -o) 2>/dev/null` in #( *posix*) : @@ -203623,6 +212964,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -203664,6 +213006,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Reset variables that may have inherited troublesome values from # the environment. @@ -203719,6 +213063,7 @@ if ${PATH_SEPARATOR+false} :; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -203788,6 +213133,10 @@ if ${PATH_SEPARATOR+false} :; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main as_nl=' ' export as_nl @@ -203845,6 +213194,7 @@ if test "${PATH_SEPARATOR+set}" != set; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -203935,6 +213285,11 @@ if test "${PATH_SEPARATOR+set}" != set; then >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { @@ -203960,6 +213315,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -204052,6 +213408,11 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # IFS # We need space, tab and new line, in precisely that order. Quoting is # there to prevent editors from complaining about space-tab. @@ -204076,6 +213437,7 @@ IFS=" "" $as_nl" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -204167,6 +213529,11 @@ IFS=" "" $as_nl" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -204191,6 +213558,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break @@ -204234,6 +213602,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $as_dir in #((( '') as_dir=./ ;; @@ -204259,6 +213629,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -204287,6 +213658,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break @@ -204305,6 +213678,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -204346,6 +213720,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main done IFS=$as_save_IFS @@ -204375,6 +213751,7 @@ if test ! -f "$as_myself"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -204415,6 +213792,8 @@ if test ! -f "$as_myself"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 @@ -204435,6 +213814,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -204503,6 +213883,10 @@ fi ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 @@ -204545,6 +213929,7 @@ export LANGUAGE <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -204636,6 +214021,11 @@ export LANGUAGE ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -204664,6 +214054,7 @@ as_fn_error () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi @@ -204708,6 +214099,8 @@ as_fn_error () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi @@ -204731,6 +214124,7 @@ as_fn_error () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -204759,6 +214153,8 @@ as_fn_error () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi @@ -204778,6 +214174,7 @@ as_fn_error () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -204819,6 +214216,8 @@ as_fn_error () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main as_fn_exit $as_status } # as_fn_error @@ -204841,6 +214240,7 @@ as_fn_error () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -204876,6 +214276,8 @@ as_fn_error () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -204895,6 +214297,7 @@ as_fn_error () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -204946,6 +214349,8 @@ as_fn_error () >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -204989,6 +214394,7 @@ as_unset=as_fn_unset <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -205024,6 +214430,8 @@ as_unset=as_fn_unset >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -205043,6 +214451,7 @@ as_unset=as_fn_unset <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -205094,6 +214503,8 @@ as_unset=as_fn_unset >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -205117,6 +214528,7 @@ as_unset=as_fn_unset <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ======= <<<<<<< HEAD @@ -205159,6 +214571,8 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null then : ======= @@ -205178,6 +214592,7 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -205260,6 +214675,11 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ======= if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main eval 'as_fn_append () { @@ -205282,6 +214702,7 @@ if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD @@ -205324,6 +214745,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -205342,6 +214765,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -205424,6 +214848,11 @@ else ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +else +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_append () { @@ -205453,6 +214882,7 @@ fi # as_fn_append <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ======= <<<<<<< HEAD @@ -205495,6 +214925,8 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null then : ======= @@ -205514,6 +214946,7 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -205596,6 +215029,11 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ======= if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main eval 'as_fn_arith () { @@ -205618,6 +215056,7 @@ if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD else ======= <<<<<<< HEAD @@ -205660,6 +215099,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main else $as_nop ======= else @@ -205678,6 +215119,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -205760,6 +215202,11 @@ else ======= else >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +else +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_arith () { @@ -205808,6 +215255,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X/"$0" | ======= <<<<<<< HEAD @@ -205850,6 +215298,8 @@ $as_echo X/"$0" | >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" X/"$0" | ======= $as_echo X/"$0" | @@ -205868,6 +215318,7 @@ $as_echo X/"$0" | <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo X/"$0" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -205950,6 +215401,11 @@ $as_echo X/"$0" | ======= $as_echo X/"$0" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo X/"$0" | +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ @@ -205989,6 +215445,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -206030,6 +215487,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Determine whether it's possible to make 'echo' print without a newline. # These variables are no longer used directly by Autoconf, but are AC_SUBSTed @@ -206050,6 +215509,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -206119,6 +215579,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -206149,6 +215613,7 @@ esac <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -206190,6 +215655,8 @@ esac >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # For backward compatibility with old third-party macros, we provide # the shell variables $as_echo and $as_echo_n. New code should use # AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. @@ -206212,6 +215679,7 @@ as_echo_n='printf %s' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -206281,6 +215749,10 @@ as_echo_n='printf %s' ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -206338,6 +215810,7 @@ as_fn_mkdir_p () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ======= @@ -206380,6 +215853,8 @@ as_fn_mkdir_p () ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ======= @@ -206399,6 +215874,7 @@ as_fn_mkdir_p () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -206481,6 +215957,11 @@ as_fn_mkdir_p () ======= *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main *) as_qdir=$as_dir;; esac @@ -206507,6 +215988,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X"$as_dir" | ======= <<<<<<< HEAD @@ -206549,6 +216031,8 @@ $as_echo X"$as_dir" | >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" X"$as_dir" | ======= $as_echo X"$as_dir" | @@ -206567,6 +216051,7 @@ $as_echo X"$as_dir" | <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo X"$as_dir" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -206649,6 +216134,11 @@ $as_echo X"$as_dir" | ======= $as_echo X"$as_dir" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo X"$as_dir" | +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ @@ -206729,6 +216219,7 @@ This file was extended by $as_me, which was <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD generated by GNU Autoconf 2.69. Invocation command line was ======= <<<<<<< HEAD @@ -206771,6 +216262,8 @@ generated by GNU Autoconf 2.69. Invocation command line was >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main generated by GNU Autoconf 2.71. Invocation command line was ======= generated by GNU Autoconf 2.69. Invocation command line was @@ -206789,6 +216282,7 @@ generated by GNU Autoconf 2.69. Invocation command line was <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= generated by GNU Autoconf 2.69. Invocation command line was >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -206871,6 +216365,11 @@ generated by GNU Autoconf 2.69. Invocation command line was ======= generated by GNU Autoconf 2.69. Invocation command line was >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +generated by GNU Autoconf 2.69. Invocation command line was +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main CONFIG_FILES = $CONFIG_FILES @@ -206946,6 +216445,7 @@ _ACEOF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -206987,6 +216487,8 @@ _ACEOF >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -207012,6 +216514,7 @@ Copyright (C) 2021 Free Software Foundation, Inc. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -207081,6 +216584,10 @@ Copyright (C) 2021 Free Software Foundation, Inc. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ @@ -207106,6 +216613,7 @@ Copyright (C) 2012 Free Software Foundation, Inc. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -207197,6 +216705,11 @@ Copyright (C) 2012 Free Software Foundation, Inc. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -207250,6 +216763,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) @@ -207294,6 +216808,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) @@ -207317,6 +216833,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -207345,6 +216862,8 @@ do >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) @@ -207364,6 +216883,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -207405,6 +216925,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main --debug | --debu | --deb | --de | --d | -d ) debug=: ;; @@ -207427,6 +216949,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -207469,6 +216992,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -207488,6 +217013,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -207570,6 +217096,11 @@ do ======= *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main '') as_fn_error $? "missing file argument" ;; esac @@ -207594,6 +217125,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -207636,6 +217168,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ======= @@ -207655,6 +217189,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -207737,6 +217272,11 @@ do ======= *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" @@ -207762,6 +217302,7 @@ Try \`$0 --help' for more information.";; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$ac_cs_usage"; exit ;; ======= @@ -207804,6 +217345,8 @@ Try \`$0 --help' for more information.";; ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$ac_cs_usage"; exit ;; ======= @@ -207823,6 +217366,7 @@ Try \`$0 --help' for more information.";; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$ac_cs_usage"; exit ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -207905,6 +217449,11 @@ Try \`$0 --help' for more information.";; ======= $as_echo "$ac_cs_usage"; exit ;; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + $as_echo "$ac_cs_usage"; exit ;; +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) @@ -207949,6 +217498,7 @@ if \$ac_cs_recheck; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ======= @@ -207991,6 +217541,8 @@ if \$ac_cs_recheck; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 ======= @@ -208010,6 +217562,7 @@ if \$ac_cs_recheck; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -208092,6 +217645,11 @@ if \$ac_cs_recheck; then ======= \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main CONFIG_SHELL='$SHELL' export CONFIG_SHELL @@ -208122,6 +217680,7 @@ _ASBOX <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "$ac_log" ======= @@ -208164,6 +217723,8 @@ _ASBOX ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$ac_log" ======= @@ -208183,6 +217744,7 @@ _ASBOX <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "$ac_log" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -208266,6 +217828,11 @@ _ASBOX $as_echo "$ac_log" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + $as_echo "$ac_log" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main } >&5 _ACEOF @@ -208311,6 +217878,7 @@ if $ac_need_defaults; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers @@ -208354,6 +217922,8 @@ if $ac_need_defaults; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers @@ -208375,6 +217945,7 @@ if $ac_need_defaults; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -208403,6 +217974,8 @@ if $ac_need_defaults; then >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers @@ -208421,6 +217994,7 @@ if $ac_need_defaults; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -208463,6 +218037,8 @@ if $ac_need_defaults; then >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi # Have a temporary directory for convenience. Make it in the build tree @@ -208814,6 +218390,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ======= @@ -208856,6 +218433,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ======= @@ -208875,6 +218454,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -208957,6 +218537,11 @@ do ======= case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main as_fn_append ac_file_inputs " '$ac_f'" done @@ -208982,6 +218567,7 @@ do <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -209022,6 +218608,8 @@ do ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' @@ -209044,6 +218632,7 @@ printf "%s\n" "$as_me: creating $ac_file" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -209112,6 +218701,10 @@ printf "%s\n" "$as_me: creating $ac_file" >&6;} ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' @@ -209136,6 +218729,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -209226,6 +218820,11 @@ $as_echo "$as_me: creating $ac_file" >&6;} >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi # Neutralize special characters interpreted by sed in replacement strings. @@ -209247,6 +218846,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_sed_conf_input=`$as_echo "$configure_input" | ======= @@ -209289,6 +218889,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_sed_conf_input=`printf "%s\n" "$configure_input" | ======= @@ -209308,6 +218910,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ac_sed_conf_input=`$as_echo "$configure_input" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -209390,6 +218993,11 @@ $as_echo "$as_me: creating $ac_file" >&6;} ======= ac_sed_conf_input=`$as_echo "$configure_input" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + ac_sed_conf_input=`$as_echo "$configure_input" | +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; @@ -209424,6 +219032,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD $as_echo X"$ac_file" | ======= <<<<<<< HEAD @@ -209466,6 +219075,8 @@ $as_echo X"$ac_file" | >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main printf "%s\n" X"$ac_file" | ======= $as_echo X"$ac_file" | @@ -209484,6 +219095,7 @@ $as_echo X"$ac_file" | <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo X"$ac_file" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -209566,6 +219178,11 @@ $as_echo X"$ac_file" | ======= $as_echo X"$ac_file" | >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +$as_echo X"$ac_file" | +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ @@ -209606,6 +219223,7 @@ case "$ac_dir" in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. @@ -209650,6 +219268,8 @@ case "$ac_dir" in ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. @@ -209673,6 +219293,7 @@ case "$ac_dir" in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -209701,6 +219322,8 @@ case "$ac_dir" in >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. @@ -209720,6 +219343,7 @@ case "$ac_dir" in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -209761,6 +219385,8 @@ case "$ac_dir" in ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; @@ -209834,6 +219460,7 @@ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} @@ -209877,6 +219504,8 @@ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir set ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} @@ -209898,6 +219527,7 @@ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir set <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -209926,6 +219556,8 @@ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir set >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} @@ -209944,6 +219576,7 @@ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir set <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -209986,6 +219619,8 @@ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir set >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -210044,6 +219679,7 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 @@ -210088,6 +219724,8 @@ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datar ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 @@ -210111,6 +219749,7 @@ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datar <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -210139,6 +219778,8 @@ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datar >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 @@ -210158,6 +219799,7 @@ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datar <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -210200,6 +219842,8 @@ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datar >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -210231,6 +219875,7 @@ which seems to be undefined. Please make sure it is defined" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "/* $configure_input */" \ ======= @@ -210273,6 +219918,8 @@ which seems to be undefined. Please make sure it is defined" >&2;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "/* $configure_input */" >&1 \ ======= @@ -210292,6 +219939,7 @@ which seems to be undefined. Please make sure it is defined" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "/* $configure_input */" \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -210374,6 +220022,11 @@ which seems to be undefined. Please make sure it is defined" >&2;} ======= $as_echo "/* $configure_input */" \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + $as_echo "/* $configure_input */" \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ @@ -210395,6 +220048,7 @@ which seems to be undefined. Please make sure it is defined" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} @@ -210438,6 +220092,8 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} @@ -210459,6 +220115,7 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -210487,6 +220144,8 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} @@ -210505,6 +220164,7 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -210546,6 +220206,8 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main else rm -f "$ac_file" @@ -210569,6 +220231,7 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD $as_echo "/* $configure_input */" \ ======= @@ -210611,6 +220274,8 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main printf "%s\n" "/* $configure_input */" >&1 \ ======= @@ -210630,6 +220295,7 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= $as_echo "/* $configure_input */" \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -210712,6 +220378,11 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} ======= $as_echo "/* $configure_input */" \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + $as_echo "/* $configure_input */" \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 @@ -210769,6 +220440,7 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} @@ -210812,6 +220484,8 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} @@ -210833,6 +220507,7 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -210861,6 +220536,8 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} @@ -210879,6 +220556,7 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -210921,6 +220599,8 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi @@ -211060,6 +220740,7 @@ if test $PROJ4API = 0 ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { $as_echo "$as_me:${as_lineno-$LINENO}: result: using new PROJ 5+ API" >&5 $as_echo " using new PROJ 5+ API" >&6; } else @@ -211106,6 +220787,8 @@ $as_echo " using old PROJ 4 API" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using new PROJ 5+ API" >&5 printf "%s\n" " using new PROJ 5+ API" >&6; } else @@ -211132,6 +220815,7 @@ $as_echo " using old PROJ 4 API" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -211161,6 +220845,8 @@ $as_echo " using old PROJ 4 API" >&6; } ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= { $as_echo "$as_me:${as_lineno-$LINENO}: result: using new PROJ 5+ API" >&5 $as_echo " using new PROJ 5+ API" >&6; } else @@ -211181,6 +220867,7 @@ $as_echo " using old PROJ 4 API" >&6; } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -211223,6 +220910,8 @@ $as_echo " using old PROJ 4 API" >&6; } >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi echo "" diff --git a/configure.ac b/configure.ac index 73f4f90c5dd..2702ea7f475 100755 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team @@ -92,6 +93,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # COPYRIGHT: (C) 2000-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team @@ -111,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -134,6 +138,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # COPYRIGHT: (C) 2000-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -153,6 +159,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -257,6 +264,11 @@ # COPYRIGHT: (C) 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) >>>>>>> osgeo-main +======= +======= +# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> osgeo-main # # This program is free software under the GNU General # Public License (>=v2). Read the file COPYING that @@ -295,6 +307,7 @@ AC_CONFIG_SRCDIR([configure.ac]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_PREREQ([2.69]) AC_CONFIG_HEADER(include/grass/config.h) ======= @@ -338,6 +351,8 @@ AC_CONFIG_HEADER(include/grass/config.h) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_PREREQ([2.71]) AC_CONFIG_HEADERS([include/grass/config.h]) ======= @@ -358,6 +373,7 @@ AC_CONFIG_HEADER(include/grass/config.h) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -387,6 +403,8 @@ AC_CONFIG_HEADER(include/grass/config.h) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= AC_PREREQ([2.69]) AC_CONFIG_HEADER(include/grass/config.h) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -404,6 +422,7 @@ AC_CONFIG_HEADER(include/grass/config.h) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -446,6 +465,8 @@ AC_CONFIG_HEADER(include/grass/config.h) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_CANONICAL_HOST AC_PROG_CC @@ -574,6 +595,7 @@ GRASS_VERSION_FILE=include/VERSION <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -609,6 +631,8 @@ GRASS_VERSION_FILE=include/VERSION >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS_VERSION_GIT_FILE=include/VERSION_GIT ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -628,6 +652,7 @@ GRASS_VERSION_GIT_FILE=include/VERSION_GIT <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -679,6 +704,8 @@ GRASS_VERSION_GIT_FILE=include/VERSION_GIT >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS_VERSION_MAJOR=`sed -n 1p "${GRASS_VERSION_FILE}"` GRASS_VERSION_MINOR=`sed -n 2p "${GRASS_VERSION_FILE}"` GRASS_VERSION_RELEASE=`sed -n 3p "${GRASS_VERSION_FILE}"` @@ -712,6 +739,7 @@ AC_PATH_PROG(GIT, git, no) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -753,6 +781,8 @@ AC_PATH_PROG(GIT, git, no) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_CHECK_FILE([$GRASS_VERSION_GIT_FILE]) AC_MSG_CHECKING(for GRASS GIS headers commit date) ======= @@ -771,6 +801,7 @@ AC_MSG_CHECKING(for GRASS GIS headers commit date) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -840,6 +871,10 @@ AC_MSG_CHECKING(for GRASS GIS headers commit date) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "$GIT" != "no" ; then GRASS_VERSION_GIT=`$GIT rev-parse --short HEAD 2>/dev/null` if test -z "$GRASS_VERSION_GIT"; then @@ -865,6 +900,7 @@ if test "$GIT" != "no" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD GRASS_HEADERS_GIT_DATE=`date -d $($GIT log -1 --pretty=format:"%cI" -- "${SRCDIR}/include") -u +%FT%T%z | sed 's/\(..\)$/:\1/'` 2>/dev/null ======= @@ -907,6 +943,8 @@ if test "$GIT" != "no" ; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main gitdate_utc_local=$(TZ=UTC0 git log -1 --date=iso-local --pretty=format:"%cd" -- include) GRASS_HEADERS_GIT_DATE=$(echo "$gitdate_utc_local" | sed 's/ /T/' | sed 's/ //' | sed 's/\(..\)$/:\1/') @@ -927,6 +965,7 @@ if test "$GIT" != "no" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= GRASS_HEADERS_GIT_DATE=`date -d $($GIT log -1 --pretty=format:"%cI" -- "${SRCDIR}/include") -u +%FT%T%z | sed 's/\(..\)$/:\1/'` 2>/dev/null >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1009,6 +1048,11 @@ if test "$GIT" != "no" ; then ======= GRASS_HEADERS_GIT_DATE=`date -d $($GIT log -1 --pretty=format:"%cI" -- "${SRCDIR}/include") -u +%FT%T%z | sed 's/\(..\)$/:\1/'` 2>/dev/null >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + GRASS_HEADERS_GIT_DATE=`date -d $($GIT log -1 --pretty=format:"%cI" -- "${SRCDIR}/include") -u +%FT%T%z | sed 's/\(..\)$/:\1/'` 2>/dev/null +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if test -z "$GRASS_HEADERS_GIT_DATE"; then GRASS_HEADERS_GIT_DATE=`date -u +%FT%T%z | sed 's/\(..\)$/:\1/'` @@ -1031,6 +1075,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1072,6 +1117,8 @@ fi >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test $GRASS_VERSION_GIT == "exported" && \ test "$ac_cv_file_include_VERSION_GIT" == "yes"; then GRASS_HEADERS_GIT_HASH=$(sed -n 1p "${GRASS_VERSION_GIT_FILE}") @@ -1095,6 +1142,7 @@ AC_MSG_RESULT($GRASS_HEADERS_GIT_DATE) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1164,6 +1212,10 @@ AC_MSG_RESULT($GRASS_HEADERS_GIT_DATE) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main AC_SUBST(GRASS_VERSION_FILE) AC_SUBST(GRASS_VERSION_MAJOR) @@ -1305,6 +1357,7 @@ LOC_ARG_WITH(lapack, LAPACK, no) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1339,11 +1392,16 @@ LOC_ARG_WITH(lapack, LAPACK, no) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1366,6 +1424,7 @@ LOC_ARG_WITH(libsvm, LIBSVM, no) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1417,6 +1476,8 @@ LOC_ARG_WITH(libsvm, LIBSVM, no) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LOC_ARG_WITH(cairo, Cairo) LOC_ARG_WITH(freetype, FreeType) LOC_ARG_WITH(nls, NLS, no) @@ -1444,6 +1505,7 @@ LOC_ARG_WITH(zstd, Zstandard) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1479,6 +1541,8 @@ LOC_ARG_WITH(zstd, Zstandard) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LOC_ARG_WITH(pdal, PDAL) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1498,6 +1562,7 @@ LOC_ARG_WITH(pdal, PDAL) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1548,6 +1613,8 @@ LOC_ARG_WITH(pdal, PDAL) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_ARG_WITH([blas], @@ -1595,6 +1662,7 @@ AC_ARG_WITH(liblas, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1687,6 +1755,11 @@ AC_ARG_WITH(liblas, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main AC_ARG_WITH(pdal, [ --with-pdal[=path/pdal-config] enable PDAL support (pdal-config with path, @@ -1710,6 +1783,7 @@ AC_ARG_WITH(pdal, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1801,6 +1875,11 @@ AC_ARG_WITH(pdal, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main AC_ARG_WITH(netcdf, [ --with-netcdf[=path/nc-config] enable NetCDF support (nc-config with path, @@ -1880,6 +1959,7 @@ LOC_ARG_WITH_LIB(lapack, LAPACK) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1920,11 +2000,16 @@ LOC_ARG_WITH_LIB(lapack, LAPACK) ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1947,6 +2032,7 @@ LOC_ARG_WITH_LIB(libsvm, LIBSVM) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2016,6 +2102,10 @@ LOC_ARG_WITH_LIB(libsvm, LIBSVM) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LOC_ARG_WITH_INC(cairo, cairo) LOC_ARG_WITH_LIB(cairo, cairo) LOC_ARG_WITH_LDFLAGS(cairo, cairo) @@ -2111,6 +2201,7 @@ AC_PROG_INSTALL <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2152,6 +2243,8 @@ AC_PROG_INSTALL >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_PROG_LEX(noyywrap) if test "x$LEX" = "x:"; then AC_MSG_ERROR([*** Unable to locate lex.]) @@ -2174,6 +2267,7 @@ elif test "$LEX" = "lex"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2243,6 +2337,10 @@ elif test "$LEX" = "lex"; then ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main AC_PROG_LEX if test "$LEX" = "lex"; then AC_PATH_PROG(LEXPATH, lex, no) @@ -2265,6 +2363,7 @@ if test "$LEX" = "lex"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2355,6 +2454,11 @@ if test "$LEX" = "lex"; then >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fi fi @@ -2388,6 +2492,7 @@ AC_PATH_PROG(PERL, perl, no) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_HEADER_STDC ======= <<<<<<< HEAD @@ -2430,6 +2535,8 @@ AC_HEADER_STDC >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= AC_HEADER_STDC @@ -2448,6 +2555,7 @@ AC_HEADER_STDC <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_HEADER_STDC >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2531,6 +2639,11 @@ AC_HEADER_STDC AC_HEADER_STDC >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_HEADER_STDC +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #AC_CHECK_HEADERS(curses.h limits.h termio.h termios.h unistd.h values.h) AC_CHECK_HEADERS(limits.h termio.h termios.h unistd.h values.h) AC_CHECK_HEADERS(sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h) @@ -2554,6 +2667,7 @@ AC_CHECK_HEADERS(langinfo.h) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_HEADER_TIME ======= <<<<<<< HEAD @@ -2596,6 +2710,8 @@ AC_HEADER_TIME >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= AC_HEADER_TIME @@ -2614,6 +2730,7 @@ AC_HEADER_TIME <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_HEADER_TIME >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2697,6 +2814,11 @@ AC_HEADER_TIME AC_HEADER_TIME >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_HEADER_TIME +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main AC_TYPE_OFF_T AC_TYPE_UID_T @@ -2738,6 +2860,7 @@ AC_MSG_RESULT(yes) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) ======= <<<<<<< HEAD @@ -2780,6 +2903,8 @@ AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_LONG_LONG_INT, 1, [Define to 1 if "long long int" is available.]) ======= AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) @@ -2798,6 +2923,7 @@ AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2881,6 +3007,11 @@ AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_DEFINE(HAVE_LONG_LONG_INT, 1, [define if "long long int" is available]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ],[ AC_MSG_RESULT(no) ]) @@ -2905,6 +3036,7 @@ AC_MSG_RESULT(yes) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) ======= <<<<<<< HEAD @@ -2947,6 +3079,8 @@ AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_INT64_T, 1, [Define to 1 if "int64_t" is available.]) ======= AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) @@ -2965,6 +3099,7 @@ AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3048,6 +3183,11 @@ AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_DEFINE(HAVE_INT64_T, 1, [define if "int64_t" is available]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ],[ AC_MSG_RESULT(no) ]) @@ -3299,6 +3439,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(USE_PROJ4API, 1, [define if using old PROJ version 4 API]) ======= @@ -3341,6 +3482,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(USE_PROJ4API, 1, [Define to 1 if using old PROJ version 4 API.]) ======= @@ -3360,6 +3503,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(USE_PROJ4API, 1, [define if using old PROJ version 4 API]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3442,6 +3586,11 @@ else ======= AC_DEFINE(USE_PROJ4API, 1, [define if using old PROJ version 4 API]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + AC_DEFINE(USE_PROJ4API, 1, [define if using old PROJ version 4 API]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main LOC_CHECK_INCLUDES(proj_api.h,External PROJ,$PROJINC) @@ -3608,6 +3757,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_TRY_LINK([#include ],[png_read_image(NULL, NULL);],PNGLIB="$PNGLIB",[ ======= @@ -3650,6 +3800,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[png_read_image(NULL, NULL);]])],[PNGLIB="$PNGLIB"],[ ======= @@ -3669,6 +3821,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_TRY_LINK([#include ],[png_read_image(NULL, NULL);],PNGLIB="$PNGLIB",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3751,6 +3904,11 @@ else ======= AC_TRY_LINK([#include ],[png_read_image(NULL, NULL);],PNGLIB="$PNGLIB",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + AC_TRY_LINK([#include ],[png_read_image(NULL, NULL);],PNGLIB="$PNGLIB",[ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main AC_MSG_ERROR([*** Unable to locate libpng library.]) ]) @@ -3810,6 +3968,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_OGR, 1, [define if OGR is to be used]) ======= @@ -3852,6 +4011,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(HAVE_OGR, 1, [Define to 1 if OGR is to be used.]) ======= @@ -3871,6 +4032,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_OGR, 1, [define if OGR is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3953,6 +4115,11 @@ else ======= AC_DEFINE(HAVE_OGR, 1, [define if OGR is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + AC_DEFINE(HAVE_OGR, 1, [define if OGR is to be used]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main USE_OGR=1 fi @@ -3981,6 +4148,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_TRY_LINK([#include ],[GDALOpen("foo", GA_ReadOnly);],GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS",[ ======= @@ -4023,6 +4191,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[GDALOpen("foo", GA_ReadOnly);]])],[GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS"],[ ======= @@ -4042,6 +4212,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_TRY_LINK([#include ],[GDALOpen("foo", GA_ReadOnly);],GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4124,6 +4295,11 @@ else ======= AC_TRY_LINK([#include ],[GDALOpen("foo", GA_ReadOnly);],GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + AC_TRY_LINK([#include ],[GDALOpen("foo", GA_ReadOnly);],GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS",[ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main AC_MSG_ERROR([*** Unable to locate GDAL library.]) ]) @@ -4147,6 +4323,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_GDAL, 1, [define if GDAL is to be used]) ======= @@ -4189,6 +4366,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(HAVE_GDAL, 1, [Define to 1 if GDAL is to be used.]) ======= @@ -4208,6 +4387,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_GDAL, 1, [define if GDAL is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4291,6 +4471,11 @@ else AC_DEFINE(HAVE_GDAL, 1, [define if GDAL is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + AC_DEFINE(HAVE_GDAL, 1, [define if GDAL is to be used]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi AC_SUBST(GDAL_LIBS) @@ -4352,6 +4537,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_TRY_LINK([#include ],[LASReader_Create("foo");],LAS_LIBS="$LAS_LIBS",[ ======= @@ -4394,6 +4580,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[LASReader_Create("foo");]])],[LAS_LIBS="$LAS_LIBS"],[ ======= @@ -4413,6 +4601,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_TRY_LINK([#include ],[LASReader_Create("foo");],LAS_LIBS="$LAS_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4495,6 +4684,11 @@ else ======= AC_TRY_LINK([#include ],[LASReader_Create("foo");],LAS_LIBS="$LAS_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + AC_TRY_LINK([#include ],[LASReader_Create("foo");],LAS_LIBS="$LAS_LIBS",[ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main AC_MSG_ERROR([*** Unable to locate libLAS library.]) ]) @@ -4519,6 +4713,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_LIBLAS, 1, [define if liblas exists]) ======= @@ -4561,6 +4756,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(HAVE_LIBLAS, 1, [Define to 1 if liblas exists.]) ======= @@ -4580,6 +4777,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_LIBLAS, 1, [define if liblas exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4663,6 +4861,11 @@ else AC_DEFINE(HAVE_LIBLAS, 1, [define if liblas exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + AC_DEFINE(HAVE_LIBLAS, 1, [define if liblas exists]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi AC_SUBST(LIBLAS_LIBS) @@ -4696,6 +4899,7 @@ USE_PDAL= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4731,6 +4935,8 @@ USE_PDAL= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main pdal="pdal" ======= ======= @@ -4749,6 +4955,7 @@ pdal="pdal" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4797,6 +5004,8 @@ pdal="pdal" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "`basename xx/$with_pdal`" = "pdal-config" ; then PDAL_CONFIG="$with_pdal" @@ -4818,6 +5027,7 @@ fi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4909,6 +5119,11 @@ fi ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if test "$with_pdal" = "no" ; then AC_MSG_RESULT(no) @@ -4931,6 +5146,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4971,6 +5187,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if test -s "${PKG_CONFIG} --exists ${pdal}" ; then @@ -4995,6 +5213,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5063,6 +5282,10 @@ else ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main AC_PATH_PROG(PDAL_CONFIG, pdal-config, no) @@ -5093,6 +5316,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main PDAL_INC=`"$PDAL_CONFIG" --includes` @@ -5133,6 +5357,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags` ======= @@ -5150,6 +5376,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5186,6 +5413,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main PDAL_INC=`"$PDAL_CONFIG" --includes` USE_PDAL=1 @@ -5206,6 +5435,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5269,6 +5499,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main PDAL= @@ -5298,6 +5530,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5456,6 +5689,14 @@ else LIBS="$LIBS $PDAL_LIBS" CFLAGS="$CFLAGS $PDAL_CFLAGS" <<<<<<< HEAD:configure.ac +>>>>>>> osgeo-main +======= +======= + ac_save_cppflags="$CPPFLAGS" +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) + LIBS="$LIBS $PDAL_LIBS" + CFLAGS="$CFLAGS $PDAL_CFLAGS" +<<<<<<< HEAD:configure.ac >>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include #include @@ -5480,6 +5721,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<<< HEAD:configure.in ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) @@ -5518,6 +5760,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_TRY_LINK([#include #include @@ -5555,6 +5799,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>>> osgeo-main:configure.ac >>>>>>> osgeo-main ======= @@ -5675,6 +5920,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_TRY_LINK([#include #include @@ -5702,6 +5949,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ]) @@ -5756,6 +6004,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)):configure.in ]) @@ -5789,6 +6039,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -5812,6 +6063,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ]) LIBS=${ac_save_libs} @@ -5831,6 +6084,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -5860,6 +6114,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD CPPFLAGS=${ac_save_cppflags} ======= @@ -5874,6 +6130,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5902,6 +6159,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(HAVE_PDAL, 1, [define if PDAL exists]) @@ -5921,6 +6180,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6005,6 +6265,8 @@ else >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi AC_SUBST(PDAL_LIBS) @@ -6064,6 +6326,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_TRY_LINK([#include ],[nc_create("foo", NC_CLOBBER, NULL);],NETCDF_LIBS="$NETCDF_LIBS",[ ======= @@ -6106,6 +6369,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[nc_create("foo", NC_CLOBBER, NULL);]])],[NETCDF_LIBS="$NETCDF_LIBS"],[ ======= @@ -6125,6 +6390,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_TRY_LINK([#include ],[nc_create("foo", NC_CLOBBER, NULL);],NETCDF_LIBS="$NETCDF_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6207,6 +6473,11 @@ else ======= AC_TRY_LINK([#include ],[nc_create("foo", NC_CLOBBER, NULL);],NETCDF_LIBS="$NETCDF_LIBS",[ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + AC_TRY_LINK([#include ],[nc_create("foo", NC_CLOBBER, NULL);],NETCDF_LIBS="$NETCDF_LIBS",[ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main AC_MSG_ERROR([*** Unable to locate NetCDF library.]) ]) @@ -6230,6 +6501,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_NETCDF, 1, [define if NetCDF exists]) ======= @@ -6272,6 +6544,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(HAVE_NETCDF, 1, [Define to 1 if NetCDF exists.]) ======= @@ -6291,6 +6565,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_NETCDF, 1, [define if NetCDF exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6374,6 +6649,11 @@ else AC_DEFINE(HAVE_NETCDF, 1, [define if NetCDF exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + AC_DEFINE(HAVE_NETCDF, 1, [define if NetCDF exists]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi AC_SUBST(NETCDF_LIBS) @@ -6432,6 +6712,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_GEOS, 1, [define if GEOS is to be used]) ======= @@ -6474,6 +6755,8 @@ else ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(HAVE_GEOS, 1, [Define to 1 if GEOS is to be used.]) ======= @@ -6493,6 +6776,7 @@ else <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_GEOS, 1, [define if GEOS is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6576,6 +6860,11 @@ else AC_DEFINE(HAVE_GEOS, 1, [define if GEOS is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + AC_DEFINE(HAVE_GEOS, 1, [define if GEOS is to be used]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi AC_SUBST(GEOS_LIBS) @@ -6634,6 +6923,7 @@ if test -n "$USE_POSTGRES"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) ======= <<<<<<< HEAD @@ -6676,6 +6966,8 @@ AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_POSTGRES, 1, [Define to 1 if PostgreSQL is to be used.]) ======= AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) @@ -6694,6 +6986,7 @@ AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6777,6 +7070,11 @@ AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_DEFINE(HAVE_POSTGRES, 1, [define if PostgreSQL is to be used]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $USE_POSTGRES PQINCPATH= @@ -6820,6 +7118,7 @@ LDFLAGS="$LDFLAGS $PQLIBPATH" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTuples in lpq])], [ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTuples in lpq])], [ ======= @@ -6863,6 +7162,8 @@ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTup >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [Define to 1 if PQcmdTuples in lpq.])], [ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [Define to 1 if PQcmdTuples in lpq.])], [ ======= @@ -6883,6 +7184,7 @@ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTup <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6912,6 +7214,8 @@ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTup ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTuples in lpq])], [ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTuples in lpq])], [ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6929,6 +7233,7 @@ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTup <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6971,6 +7276,8 @@ AC_CHECK_LIB(pq,PQcmdTuples, [AC_DEFINE(HAVE_PQCMDTUPLES, 1, [define if PQcmdTup >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ], -lcrypt) ]) LDFLAGS="${ac_save_ldflags}" @@ -7035,6 +7342,7 @@ if test -n "$USE_MYSQL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -7075,6 +7383,8 @@ if test -n "$USE_MYSQL"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main mysql_version=`"$MYSQLD_CONFIG" --version` AC_MSG_RESULT([using MySQL/MariaDB version "$mysql_version"]) @@ -7094,6 +7404,7 @@ if test -n "$USE_MYSQL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7162,6 +7473,10 @@ if test -n "$USE_MYSQL"; then ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main AC_LANG_PUSH([C++]) ac_save_libs="$LIBS" @@ -7184,6 +7499,7 @@ if test -n "$USE_MYSQL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_CHECK_FUNC(mysql_server_init,,[MYSQLDLIB=""; AC_MSG_WARN([libmysqld not found])] ) @@ -7227,6 +7543,8 @@ if test -n "$USE_MYSQL"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_CHECK_FUNC(mysql_server_init, AC_MSG_RESULT([libmysqld found]), @@ -7249,6 +7567,7 @@ if test -n "$USE_MYSQL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7277,6 +7596,8 @@ if test -n "$USE_MYSQL"; then >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= AC_CHECK_FUNC(mysql_server_init,,[MYSQLDLIB=""; AC_MSG_WARN([libmysqld not found])] ) @@ -7295,6 +7616,7 @@ if test -n "$USE_MYSQL"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7336,6 +7658,8 @@ if test -n "$USE_MYSQL"; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main LIBS=$ac_save_libs AC_LANG_POP([C++]) @@ -7385,6 +7709,7 @@ LOC_CHECK_INCLUDES(sqlite3.h,SQLite,$SQLITEINCPATH) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) ======= <<<<<<< HEAD @@ -7427,6 +7752,8 @@ AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_SQLITE, 1, [Define to 1 if SQLite is to be used.]) ======= AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) @@ -7445,6 +7772,7 @@ AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7528,6 +7856,11 @@ AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_DEFINE(HAVE_SQLITE, 1, [define if SQLite is to be used]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $USE_SQLITE @@ -7623,6 +7956,7 @@ OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -7664,6 +7998,8 @@ OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LOC_CHECK_FUNC(glXCreatePbuffer,,,,,$OPENGLLIB,[AC_DEFINE(HAVE_PBUFFERS, 1, [Define to 1 if glXCreatePbuffer exists.])]) LOC_CHECK_FUNC(glXCreateGLXPixmap,,,,,$OPENGLLIB,[AC_DEFINE(HAVE_PIXMAPS, 1, [Define to 1 if glXCreateGLXPixmap exists.])]) @@ -7683,6 +8019,7 @@ AC_DEFINE(OPENGL_X11, 1, [Define to 1 if OpenGL uses X11.]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7752,6 +8089,10 @@ AC_DEFINE(OPENGL_X11, 1, [Define to 1 if OpenGL uses X11.]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main LOC_CHECK_FUNC(glXCreatePbuffer,,,,,$OPENGLLIB,[AC_DEFINE(HAVE_PBUFFERS, 1, [define if glXCreatePbuffer exists])]) LOC_CHECK_FUNC(glXCreateGLXPixmap,,,,,$OPENGLLIB,[AC_DEFINE(HAVE_PIXMAPS, 1, [define if glXCreateGLXPixmap exists])]) @@ -7773,6 +8114,7 @@ AC_DEFINE(OPENGL_X11, 1, [define if OpenGL uses X11]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -7864,6 +8206,11 @@ AC_DEFINE(OPENGL_X11, 1, [define if OpenGL uses X11]) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $OPENGL_X11 @@ -7896,6 +8243,7 @@ OPENGLLIBPATH="$OPENGLPATH" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) ======= <<<<<<< HEAD @@ -7938,6 +8286,8 @@ AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_DEFINE(OPENGL_AQUA, 1, [Define to 1 if OpenGL uses Aqua (MacOS X).]) ======= AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) @@ -7956,6 +8306,7 @@ AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8039,6 +8390,11 @@ AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_DEFINE(OPENGL_AQUA, 1, [define if OpenGL uses Aqua (MacOS X)]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $OPENGL_AQUA @@ -8080,6 +8436,7 @@ OPENGLULIB="$OPENGL_LIB_PATH $OPENGLULIB" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) ======= <<<<<<< HEAD @@ -8122,6 +8479,8 @@ AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_DEFINE(OPENGL_WINDOWS, 1, [Define to 1 if OpenGL uses Windows.]) ======= AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) @@ -8140,6 +8499,7 @@ AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8223,6 +8583,11 @@ AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_DEFINE(OPENGL_WINDOWS, 1, [define if OpenGL uses Windows]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi # $OPENGL_WINDOWS @@ -8400,6 +8765,7 @@ if test $blas_ok = yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(HAVE_LIBATLAS, 1, [define if ATLAS exists]) ======= @@ -8442,6 +8808,8 @@ if test $blas_ok = yes; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(HAVE_LIBATLAS, 1, [Define to 1 if ATLAS exists.]) ======= @@ -8461,6 +8829,7 @@ if test $blas_ok = yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_LIBATLAS, 1, [define if ATLAS exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8544,6 +8913,11 @@ if test $blas_ok = yes; then AC_DEFINE(HAVE_LIBATLAS, 1, [define if ATLAS exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + AC_DEFINE(HAVE_LIBATLAS, 1, [define if ATLAS exists]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) @@ -8598,6 +8972,7 @@ if test $blas_ok = yes; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) ======= <<<<<<< HEAD @@ -8640,6 +9015,8 @@ AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_DEFINE(HAVE_LIBBLAS, 1, [Define to 1 if BLAS exists.]) ======= AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) @@ -8658,6 +9035,7 @@ AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8741,6 +9119,11 @@ AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +AC_DEFINE(HAVE_LIBBLAS, 1, [define if BLAS exists]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main fi >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) @@ -8801,6 +9184,7 @@ if test -n "$USE_BLAS" && test -n "$USE_LAPACK"; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) ======= <<<<<<< HEAD @@ -8841,6 +9225,8 @@ AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for lapack_chk in ${LAPACK_PKGS} do @@ -8856,6 +9242,9 @@ AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -8877,6 +9266,7 @@ AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8896,11 +9286,15 @@ AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ======= +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= ======= AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -8963,6 +9357,9 @@ AC_DEFINE(HAVE_LIBLAPACK, 1, [define if LAPACK exists]) >>>>>>> osgeo-main ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if test -z "$LAPACK_PKG" ; then @@ -9015,6 +9412,7 @@ AC_SUBST(LAPACKINC) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -9056,6 +9454,8 @@ AC_SUBST(LAPACKINC) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # libsvm option LIBSVM_INC= LIBSVM_LIB= @@ -9094,6 +9494,7 @@ AC_SUBST(USE_LIBSVM) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -9163,6 +9564,10 @@ AC_SUBST(USE_LIBSVM) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Enable Cairo display driver option LOC_CHECK_USE(cairo,Cairo,USE_CAIRO) @@ -9272,6 +9677,7 @@ if test -n "${USE_NLS}" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD AC_DEFINE(USE_NLS, 1, [define if NLS requested]) ======= @@ -9314,6 +9720,8 @@ if test -n "${USE_NLS}" ; then ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main AC_DEFINE(USE_NLS, 1, [Define to 1 if NLS requested.]) ======= @@ -9333,6 +9741,7 @@ if test -n "${USE_NLS}" ; then <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= AC_DEFINE(USE_NLS, 1, [define if NLS requested]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -9416,6 +9825,11 @@ if test -n "${USE_NLS}" ; then AC_DEFINE(USE_NLS, 1, [define if NLS requested]) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + AC_DEFINE(USE_NLS, 1, [define if NLS requested]) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main AC_CHECK_FUNC(gettext, INTLLIB=, [ AC_CHECK_LIB(intl, gettext, INTLLIB=-lintl, [ @@ -9489,6 +9903,7 @@ LOC_CHECK_USE(openmp,OpenMP,USE_OPENMP) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9552,6 +9967,8 @@ LOC_CHECK_USE(openmp,OpenMP,USE_OPENMP) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if test "$enable_openmp" != no; then if test -n "${USE_OPENMP}"; then @@ -9604,6 +10021,7 @@ fi # enable_openmp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9636,6 +10054,8 @@ fi # enable_openmp ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9652,6 +10072,7 @@ fi # enable_openmp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9701,6 +10122,8 @@ fi # enable_openmp >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main OMPINCPATH= OMPLIBPATH= OMPLIB= @@ -9720,6 +10143,7 @@ OMPCFLAGS= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -9743,6 +10167,8 @@ OMPCFLAGS= ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= if test "$enable_openmp" != no; then >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -9792,6 +10218,7 @@ fi # enable_openmp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -9955,6 +10382,8 @@ fi # enable_openmp >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main fi # $USE_OPENMP AC_SUBST(OMPINCPATH) @@ -9981,6 +10410,7 @@ AC_SUBST(OMPCFLAGS) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -10011,6 +10441,8 @@ AC_SUBST(OMPCFLAGS) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -10030,6 +10462,7 @@ AC_SUBST(OMPCFLAGS) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -10059,6 +10492,8 @@ AC_SUBST(OMPCFLAGS) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= if test "$enable_openmp" != no; then @@ -10113,6 +10548,7 @@ fi # enable_openmp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10179,6 +10615,8 @@ fi # enable_openmp >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main AC_SUBST(USE_OPENMP) # Done checking OpenMP @@ -10303,6 +10741,7 @@ LOC_MSG_USE(libLAS support,USE_LIBLAS) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -10338,6 +10777,8 @@ LOC_MSG_USE(libLAS support,USE_LIBLAS) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LOC_MSG_USE(LIBSVM support,USE_LIBSVM) ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10357,6 +10798,7 @@ LOC_MSG_USE(LIBSVM support,USE_LIBSVM) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10408,6 +10850,8 @@ LOC_MSG_USE(LIBSVM support,USE_LIBSVM) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LOC_MSG_USE(MySQL support,USE_MYSQL) LOC_MSG_USE(NetCDF support,USE_NETCDF) LOC_MSG_USE(NLS support,USE_NLS) diff --git a/contributors.csv b/contributors.csv index a7c19b26258..b0dd551f3d8 100644 --- a/contributors.csv +++ b/contributors.csv @@ -16,6 +16,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD -,Ivan Shmakov,,Russia,1gray,yes,- ======= <<<<<<< HEAD @@ -58,6 +59,8 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main -,Ivan Shmakov,,Russia,1gray,yes,- ======= -,Ivan Shmakov,,Russia,1gray,yes,- @@ -76,6 +79,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= -,Ivan Shmakov,,Russia,1gray,yes,- >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -159,6 +163,11 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid -,Ivan Shmakov,,Russia,1gray,yes,- >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +-,Ivan Shmakov,,Russia,1gray,yes,- +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main -,Eric Patton,,Canada,epatton,yes,- -,Laura Toma,,USA,ltoma,yes,- -,Markus Metz,,Germany,mmetz,yes,0000-0002-4038-8754 @@ -181,6 +190,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD -,Yann Chemin,,Philippines,ychemin,yes,0000-0001-9232-5512 ======= <<<<<<< HEAD @@ -223,6 +233,8 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main -,Yann Chemin,,France,ychemin,yes,0000-0001-9232-5512 ======= -,Yann Chemin,,Philippines,ychemin,yes,0000-0001-9232-5512 @@ -241,6 +253,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= -,Yann Chemin,,Philippines,ychemin,yes,0000-0001-9232-5512 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -324,6 +337,11 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid -,Yann Chemin,,Philippines,ychemin,yes,0000-0001-9232-5512 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +-,Yann Chemin,,Philippines,ychemin,yes,0000-0001-9232-5512 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main -,Colin Nielsen,,USA,cnielsen,yes,- -,Anne Ghisla,,Italy,aghisla,yes,- -,Helmut Kudrnovsky,,Austria,hellik,yes,0000-0001-6622-7169 @@ -352,6 +370,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD -,Ondřej Pešek,,Czech Republic,pesekon2,yes,- ======= <<<<<<< HEAD @@ -394,6 +413,8 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main -,Ondřej Pešek,,Czech Republic,pesekon2,yes,0000-0002-2363-8002 ======= -,Ondřej Pešek,,Czech Republic,pesekon2,yes,- @@ -412,6 +433,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= -,Ondřej Pešek,,Czech Republic,pesekon2,yes,- >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -495,6 +517,11 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed,orcid -,Ondřej Pešek,,Czech Republic,pesekon2,yes,- >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +-,Ondřej Pešek,,Czech Republic,pesekon2,yes,- +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main -,Tomáš Zigo,,Slovak Republic,tmszi,yes,- -,Nicklas Larsson,,Hungary/Sweden,nilason,yes,- alex,Alex Shevlakov,,Russia,-,-,- diff --git a/db/drivers/dbf/cursor.c b/db/drivers/dbf/cursor.c index 71f15bc5eff..8b9e3e4aa51 100644 --- a/db/drivers/dbf/cursor.c +++ b/db/drivers/dbf/cursor.c @@ -59,6 +59,7 @@ int db__driver_close_cursor(dbCursor *dbc) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -129,6 +130,10 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -155,6 +160,7 @@ cursor *alloc_cursor(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -245,6 +251,8 @@ cursor *alloc_cursor(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { cursor *c; diff --git a/db/drivers/dbf/dbfexe.c b/db/drivers/dbf/dbfexe.c index 38075df9c9c..bcd1f7a4f7a 100644 --- a/db/drivers/dbf/dbfexe.c +++ b/db/drivers/dbf/dbfexe.c @@ -360,6 +360,7 @@ void get_col_def(SQLPSTMT *st, int col, int *type, int *width, int *decimals) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) ======= <<<<<<< HEAD @@ -402,6 +403,8 @@ void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void eval_val(int tab, int row, int col UNUSED, SQLPVALUE *inval, SQLPVALUE *val) ======= @@ -421,6 +424,7 @@ void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -504,6 +508,11 @@ void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +void eval_val(int tab, int row, int col, SQLPVALUE *inval, SQLPVALUE *val) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { double retval; diff --git a/db/drivers/dbf/listtab.c b/db/drivers/dbf/listtab.c index da5ed0dd755..7ab1d47443f 100644 --- a/db/drivers/dbf/listtab.c +++ b/db/drivers/dbf/listtab.c @@ -35,6 +35,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= <<<<<<< HEAD @@ -77,6 +78,8 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int db__driver_list_tables(dbString **tlist, int *tcount, int system UNUSED) ======= int db__driver_list_tables(dbString **tlist, int *tcount, int system) @@ -95,6 +98,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -178,6 +182,11 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +int db__driver_list_tables(dbString **tlist, int *tcount, int system) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { dbString *list; int i; diff --git a/db/drivers/dbf/table.c b/db/drivers/dbf/table.c index aa7b87beef5..3ec51e436c8 100644 --- a/db/drivers/dbf/table.c +++ b/db/drivers/dbf/table.c @@ -82,6 +82,7 @@ int add_table(char *table, char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -156,6 +157,10 @@ int add_table(char *table, char *name) ======= if (res < 0 || (size_t)res >= buf_s) { ======= +>>>>>>> osgeo-main +======= + if (res < 0 || (size_t)res >= buf_s) { +======= >>>>>>> osgeo-main if (res >= buf_s) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -179,6 +184,7 @@ int add_table(char *table, char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -207,6 +213,8 @@ int add_table(char *table, char *name) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (res >= buf_s) { ======= @@ -227,6 +235,7 @@ int add_table(char *table, char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -310,6 +319,8 @@ int add_table(char *table, char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main db_d_append_error(_("Unable to add table %s to %s. " "The file path is too long."), diff --git a/db/drivers/mysql/cursor.c b/db/drivers/mysql/cursor.c index 9fede9c2abb..0de645e3439 100644 --- a/db/drivers/mysql/cursor.c +++ b/db/drivers/mysql/cursor.c @@ -56,6 +56,7 @@ int db__driver_close_cursor(dbCursor *dbc) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -126,6 +127,10 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -152,6 +157,7 @@ cursor *alloc_cursor(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -242,6 +248,8 @@ cursor *alloc_cursor(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { cursor *c; diff --git a/db/drivers/mysql/db.c b/db/drivers/mysql/db.c index 2b0e312bb7c..01f63d248d0 100644 --- a/db/drivers/mysql/db.c +++ b/db/drivers/mysql/db.c @@ -70,6 +70,7 @@ int db__driver_open_database(dbHandle *handle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD res = mysql_real_connect(connection, host, user, password, connpar.dbname, port, NULL, 0); @@ -113,6 +114,8 @@ int db__driver_open_database(dbHandle *handle) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main res = mysql_real_connect(connection, host, user, password, connpar.dbname, @@ -135,6 +138,7 @@ int db__driver_open_database(dbHandle *handle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -163,6 +167,8 @@ int db__driver_open_database(dbHandle *handle) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= res = mysql_real_connect(connection, host, user, password, connpar.dbname, port, NULL, 0); @@ -181,6 +187,7 @@ int db__driver_open_database(dbHandle *handle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -222,6 +229,8 @@ int db__driver_open_database(dbHandle *handle) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (res == NULL) { @@ -247,6 +256,7 @@ int db__driver_open_database(dbHandle *handle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -287,6 +297,8 @@ int db__driver_open_database(dbHandle *handle) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main db_init_string(&sql); @@ -323,6 +335,7 @@ int db__driver_open_database(dbHandle *handle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -391,6 +404,10 @@ int db__driver_open_database(dbHandle *handle) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } diff --git a/db/drivers/mysql/fetch.c b/db/drivers/mysql/fetch.c index 1f4df1a77d3..80aaef2a697 100644 --- a/db/drivers/mysql/fetch.c +++ b/db/drivers/mysql/fetch.c @@ -272,6 +272,7 @@ dbCursor *cn; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -363,6 +364,11 @@ dbCursor *cn; ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { cursor *c; dbToken token; diff --git a/db/drivers/mysql/grass-mesql.html b/db/drivers/mysql/grass-mesql.html index 1225007fd7e..2331766b952 100644 --- a/db/drivers/mysql/grass-mesql.html +++ b/db/drivers/mysql/grass-mesql.html @@ -113,6 +113,7 @@

    AUTHOR

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -188,6 +189,10 @@

    AUTHOR

    © 2003-2022 GRASS Development Team, GRASS GIS 8 Reference Manual

    ======= >>>>>>> osgeo-main +======= +

    © 2003-2022 GRASS Development Team, GRASS GIS 8 Reference Manual

    +======= +>>>>>>> osgeo-main

    © 2003-2021 GRASS Development Team, GRASS GIS 8.0 Reference Manual

    >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -210,6 +215,7 @@

    AUTHOR

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD =======

    © 2003-2022 GRASS Development Team, GRASS GIS 8 Reference Manual

    >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -335,5 +341,10 @@

    AUTHOR

    © 2003-2022 GRASS Development Team, GRASS GIS 8 Reference Manual

    >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +

    © 2003-2022 GRASS Development Team, GRASS GIS 8 Reference Manual

    +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main diff --git a/db/drivers/mysql/grass-mysql.html b/db/drivers/mysql/grass-mysql.html index 004f55d863d..f318fef4858 100644 --- a/db/drivers/mysql/grass-mysql.html +++ b/db/drivers/mysql/grass-mysql.html @@ -95,6 +95,7 @@

    Privileges

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -165,6 +166,10 @@

    Privileges

    ======= >>>>>>> osgeo-main ======= +Because MySQL does not support groups of users and because +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Because MySQL does not support groups of users and because >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -191,6 +196,7 @@

    Privileges

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -281,6 +287,8 @@

    Privileges

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main only MySQL 'root' can grant privileges to other users GRASS cannot automatically grant select privileges on created tables to group of users. @@ -321,6 +329,7 @@

    Schemas

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -391,6 +400,10 @@

    Schemas

    ======= >>>>>>> osgeo-main ======= +Because MySQL does not support database schemas the parameter +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Because MySQL does not support database schemas the parameter >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -417,6 +430,7 @@

    Schemas

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -507,6 +521,8 @@

    Schemas

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main 'schema' of module db.connect should never be set to any value. If you set that parameter for MySQL driver GRASS will try to write tables to the specified schema which will result @@ -538,6 +554,7 @@

    Groups

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -608,6 +625,10 @@

    Groups

    ======= >>>>>>> osgeo-main ======= +MySQL does not support user groups. Any settings specified +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) MySQL does not support user groups. Any settings specified >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -634,6 +655,7 @@

    Groups

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -724,6 +746,8 @@

    Groups

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main by 'group' parameter of module db.connect are ignored by GRASS for MySQL driver. @@ -766,6 +790,7 @@

    Credits

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -836,6 +861,10 @@

    Credits

    ======= >>>>>>> osgeo-main ======= +Development of the driver was sponsored by +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Development of the driver was sponsored by >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -862,6 +891,7 @@

    Credits

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -952,6 +982,8 @@

    Credits

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Faunalia (Italy) as part of a project for ATAC. diff --git a/db/drivers/mysql/listtab.c b/db/drivers/mysql/listtab.c index dc1158f8e50..dfaa3cef022 100644 --- a/db/drivers/mysql/listtab.c +++ b/db/drivers/mysql/listtab.c @@ -35,6 +35,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= <<<<<<< HEAD @@ -77,6 +78,8 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int db__driver_list_tables(dbString **tlist, int *tcount, int system UNUSED) ======= int db__driver_list_tables(dbString **tlist, int *tcount, int system) @@ -95,6 +98,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -178,6 +182,11 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +int db__driver_list_tables(dbString **tlist, int *tcount, int system) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { int i; dbString *list; @@ -207,6 +216,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD db_d_append_error("%s\%s", _("Unable get list of tables:"), ======= @@ -249,6 +259,8 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main db_d_append_error("%s\n%s", _("Unable get list of tables:"), ======= @@ -268,6 +280,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= db_d_append_error("%s\%s", _("Unable get list of tables:"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -350,6 +363,11 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= db_d_append_error("%s\%s", _("Unable get list of tables:"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + db_d_append_error("%s\%s", _("Unable get list of tables:"), +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main mysql_error(connection)); db_d_report_error(); diff --git a/db/drivers/odbc/cursor.c b/db/drivers/odbc/cursor.c index 57393e06921..b7de2ef34c3 100644 --- a/db/drivers/odbc/cursor.c +++ b/db/drivers/odbc/cursor.c @@ -45,6 +45,7 @@ int db__driver_close_cursor(dbCursor *dbc) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -115,6 +116,10 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -141,6 +146,7 @@ cursor *alloc_cursor(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -231,6 +237,8 @@ cursor *alloc_cursor(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { cursor *c; SQLRETURN ret; diff --git a/db/drivers/odbc/db.c b/db/drivers/odbc/db.c index c84f6bf24ab..02922722663 100644 --- a/db/drivers/odbc/db.c +++ b/db/drivers/odbc/db.c @@ -55,6 +55,7 @@ int db__driver_open_database(dbHandle *handle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -95,6 +96,8 @@ int db__driver_open_database(dbHandle *handle) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -153,6 +156,7 @@ int db__driver_open_database(dbHandle *handle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -221,6 +225,10 @@ int db__driver_open_database(dbHandle *handle) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } diff --git a/db/drivers/odbc/proto.h b/db/drivers/odbc/proto.h index c1e3124a573..dc468831f1d 100644 --- a/db/drivers/odbc/proto.h +++ b/db/drivers/odbc/proto.h @@ -27,6 +27,7 @@ int close_connection(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -99,6 +100,10 @@ cursor *alloc_cursor(void); cursor *alloc_cursor(void); ======= >>>>>>> osgeo-main +======= +cursor *alloc_cursor(void); +======= +>>>>>>> osgeo-main cursor *alloc_cursor(); <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -121,6 +126,7 @@ cursor *alloc_cursor(void); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -150,6 +156,8 @@ cursor *alloc_cursor(void); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= cursor *alloc_cursor(); ======= cursor *alloc_cursor(void); @@ -169,6 +177,7 @@ cursor *alloc_cursor(void); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -247,6 +256,8 @@ cursor *alloc_cursor(); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void free_cursor(cursor *c); /* describe.c */ diff --git a/db/drivers/ogr/cursor.c b/db/drivers/ogr/cursor.c index a2ac70bcf16..c8c15863c06 100644 --- a/db/drivers/ogr/cursor.c +++ b/db/drivers/ogr/cursor.c @@ -79,6 +79,7 @@ int db__driver_close_cursor(dbCursor *dbc) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -149,6 +150,10 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -175,6 +180,7 @@ cursor *alloc_cursor(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -265,6 +271,8 @@ cursor *alloc_cursor(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { cursor *c; diff --git a/db/drivers/ogr/db.c b/db/drivers/ogr/db.c index b8c96024a70..9f709a02237 100644 --- a/db/drivers/ogr/db.c +++ b/db/drivers/ogr/db.c @@ -97,6 +97,7 @@ int db__driver_open_database(dbHandle *handle) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -167,6 +168,10 @@ int db__driver_close_database(void) ======= >>>>>>> osgeo-main ======= +int db__driver_close_database(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) int db__driver_close_database() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -193,6 +198,7 @@ int db__driver_close_database(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -283,6 +289,8 @@ int db__driver_close_database(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { G_debug(3, "db_driver_close_database()"); diff --git a/db/drivers/ogr/describe.c b/db/drivers/ogr/describe.c index 773e4627bcb..f155b9208c6 100644 --- a/db/drivers/ogr/describe.c +++ b/db/drivers/ogr/describe.c @@ -122,6 +122,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -156,6 +157,8 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (ogrType != OFTInteger && ogrType != OFTInteger64 && ======= @@ -175,6 +178,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -222,6 +226,8 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (ogrType != OFTInteger && #if GDAL_VERSION_NUM >= 2000000 @@ -244,6 +250,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -334,6 +341,11 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ogrType != OFTReal && ogrType != OFTString && ogrType != OFTDate && ogrType != OFTTime && ogrType != OFTDateTime) { @@ -417,6 +429,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -457,6 +470,8 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case OFTInteger64: sqlType = DB_SQL_TYPE_INTEGER; @@ -477,6 +492,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -546,6 +562,10 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #if GDAL_VERSION_NUM >= 2000000 case OFTInteger64: #endif @@ -576,6 +596,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #endif ======= <<<<<<< HEAD @@ -613,6 +634,8 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= #endif >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -632,6 +655,7 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -682,6 +706,8 @@ int describe_table(OGRLayerH hLayer, dbTable **table, cursor *c) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main break; diff --git a/db/drivers/ogr/driver.c b/db/drivers/ogr/driver.c index d7b0ff26e87..191e4b94231 100644 --- a/db/drivers/ogr/driver.c +++ b/db/drivers/ogr/driver.c @@ -42,6 +42,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -77,6 +78,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int db__driver_init(int argc UNUSED, char *argv[] UNUSED) ======= ======= @@ -95,6 +98,7 @@ int db__driver_init(int argc UNUSED, char *argv[] UNUSED) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -143,6 +147,8 @@ int db__driver_init(int argc UNUSED, char *argv[] UNUSED) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int db__driver_init(int argc, char *argv[]) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) { @@ -179,6 +185,7 @@ int db__driver_init(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -249,6 +256,10 @@ int db__driver_finish(void) ======= >>>>>>> osgeo-main ======= +int db__driver_finish(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) int db__driver_finish() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -275,6 +286,7 @@ int db__driver_finish(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -365,6 +377,8 @@ int db__driver_finish(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { return DB_OK; } diff --git a/db/drivers/ogr/execute.c b/db/drivers/ogr/execute.c index 72804b5f370..c1eb3c5a363 100644 --- a/db/drivers/ogr/execute.c +++ b/db/drivers/ogr/execute.c @@ -115,6 +115,7 @@ int db__driver_execute_immediate(dbString *sql) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -149,6 +150,8 @@ int db__driver_execute_immediate(dbString *sql) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cols[i].type != OFTInteger64 || cols[i].type != OFTReal) && ======= @@ -168,6 +171,7 @@ int db__driver_execute_immediate(dbString *sql) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -216,6 +220,8 @@ int db__driver_execute_immediate(dbString *sql) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #if GDAL_VERSION_NUM >= 2000000 cols[i].type != OFTInteger64 || #endif @@ -237,6 +243,7 @@ int db__driver_execute_immediate(dbString *sql) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -327,6 +334,11 @@ int db__driver_execute_immediate(dbString *sql) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main *(cols[i].value) == '\'') { value = G_strchg(cols[i].value, '\'', ' '); diff --git a/db/drivers/ogr/fetch.c b/db/drivers/ogr/fetch.c index 793dd742e35..ac549f86c24 100644 --- a/db/drivers/ogr/fetch.c +++ b/db/drivers/ogr/fetch.c @@ -163,6 +163,7 @@ int db__driver_fetch(dbCursor *cn, int position, int *more) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -255,6 +256,11 @@ int db__driver_fetch(dbCursor *cn, int position, int *more) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #endif >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) diff --git a/db/drivers/ogr/listtab.c b/db/drivers/ogr/listtab.c index f86ef28b478..1d8677a1e8a 100644 --- a/db/drivers/ogr/listtab.c +++ b/db/drivers/ogr/listtab.c @@ -47,6 +47,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int db__driver_list_tables(dbString **tlist, int *tcount, int system) ======= <<<<<<< HEAD @@ -89,6 +90,8 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int db__driver_list_tables(dbString **tlist, int *tcount, int system UNUSED) ======= int db__driver_list_tables(dbString **tlist, int *tcount, int system) @@ -107,6 +110,7 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -190,6 +194,11 @@ int db__driver_list_tables(dbString **tlist, int *tcount, int system) int db__driver_list_tables(dbString **tlist, int *tcount, int system) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +int db__driver_list_tables(dbString **tlist, int *tcount, int system) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { int i, nlayers; dbString *list; diff --git a/db/drivers/sqlite/cursor.c b/db/drivers/sqlite/cursor.c index df9b86d7555..a560c098168 100644 --- a/db/drivers/sqlite/cursor.c +++ b/db/drivers/sqlite/cursor.c @@ -59,6 +59,7 @@ int db__driver_close_cursor(dbCursor *dbc) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -129,6 +130,10 @@ cursor *alloc_cursor(void) ======= >>>>>>> osgeo-main ======= +cursor *alloc_cursor(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) cursor *alloc_cursor() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -155,6 +160,7 @@ cursor *alloc_cursor(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -245,6 +251,8 @@ cursor *alloc_cursor(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { cursor *c; diff --git a/display/d.colortable/main.c b/display/d.colortable/main.c index 56089ccf941..c33d3b6185a 100644 --- a/display/d.colortable/main.c +++ b/display/d.colortable/main.c @@ -269,6 +269,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* fisrt 5 pixels draw null color */ ======= @@ -311,6 +312,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* first 5 pixels draw null color */ ======= @@ -330,6 +333,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /* fisrt 5 pixels draw null color */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -412,6 +416,11 @@ int main(int argc, char **argv) ======= /* fisrt 5 pixels draw null color */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /* fisrt 5 pixels draw null color */ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main y_box[1] = -1; y_box[3] = 1; diff --git a/display/d.geodesic/d.geodesic.html b/display/d.geodesic/d.geodesic.html index be0f68f2eeb..47cc8c76711 100644 --- a/display/d.geodesic/d.geodesic.html +++ b/display/d.geodesic/d.geodesic.html @@ -56,6 +56,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD This program works only in GRASS locations with longitude/latitude ======= <<<<<<< HEAD @@ -98,6 +99,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main This program works only with longitude/latitude ======= This program works only in GRASS locations with longitude/latitude @@ -116,6 +119,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= This program works only in GRASS locations with longitude/latitude >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -199,6 +203,11 @@

    NOTES

    This program works only in GRASS locations with longitude/latitude >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +This program works only in GRASS locations with longitude/latitude +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main coordinate system.

    SEE ALSO

    diff --git a/display/d.grid/d.grid.html b/display/d.grid/d.grid.html index 0d439adeb1b..08ff68864e9 100644 --- a/display/d.grid/d.grid.html +++ b/display/d.grid/d.grid.html @@ -103,6 +103,7 @@

    AUTHORS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -175,6 +176,10 @@

    AUTHORS

    Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague ======= >>>>>>> osgeo-main +======= +Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague +======= +>>>>>>> osgeo-main Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -197,6 +202,7 @@

    AUTHORS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -226,6 +232,8 @@

    AUTHORS

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague ======= Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague @@ -245,6 +253,7 @@

    AUTHORS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -323,3 +332,5 @@

    AUTHORS

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main diff --git a/display/d.grid/plot.c b/display/d.grid/plot.c index 18d5e72f138..64ac3294ec6 100644 --- a/display/d.grid/plot.c +++ b/display/d.grid/plot.c @@ -584,6 +584,7 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -674,6 +675,11 @@ int plot_geogrid(double size, struct pj_info *info_in, struct pj_info *info_out, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ********************************************************/ void init_proj(struct pj_info *info_in, struct pj_info *info_out, diff --git a/display/d.histogram/bar.h b/display/d.histogram/bar.h index 3a87864ec64..51b979afc00 100644 --- a/display/d.histogram/bar.h +++ b/display/d.histogram/bar.h @@ -34,6 +34,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -109,6 +110,10 @@ float rem(long int, long int); /* remainder function */ float rem(long int, long int); /* remainder function */ ======= >>>>>>> osgeo-main +======= +float rem(long int, long int); /* remainder function */ +======= +>>>>>>> osgeo-main float rem(); /* remainder function */ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -131,6 +136,7 @@ float rem(long int, long int); /* remainder function */ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -160,6 +166,8 @@ float rem(long int, long int); /* remainder function */ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= float rem(); /* remainder function */ ======= float rem(long int, long int); /* remainder function */ @@ -179,6 +187,7 @@ float rem(long int, long int); /* remainder function */ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -263,6 +272,8 @@ float rem(); /* remainder function */ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* normalized coordinates of bar-chart components */ diff --git a/display/d.histogram/pie.h b/display/d.histogram/pie.h index b6a72e8ec6f..9e5b9a92fa4 100644 --- a/display/d.histogram/pie.h +++ b/display/d.histogram/pie.h @@ -63,6 +63,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -138,6 +139,10 @@ float rem(long int, long int); /* remainder function */ float rem(long int, long int); /* remainder function */ ======= >>>>>>> osgeo-main +======= +float rem(long int, long int); /* remainder function */ +======= +>>>>>>> osgeo-main float rem(); /* remainder function */ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -160,6 +165,7 @@ float rem(long int, long int); /* remainder function */ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -189,6 +195,8 @@ float rem(long int, long int); /* remainder function */ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= float rem(); /* remainder function */ ======= float rem(long int, long int); /* remainder function */ @@ -208,6 +216,7 @@ float rem(long int, long int); /* remainder function */ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -292,6 +301,8 @@ float rem(); /* remainder function */ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* normalized coordinates & dimensions of pie-chart components */ diff --git a/display/d.labels/d.labels.html b/display/d.labels/d.labels.html index 97da4aa8708..99b7f70b478 100644 --- a/display/d.labels/d.labels.html +++ b/display/d.labels/d.labels.html @@ -23,6 +23,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD appropriate directory under the user's current mapset and location ======= <<<<<<< HEAD @@ -65,6 +66,8 @@

    DESCRIPTION

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main appropriate directory under the user's current mapset and project ======= appropriate directory under the user's current mapset and location @@ -83,6 +86,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= appropriate directory under the user's current mapset and location >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -166,6 +170,11 @@

    DESCRIPTION

    appropriate directory under the user's current mapset and location >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +appropriate directory under the user's current mapset and location +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main (i.e. $MAPSET/paint/labels/).

    NOTES

    diff --git a/display/d.labels/do_labels.c b/display/d.labels/do_labels.c index 1f8e3fc23d0..8ee0a4fb5c6 100644 --- a/display/d.labels/do_labels.c +++ b/display/d.labels/do_labels.c @@ -485,6 +485,7 @@ int scan_ref(char *buf) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD case 1: if (xmatch(word1) || ymatch(word1)) @@ -529,6 +530,8 @@ int scan_ref(char *buf) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main FALLTHROUGH; case 1: @@ -541,6 +544,7 @@ int scan_ref(char *buf) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD case EOF: @@ -566,6 +570,10 @@ int scan_ref(char *buf) case EOF: ======= >>>>>>> osgeo-main +======= + case EOF: +======= +>>>>>>> osgeo-main ======= case 1: if (xmatch(word1) || ymatch(word1)) @@ -585,6 +593,7 @@ int scan_ref(char *buf) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -625,6 +634,10 @@ int scan_ref(char *buf) >>>>>>> 7f1fd5e3ad (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main +======= +>>>>>>> 7f1fd5e3ad (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main ======= case 1: if (xmatch(word1) || ymatch(word1)) @@ -644,6 +657,7 @@ int scan_ref(char *buf) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -691,6 +705,9 @@ int scan_ref(char *buf) >>>>>>> osgeo-main ======= >>>>>>> a610274a1c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> a610274a1c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main default: return 0; diff --git a/display/d.legend.vect/draw.c b/display/d.legend.vect/draw.c index 9ffb64b1706..0ce6c547a2e 100644 --- a/display/d.legend.vect/draw.c +++ b/display/d.legend.vect/draw.c @@ -17,6 +17,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * background. Eith do_bg=0 compute position of all legend graphic item and draw ======= @@ -59,6 +60,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * background. With do_bg=0 compute position of all legend graphic item and draw ======= @@ -78,6 +81,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * background. Eith do_bg=0 compute position of all legend graphic item and draw >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -160,6 +164,11 @@ ======= * background. Eith do_bg=0 compute position of all legend graphic item and draw >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * background. Eith do_bg=0 compute position of all legend graphic item and draw +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * all. * diff --git a/display/d.legend/draw.c b/display/d.legend/draw.c index fef44b31281..d461e75e2ff 100644 --- a/display/d.legend/draw.c +++ b/display/d.legend/draw.c @@ -278,6 +278,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (opt_at->answer == NULL) { /* if defualt scaling */ ======= @@ -320,6 +321,8 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (opt_at->answer == NULL) { /* if default scaling */ ======= @@ -339,6 +342,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if (opt_at->answer == NULL) { /* if defualt scaling */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -421,6 +425,11 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, ======= if (opt_at->answer == NULL) { /* if defualt scaling */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + if (opt_at->answer == NULL) { /* if defualt scaling */ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (!do_smooth && (dots_per_line < 4)) /* if so small that there's no box */ @@ -466,6 +475,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -540,6 +550,10 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, ======= if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= (int)b_s) ======= +>>>>>>> osgeo-main +======= + if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= (int)b_s) +======= >>>>>>> osgeo-main if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= b_s) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -563,6 +577,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -591,6 +606,8 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (snprintf(DispFormat, b_s, "%%%dd", log_maxCat) >= b_s) ======= @@ -611,6 +628,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -694,6 +712,8 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_fatal_error( _("Failed to create format string with maxCat=%f."), @@ -1513,6 +1533,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (opt_at->answer == NULL) { /* ie defualt scaling */ ======= @@ -1555,6 +1576,8 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (opt_at->answer == NULL) { /* ie default scaling */ ======= @@ -1574,6 +1597,7 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if (opt_at->answer == NULL) { /* ie defualt scaling */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1656,6 +1680,11 @@ void draw(const char *map_name, int maptype, int color, int thin, int lines, ======= if (opt_at->answer == NULL) { /* ie defualt scaling */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + if (opt_at->answer == NULL) { /* ie defualt scaling */ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ScaleFactor = ((true_r - true_l) / ((MaxLabelLen + 3) * txsiz * diff --git a/display/d.mon/main.c b/display/d.mon/main.c index 1222d1cd3e6..116eba15138 100644 --- a/display/d.mon/main.c +++ b/display/d.mon/main.c @@ -38,6 +38,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -86,6 +87,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main [1] display/d.mon/render_cmd.py [2] lib/display/r_raster.c @@ -108,6 +111,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -138,6 +142,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main [1] https://github.com/OSGeo/grass/tree/master/display/d.mon/render_cmd.py [2] https://github.com/OSGeo/grass/tree/master/lib/display/r_raster.c#L107 @@ -165,6 +171,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -193,6 +200,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= [1] display/d.mon/render_cmd.py [2] lib/display/r_raster.c @@ -212,6 +221,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -289,6 +299,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main */ diff --git a/display/d.mon/start.c b/display/d.mon/start.c index 07ee706b5e1..4d95b158d2c 100644 --- a/display/d.mon/start.c +++ b/display/d.mon/start.c @@ -210,6 +210,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -272,6 +273,8 @@ int start_mon(const char *name, const char *output, int select, int width, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) G_fatal_error(_("Failed to write to file <%s>"), env_file); @@ -295,6 +298,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -493,6 +497,10 @@ int start_mon(const char *name, const char *output, int select, int width, ======= ======= >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> osgeo-main >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) if (write(fd, buf, strlen(buf)) != strlen(buf)) G_fatal_error(_("Failed to write to file <%s>"), env_file); @@ -525,6 +533,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -548,6 +557,8 @@ int start_mon(const char *name, const char *output, int select, int width, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_fatal_error(_("Failed to write to file <%s>"), env_file); } @@ -627,6 +638,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD @@ -836,6 +848,8 @@ int start_mon(const char *name, const char *output, int select, int width, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (write(fd, buf, strlen(buf)) != strlen(buf)) ======= @@ -877,6 +891,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD @@ -898,6 +913,8 @@ int start_mon(const char *name, const char *output, int select, int width, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (bgcolor) { @@ -929,6 +946,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -999,6 +1017,10 @@ int start_mon(const char *name, const char *output, int select, int width, ======= if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) ======= +>>>>>>> osgeo-main +======= + if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) +======= >>>>>>> osgeo-main if (write(fd, buf, strlen(buf)) != strlen(buf)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1018,6 +1040,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebf041644a (r.horizon manual - fix typo (#2794)) ======= @@ -1040,6 +1063,8 @@ int start_mon(const char *name, const char *output, int select, int width, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (write(fd, buf, strlen(buf)) != strlen(buf)) ======= @@ -1059,6 +1084,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1110,6 +1136,8 @@ int start_mon(const char *name, const char *output, int select, int width, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_fatal_error(_("Failed to write to file <%s>"), env_file); } @@ -1123,6 +1151,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1206,6 +1235,10 @@ int start_mon(const char *name, const char *output, int select, int width, ======= if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) ======= +>>>>>>> osgeo-main +======= + if (write(fd, buf, strlen(buf)) != (ssize_t)strlen(buf)) +======= >>>>>>> osgeo-main if (write(fd, buf, strlen(buf)) != strlen(buf)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1233,6 +1266,7 @@ int start_mon(const char *name, const char *output, int select, int width, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1391,6 +1425,8 @@ int start_mon(const char *name, const char *output, int select, int width, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_fatal_error(_("Failed to write to file <%s>"), env_file); } diff --git a/display/d.path/select.c b/display/d.path/select.c index 8e64301321b..28b4f9efcdf 100644 --- a/display/d.path/select.c +++ b/display/d.path/select.c @@ -32,6 +32,7 @@ int display(struct Map_info *Map, struct line_pnts *Points, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -122,6 +123,11 @@ int display(struct Map_info *Map, struct line_pnts *Points, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main const struct color_rgb *color, int first, int last, int be_bold) { diff --git a/display/d.rast.arrow/main.c b/display/d.rast.arrow/main.c index 9b54896cd27..faea5825ed2 100644 --- a/display/d.rast.arrow/main.c +++ b/display/d.rast.arrow/main.c @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -54,6 +55,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * COPYRIGHT: (C) 2000, 2010, 2023 by the GRASS Development Team ======= @@ -73,6 +76,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -120,6 +124,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * COPYRIGHT: (C) 2000, 2010 by the GRASS Development Team >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -148,6 +154,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * 2004 Update for 360 degree arrows and magnitude scaling: Hamish Bowman, Oct * 2005 Align grids with raster cells: Huidae Cho, Apr 2009 Drainage aspect @@ -192,6 +199,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * 2004; Update for 360 degree arrows and magnitude scaling: Hamish Bowman, Oct * 2005; Align grids with raster cells: Huidae Cho, Apr 2009; Drainage aspect @@ -215,6 +224,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -243,6 +253,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= * 2004 Update for 360 degree arrows and magnitude scaling: Hamish Bowman, Oct * 2005 Align grids with raster cells: Huidae Cho, Apr 2009 Drainage aspect @@ -262,6 +274,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -303,6 +316,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main */ @@ -503,6 +518,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -543,6 +559,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main else if (strcmp("terraflow", opt2->answer) == 0) map_type = 6; @@ -562,6 +580,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -630,6 +649,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main scale = atof(opt8->answer); @@ -826,6 +849,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (map_type == 2 || map_type == 3 || map_type == 5) { ======= @@ -868,6 +892,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (map_type == 2 || map_type == 3 || map_type == 5 || map_type == 6) { @@ -888,6 +914,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= if (map_type == 2 || map_type == 3 || map_type == 5) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -970,6 +997,11 @@ int main(int argc, char **argv) ======= if (map_type == 2 || map_type == 3 || map_type == 5) { >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + if (map_type == 2 || map_type == 3 || map_type == 5) { +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (Rast_is_null_value(ptr, raster_type)) aspect_c = 0; @@ -1167,6 +1199,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1207,6 +1240,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* case switch for r.terraflow direction type aspect map */ else if (map_type == 6) { @@ -1271,6 +1306,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1339,6 +1375,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ptr = G_incr_void_ptr(ptr, Rast_cell_size(raster_type)); if (opt7->answer) diff --git a/display/d.rast.num/main.c b/display/d.rast.num/main.c index 2e0d990361b..4075688e76e 100644 --- a/display/d.rast.num/main.c +++ b/display/d.rast.num/main.c @@ -51,6 +51,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -141,6 +142,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * */ @@ -264,6 +270,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -304,6 +311,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* Setup driver and check important information */ @@ -324,6 +333,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -392,6 +402,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main map_name = opt.map->answer; @@ -501,6 +515,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -591,6 +606,11 @@ int main(int argc, char **argv) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (opt.font->answer) D_font(opt.font->answer); diff --git a/display/d.rhumbline/d.rhumbline.html b/display/d.rhumbline/d.rhumbline.html index 487074b4ee8..625d7d8736a 100644 --- a/display/d.rhumbline/d.rhumbline.html +++ b/display/d.rhumbline/d.rhumbline.html @@ -57,6 +57,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD This program works only in GRASS locations with longitude/latitude ======= <<<<<<< HEAD @@ -99,6 +100,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main This program works only with longitude/latitude ======= This program works only in GRASS locations with longitude/latitude @@ -117,6 +120,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= This program works only in GRASS locations with longitude/latitude >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -200,6 +204,11 @@

    NOTES

    This program works only in GRASS locations with longitude/latitude >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +This program works only in GRASS locations with longitude/latitude +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main coordinate system.

    SEE ALSO

    diff --git a/display/d.rhumbline/plot.c b/display/d.rhumbline/plot.c index 30a5d8d1506..e9de672fe10 100644 --- a/display/d.rhumbline/plot.c +++ b/display/d.rhumbline/plot.c @@ -21,6 +21,7 @@ void plot(double lon1, double lat1, double lon2, double lat2, int line_color, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int text_color) ======= @@ -63,6 +64,8 @@ void plot(double lon1, double lat1, double lon2, double lat2, int line_color, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int text_color UNUSED) ======= @@ -82,6 +85,7 @@ void plot(double lon1, double lat1, double lon2, double lat2, int line_color, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int text_color) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -165,6 +169,11 @@ void plot(double lon1, double lat1, double lon2, double lat2, int line_color, int text_color) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + int text_color) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { int nsteps = 1000; int i; diff --git a/display/d.text/d.text.html b/display/d.text/d.text.html index 9145b63fe16..aa8907c7725 100644 --- a/display/d.text/d.text.html +++ b/display/d.text/d.text.html @@ -138,6 +138,7 @@

    AUTHORS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -222,6 +223,11 @@

    AUTHORS

    ======= >>>>>>> osgeo-main ======= +James Westervelt, +U.S. Army Construction Engineering +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) James Westervelt, U.S. Army Construction Engineering @@ -252,6 +258,7 @@

    AUTHORS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -349,5 +356,7 @@

    AUTHORS

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Research Laboratory

    Updates by Huidae Cho diff --git a/display/d.text/main.c b/display/d.text/main.c index d550d114137..8e52783dded 100644 --- a/display/d.text/main.c +++ b/display/d.text/main.c @@ -579,6 +579,7 @@ static void set_color(char *tcolor) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -669,6 +670,11 @@ static void set_color(char *tcolor) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main D_RGB_color(r, g, b); } diff --git a/display/d.title/d.title.html b/display/d.title/d.title.html index 455c2620d24..8bd2fca1134 100644 --- a/display/d.title/d.title.html +++ b/display/d.title/d.title.html @@ -35,6 +35,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -120,6 +121,10 @@

    NOTES

    ======= >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main The text created with d.text will not necessarily fit within the @@ -141,6 +146,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7dcf663571 (r.horizon manual - fix typo (#2794)) @@ -235,6 +241,11 @@

    NOTES

    ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main The text created with d.text will not necessarily fit within the @@ -260,6 +271,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -290,6 +302,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -309,6 +323,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -338,6 +353,8 @@

    NOTES

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= The text created with d.text @@ -360,6 +377,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -426,6 +444,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    EXAMPLES

    @@ -481,6 +501,7 @@

    AUTHOR

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -565,6 +586,11 @@

    AUTHOR

    ======= >>>>>>> osgeo-main ======= +James Westervelt, +U.S. Army Construction Engineering +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) James Westervelt, U.S. Army Construction Engineering @@ -595,6 +621,7 @@

    AUTHOR

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -692,4 +719,6 @@

    AUTHOR

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Research Laboratory diff --git a/display/d.vect.thematic/area.c b/display/d.vect.thematic/area.c index 055eb70f128..0306ffa61e3 100644 --- a/display/d.vect.thematic/area.c +++ b/display/d.vect.thematic/area.c @@ -32,6 +32,7 @@ int dareatheme(struct Map_info *Map, struct cat_list *Clist, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int chcat, struct Cell_head *window, int default_width) ======= @@ -74,6 +75,8 @@ int dareatheme(struct Map_info *Map, struct cat_list *Clist, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int chcat, struct Cell_head *window, int default_width UNUSED) ======= @@ -93,6 +96,7 @@ int dareatheme(struct Map_info *Map, struct cat_list *Clist, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int chcat, struct Cell_head *window, int default_width) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -176,6 +180,11 @@ int dareatheme(struct Map_info *Map, struct cat_list *Clist, int chcat, struct Cell_head *window, int default_width) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + int chcat, struct Cell_head *window, int default_width) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { int num, area, isle, n_isles, n_points; diff --git a/display/d.vect.thematic/display.c b/display/d.vect.thematic/display.c index 930850bc427..a588659b147 100644 --- a/display/d.vect.thematic/display.c +++ b/display/d.vect.thematic/display.c @@ -155,6 +155,7 @@ int draw_line(int ltype, int line, const struct line_pnts *Points, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD const struct line_cats *Cats, int chcat, double size, ======= @@ -197,6 +198,8 @@ int draw_line(int ltype, int line, const struct line_pnts *Points, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main const struct line_cats *Cats, int chcat, double size UNUSED, ======= @@ -216,6 +219,7 @@ int draw_line(int ltype, int line, const struct line_pnts *Points, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= const struct line_cats *Cats, int chcat, double size, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -298,6 +302,11 @@ int draw_line(int ltype, int line, const struct line_pnts *Points, ======= const struct line_cats *Cats, int chcat, double size, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + const struct line_cats *Cats, int chcat, double size, +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main int default_width, const struct cat_list *Clist, SYMBOL *Symb, RGBA_Color *primary_color, int *n_points, int *n_lines, diff --git a/display/d.vect.thematic/legend.c b/display/d.vect.thematic/legend.c index c119d1d5c8e..6987f22ee49 100644 --- a/display/d.vect.thematic/legend.c +++ b/display/d.vect.thematic/legend.c @@ -36,6 +36,7 @@ void write_into_legend_file(const char *legfile, const char *icon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD int *frequencies, const char *topo) ======= @@ -78,6 +79,8 @@ void write_into_legend_file(const char *legfile, const char *icon, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int *frequencies, int c_type, const char *topo) ======= @@ -97,6 +100,7 @@ void write_into_legend_file(const char *legfile, const char *icon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int *frequencies, const char *topo) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -180,6 +184,11 @@ void write_into_legend_file(const char *legfile, const char *icon, int *frequencies, const char *topo) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + int *frequencies, const char *topo) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { FILE *fd; int i; @@ -214,6 +223,7 @@ void write_into_legend_file(const char *legfile, const char *icon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -248,6 +258,8 @@ void write_into_legend_file(const char *legfile, const char *icon, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(fd, "< %.*f|", n_places, breakpoints[0]); ======= @@ -267,6 +279,7 @@ void write_into_legend_file(const char *legfile, const char *icon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -314,6 +327,8 @@ void write_into_legend_file(const char *legfile, const char *icon, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(fd, "< %.2f|", breakpoints[0]); } @@ -357,6 +372,7 @@ void write_into_legend_file(const char *legfile, const char *icon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -397,6 +413,8 @@ void write_into_legend_file(const char *legfile, const char *icon, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main colors[0].r, colors[0].g, colors[0].b, bcolor.r, bcolor.g, bcolor.b, default_width, topo, frequencies[0]); @@ -432,6 +450,7 @@ void write_into_legend_file(const char *legfile, const char *icon, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -500,6 +519,10 @@ void write_into_legend_file(const char *legfile, const char *icon, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main colors[nbreaks].r, colors[nbreaks].g, colors[nbreaks].b, bcolor.r, bcolor.g, bcolor.b, default_width, topo, frequencies[nbreaks]); diff --git a/display/d.vect.thematic/local_proto.h b/display/d.vect.thematic/local_proto.h index bb5253dc5c6..e30ec5662eb 100644 --- a/display/d.vect.thematic/local_proto.h +++ b/display/d.vect.thematic/local_proto.h @@ -44,6 +44,7 @@ void write_into_legend_file(const char *, const char *, const char *, double, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD struct color_rgb *, int, int *, const char *); ======= @@ -86,6 +87,8 @@ void write_into_legend_file(const char *, const char *, const char *, double, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main struct color_rgb *, int, int *, int, const char *); ======= @@ -105,6 +108,7 @@ void write_into_legend_file(const char *, const char *, const char *, double, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= struct color_rgb *, int, int *, const char *); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -188,3 +192,8 @@ void write_into_legend_file(const char *, const char *, const char *, double, struct color_rgb *, int, int *, const char *); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + struct color_rgb *, int, int *, const char *); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main diff --git a/display/d.vect.thematic/main.c b/display/d.vect.thematic/main.c index 358ed0283f4..e5570c720b2 100644 --- a/display/d.vect.thematic/main.c +++ b/display/d.vect.thematic/main.c @@ -420,6 +420,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * max exluded) than classes */ ======= @@ -462,6 +463,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * max excluded) than classes */ ======= @@ -481,6 +484,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * max exluded) than classes */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -563,6 +567,11 @@ int main(int argc, char **argv) ======= * max exluded) than classes */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * max exluded) than classes */ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main breakpoints = (double *)G_malloc((nbreaks) * sizeof(double)); @@ -709,6 +718,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -749,6 +759,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main write_into_legend_file( "stdout", icon_opt->answer, title, stats.min, stats.max, @@ -769,6 +781,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -837,6 +850,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main write_into_legend_file("stdout", icon_opt->answer, title, stats.min, stats.max, breakpoints, @@ -859,6 +876,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -949,6 +967,11 @@ int main(int argc, char **argv) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } @@ -971,6 +994,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1011,6 +1035,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main write_into_legend_file( "stdout", icon_line_opt->answer, title, stats.min, @@ -1031,6 +1057,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1099,6 +1126,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main write_into_legend_file("stdout", icon_line_opt->answer, title, stats.min, stats.max, breakpoints, @@ -1121,6 +1152,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1211,6 +1243,11 @@ int main(int argc, char **argv) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } @@ -1233,6 +1270,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1273,6 +1311,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main write_into_legend_file( "stdout", icon_area_opt->answer, title, stats.min, @@ -1293,6 +1333,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1361,6 +1402,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main write_into_legend_file("stdout", icon_area_opt->answer, title, stats.min, stats.max, breakpoints, @@ -1383,6 +1428,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1473,6 +1519,11 @@ int main(int argc, char **argv) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } @@ -1502,6 +1553,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1542,6 +1594,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main write_into_legend_file( leg_file, icon_opt->answer, title, stats.min, stats.max, @@ -1562,6 +1616,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1630,6 +1685,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main write_into_legend_file(leg_file, icon_opt->answer, title, stats.min, stats.max, breakpoints, @@ -1652,6 +1711,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1742,6 +1802,11 @@ int main(int argc, char **argv) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } @@ -1764,6 +1829,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1804,6 +1870,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main write_into_legend_file( leg_file, icon_line_opt->answer, title, stats.min, @@ -1824,6 +1892,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1892,6 +1961,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main write_into_legend_file(leg_file, icon_line_opt->answer, title, stats.min, stats.max, breakpoints, @@ -1914,6 +1987,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2004,6 +2078,11 @@ int main(int argc, char **argv) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } @@ -2026,6 +2105,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2066,6 +2146,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main write_into_legend_file( leg_file, icon_area_opt->answer, title, stats.min, @@ -2086,6 +2168,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2154,6 +2237,10 @@ int main(int argc, char **argv) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main write_into_legend_file(leg_file, icon_area_opt->answer, title, stats.min, stats.max, breakpoints, @@ -2176,6 +2263,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2266,6 +2354,11 @@ int main(int argc, char **argv) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } @@ -2297,6 +2390,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD default_width, frequencies, "point"); ======= @@ -2339,6 +2433,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main default_width, frequencies, ctype, "point"); ======= @@ -2358,6 +2454,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= default_width, frequencies, "point"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2440,6 +2537,11 @@ int main(int argc, char **argv) ======= default_width, frequencies, "point"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + default_width, frequencies, "point"); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } @@ -2464,6 +2566,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD colors, default_width, frequencies, "line"); ======= @@ -2506,6 +2609,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main colors, default_width, frequencies, ctype, "line"); ======= @@ -2525,6 +2630,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= colors, default_width, frequencies, "line"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2607,6 +2713,11 @@ int main(int argc, char **argv) ======= colors, default_width, frequencies, "line"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + colors, default_width, frequencies, "line"); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } @@ -2631,6 +2742,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD colors, default_width, frequencies, "area"); ======= @@ -2673,6 +2785,8 @@ int main(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main colors, default_width, frequencies, ctype, "area"); ======= @@ -2692,6 +2806,7 @@ int main(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= colors, default_width, frequencies, "area"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2774,6 +2889,11 @@ int main(int argc, char **argv) ======= colors, default_width, frequencies, "area"); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + colors, default_width, frequencies, "area"); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main break; } diff --git a/display/d.vect.thematic/plot1.c b/display/d.vect.thematic/plot1.c index e6f409c13ea..175c3960bcf 100644 --- a/display/d.vect.thematic/plot1.c +++ b/display/d.vect.thematic/plot1.c @@ -64,6 +64,7 @@ int plot1(struct Map_info *Map, int type, int area, struct cat_list *Clist, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -154,6 +155,11 @@ int plot1(struct Map_info *Map, int type, int area, struct cat_list *Clist, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main int cats_color_flag, char *rgb_column, int default_width, char *width_column, double width_scale) diff --git a/display/d.vect/d.vect.html b/display/d.vect/d.vect.html index d7c7b45eb47..5e24cc2c136 100644 --- a/display/d.vect/d.vect.html +++ b/display/d.vect/d.vect.html @@ -27,6 +27,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -68,6 +69,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    When d.vect is used with where parameter on MS Windows Command Prompt, it is important to use ˆ carret symbol for escaping special characters < > ( ) & | , ; ". @@ -91,6 +94,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -160,6 +164,10 @@

    NOTES

    ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main

    By default d.vect areas are filled with fill_color and outlined with color. Area outlines can be suppressed with 

    diff --git a/display/d.vect/label.c b/display/d.vect/label.c
index 5918f6979af..35edc06d38a 100644
--- a/display/d.vect/label.c
+++ b/display/d.vect/label.c
@@ -203,6 +203,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -294,6 +295,11 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     if (lattr->yref == LCENTER)
         Yoffset = -(B - T) / 2;
@@ -316,6 +322,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -406,6 +413,11 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     if (lattr->has_bgcolor || lattr->has_bcolor) {
@@ -427,6 +439,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         yarr[0] = yarr[3] = yarr[4] = B + Yoffset;
         yarr[1] = yarr[2] = T + Yoffset;
@@ -470,6 +483,8 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         yarr[0] = yarr[3] = yarr[4] = B;
         yarr[1] = yarr[2] = T;
@@ -491,6 +506,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -519,6 +535,8 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         yarr[0] = yarr[3] = yarr[4] = B + Yoffset;
         yarr[1] = yarr[2] = T + Yoffset;
@@ -537,6 +555,7 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -578,6 +597,8 @@ void show_label(double *px, double *py, LATTR *lattr, const char *text)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         if (lattr->has_bgcolor) {
diff --git a/display/d.vect/shape.c b/display/d.vect/shape.c
index 8011cc60bb9..486faaed07b 100644
--- a/display/d.vect/shape.c
+++ b/display/d.vect/shape.c
@@ -65,6 +65,7 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     /* fisrt search for color table */
 =======
@@ -107,6 +108,8 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     /* first search for color table */
 =======
@@ -126,6 +129,7 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     /* fisrt search for color table */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -208,6 +212,11 @@ int display_shape(struct Map_info *Map, int type, struct cat_list *Clist,
 =======
     /* fisrt search for color table */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    /* fisrt search for color table */
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     have_colors =
         Vect_read_colors(Vect_get_name(Map), Vect_get_mapset(Map), &colors);
diff --git a/doc/development/rfc/PSC_guidelines.md b/doc/development/rfc/PSC_guidelines.md
index 27bbd4b706b..94995c56a91 100644
--- a/doc/development/rfc/PSC_guidelines.md
+++ b/doc/development/rfc/PSC_guidelines.md
@@ -32,6 +32,7 @@ Status: Adopted (6 April 2007)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -124,6 +125,10 @@ Status: Adopted (6 April 2007)
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
 A GRASS Project Steering Committee ([PSC](https://trac.osgeo.org/grass/wiki/PSC))
 is proposed to formalize control over the GRASS codebase and to facilitate GRASS
 project management issues. It is desired to keep the administrational overhead
@@ -144,6 +149,7 @@ as low as possible.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727))
 =======
@@ -201,6 +207,9 @@ as low as possible.
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 A GRASS Project Steering Committee ([PSC](https://trac.osgeo.org/grass/wiki/PSC)) is proposed to formalize control
 over the GRASS codebase and to facilitate GRASS project management issues.
 It is desired to keep the administrational overhead as low as possible.
@@ -219,6 +228,7 @@ It is desired to keep the administrational overhead as low as possible.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -248,6 +258,8 @@ It is desired to keep the administrational overhead as low as possible.
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 A GRASS Project Steering Committee ([PSC](https://trac.osgeo.org/grass/wiki/PSC)) is proposed to formalize control
 over the GRASS codebase and to facilitate GRASS project management issues.
 It is desired to keep the administrational overhead as low as possible.
@@ -267,6 +279,7 @@ It is desired to keep the administrational overhead as low as possible.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -290,6 +303,8 @@ It is desired to keep the administrational overhead as low as possible.
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 A GRASS Project Steering Committee ([PSC](https://trac.osgeo.org/grass/wiki/PSC)) is proposed to formalize control
@@ -316,6 +331,7 @@ as low as possible.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -376,6 +392,8 @@ as low as possible.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 This document describes how the GRASS Project Steering Committee
 determines membership, and makes decisions on GRASS project issues.
@@ -430,6 +448,7 @@ currently include:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -519,6 +538,11 @@ currently include:
   non-compliance being removal of write access to the source code repository.
 =======
 >>>>>>> osgeo-main
+=======
+* Enforcing the submitter guidelines, with the ultimate sanction against
+  non-compliance being removal of write access to the source code repository.
+=======
+>>>>>>> osgeo-main
 * Enforcing the submitter guidelines, with the ultimate sanction against non-compliance being removal of write access to the source code repository.
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -542,6 +566,7 @@ currently include:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -571,6 +596,8 @@ currently include:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 * Enforcing the submitter guidelines, with the ultimate sanction against non-compliance being removal of write access to the source code repository.
 =======
 * Enforcing the submitter guidelines, with the ultimate sanction against
@@ -591,6 +618,7 @@ currently include:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -678,6 +706,8 @@ currently include:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 In general, once write access has been granted, developers are allowed to
 make changes to the codebase as they see fit. For controversial or
@@ -719,6 +749,7 @@ Removal of write access to the source code repository is handled as a
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -808,6 +839,11 @@ proposal to the committee as described below in the
 [Operation of the PSC](#operation-of-the-psc) section.
 =======
 >>>>>>> osgeo-main
+=======
+proposal to the committee as described below in the
+[Operation of the PSC](#operation-of-the-psc) section.
+=======
+>>>>>>> osgeo-main
 proposal to the committee as described below in the [Operation of the PSC](#operation-of-the-psc) section.
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -831,6 +867,7 @@ proposal to the committee as described below in the
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -860,6 +897,8 @@ proposal to the committee as described below in the
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 proposal to the committee as described below in the [Operation of the PSC](#operation-of-the-psc) section.
 =======
 proposal to the committee as described below in the
@@ -880,6 +919,7 @@ proposal to the committee as described below in the
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -967,6 +1007,8 @@ proposal to the committee as described below in the [Operation of the PSC](#oper
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 ### Legal aspects
 
@@ -1017,6 +1059,7 @@ by discussion of the proposal on the mailing list until a consensus is
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 reached. Voting on issues is also permissable and may be used as a means
 =======
 <<<<<<< HEAD
@@ -1059,6 +1102,8 @@ reached. Voting on issues is also permissable and may be used as a means
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 reached. Voting on issues is also permissible and may be used as a means
 =======
 reached. Voting on issues is also permissable and may be used as a means
@@ -1077,6 +1122,7 @@ reached. Voting on issues is also permissable and may be used as a means
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 reached. Voting on issues is also permissable and may be used as a means
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1160,6 +1206,11 @@ reached. Voting on issues is also permissable and may be used as a means
 reached. Voting on issues is also permissable and may be used as a means
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+reached. Voting on issues is also permissable and may be used as a means
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 to reach a consensus or, only in case of extreme cases of disagreement, to
 force a decision. Any member may call a vote on any proposal. The voting
 procedure is outlined in a separate document:
diff --git a/doc/development/rfc/PSC_voting_procedures.md b/doc/development/rfc/PSC_voting_procedures.md
index 1278e9a37dc..43e080a037d 100644
--- a/doc/development/rfc/PSC_voting_procedures.md
+++ b/doc/development/rfc/PSC_voting_procedures.md
@@ -32,6 +32,7 @@ Status: Adopted (6 Oct 2014)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -121,6 +122,11 @@ In brief, the PSC members vote on proposals on the dedicated
 [GRASS-PSC mailing list](http://lists.osgeo.org/mailman/listinfo/grass-psc).
 =======
 >>>>>>> osgeo-main
+=======
+In brief, the PSC members vote on proposals on the dedicated
+[GRASS-PSC mailing list](http://lists.osgeo.org/mailman/listinfo/grass-psc).
+=======
+>>>>>>> osgeo-main
 In brief, the PSC members vote on proposals on the dedicated [GRASS-PSC mailing list](http://lists.osgeo.org/mailman/listinfo/grass-psc).
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -144,6 +150,7 @@ In brief, the PSC members vote on proposals on the dedicated
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -173,6 +180,8 @@ In brief, the PSC members vote on proposals on the dedicated
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 In brief, the PSC members vote on proposals on the dedicated [GRASS-PSC mailing list](http://lists.osgeo.org/mailman/listinfo/grass-psc).
 =======
 In brief, the PSC members vote on proposals on the dedicated
@@ -193,6 +202,7 @@ In brief, the PSC members vote on proposals on the dedicated
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -280,6 +290,8 @@ In brief, the PSC members vote on proposals on the dedicated [GRASS-PSC mailing
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Proposals are available for review for at least seven calendar days, and a
 single veto is sufficient to delay progress although ultimately a majority
 of committee members can pass a proposal.
@@ -311,6 +323,7 @@ Proposals:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -402,6 +415,10 @@ Proposals:
 =======
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
 
  1. Proposals are written up and submitted on the PSC mailing list for discussion.
@@ -433,6 +450,7 @@ Proposals:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -471,6 +489,8 @@ Proposals:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 Voting:
 
@@ -509,6 +529,7 @@ Voting:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -541,6 +562,8 @@ Voting:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -557,6 +580,7 @@ Voting:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -605,6 +629,8 @@ Voting:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  1. Proposals are written up and submitted on the PSC mailing list for discussion. Any committee member may call a vote on any proposal, although it is normal practice for the proposer to call the vote. Any interested  party may subscribe to the list and join the discussion, but only [PSC committee members](https://trac.osgeo.org/grass/wiki/PSC) including the PSC Chair get a vote ("eligible voters").
  1. Proposals are available for review for at least seven calendar days before a vote can be closed. It is acknowledged that some more complex issues may require more time for discussion and deliberation: a vote should only be closed after the minimum time period (see above) has passed and sufficient discussion has taken place, or no more progress is being made. The PSC Chair may override this and prolong the discussion period or close a vote straight away if necessary (although the minimum time period for discussion/voting always applies).
@@ -638,6 +664,7 @@ Voting:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -668,6 +695,8 @@ Voting:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -687,6 +716,7 @@ Voting:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -716,6 +746,8 @@ Voting:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 
  1. Proposals are written up and submitted on the PSC mailing list for discussion.
@@ -746,6 +778,7 @@ Voting:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -783,6 +816,8 @@ Voting:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Voting:
 
  1. A voting procedure is started by the proposer. For a more visible communication,
@@ -820,6 +855,7 @@ Voting:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -848,6 +884,8 @@ Voting:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -866,6 +904,7 @@ Voting:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -935,3 +974,5 @@ Voting:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/doc/development/rfc/language_standards_support.md b/doc/development/rfc/language_standards_support.md
index b8cba57b3dc..461338ddc0d 100644
--- a/doc/development/rfc/language_standards_support.md
+++ b/doc/development/rfc/language_standards_support.md
@@ -29,6 +29,7 @@ Status: Motion passed, 29 March 2021
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -135,6 +136,11 @@ The code base of GRASS GIS consists today (Feb. 2021) of predominantly C code (c
 The code base of GRASS GIS consists today (Feb. 2021) of predominantly C code (ca 50 %), Python (ca 30 %) and a smaller amount of C++ (ca 5 %). Each of these languages have evolved significantly in the last 10–20 years. There is, however, no clearly stated policy of supported language standard(s), nor mechanism to update this policy when needed or wanted. This result in uncertainty for contributors for what may be allowed and solutions that may not be optimal.
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+The code base of GRASS GIS consists today (Feb. 2021) of predominantly C code (ca 50 %), Python (ca 30 %) and a smaller amount of C++ (ca 5 %). Each of these languages have evolved significantly in the last 10–20 years. There is, however, no clearly stated policy of supported language standard(s), nor mechanism to update this policy when needed or wanted. This result in uncertainty for contributors for what may be allowed and solutions that may not be optimal.
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 
 The code base of GRASS GIS consists today (Feb. 2021) of predominantly C code
 (ca 50 %), Python (ca 30 %) and a smaller amount of C++ (ca 5 %). Each of these
@@ -194,6 +200,7 @@ provide better cross platform support and possibly safer code.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -223,6 +230,8 @@ provide better cross platform support and possibly safer code.
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 The code base of GRASS GIS consists today (Feb. 2021) of predominantly C code (ca 50 %), Python (ca 30 %) and a smaller amount of C++ (ca 5 %). Each of these languages have evolved significantly in the last 10–20 years. There is, however, no clearly stated policy of supported language standard(s), nor mechanism to update this policy when needed or wanted. This result in uncertainty for contributors for what may be allowed and solutions that may not be optimal.
@@ -334,6 +343,7 @@ provide better cross platform support and possibly safer code.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -694,6 +704,8 @@ provide better cross platform support and possibly safer code.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 Regarding C, there are three standards that may be considered: C99, C11 and
 C17. C99 never really reached full support on key platforms, this is
@@ -736,6 +748,7 @@ good for C17.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -828,6 +841,10 @@ good for C17.
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
 Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to
 consider. The platform and compiler support for all of these are significantly
 better. However, C++11 is at this date in general considered the standard and
@@ -849,6 +866,7 @@ the GRASS GIS project.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727))
 =======
@@ -896,6 +914,9 @@ the GRASS GIS project.
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to consider. The platform and compiler support for all of these are significantly better. However, C++11 is at this date in general considered the standard and until compelling reasons argue otherwise, the C++11 standard should be policy of the GRASS GIS project.
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -917,6 +938,7 @@ Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to c
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -946,6 +968,8 @@ Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to c
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to consider. The platform and compiler support for all of these are significantly better. However, C++11 is at this date in general considered the standard and until compelling reasons argue otherwise, the C++11 standard should be policy of the GRASS GIS project.
 =======
 Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to
@@ -969,6 +993,7 @@ the GRASS GIS project.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1044,6 +1069,8 @@ Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to c
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 ## Proposed Language Standards Support
 
@@ -1072,6 +1099,7 @@ Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to c
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1178,6 +1206,11 @@ Regarding C++, there are the C++98, C++03, C++11, C++14 and C++17 standards to c
 >>>>>>> osgeo-main
 =======
 
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
@@ -1208,6 +1241,7 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 =======
 =======
@@ -1235,6 +1269,8 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
 
@@ -1253,6 +1289,7 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1282,6 +1319,8 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -1297,6 +1336,7 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1320,6 +1360,8 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 C11 with core (mandatory) features [brief summary](https://en.wikipedia.org/wiki/C11_(C_standard_revision))
 
 Optional features may be used if availability is tested with macro, and if not
@@ -1352,6 +1394,7 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1496,3 +1539,5 @@ C++11 [summary](https://en.wikipedia.org/wiki/C%2B%2B11)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/doc/development/rfc/legal_aspects_of_code_contributions.md b/doc/development/rfc/legal_aspects_of_code_contributions.md
index b33386721dc..c70f5bc2a1b 100644
--- a/doc/development/rfc/legal_aspects_of_code_contributions.md
+++ b/doc/development/rfc/legal_aspects_of_code_contributions.md
@@ -76,6 +76,7 @@ source repository:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -132,6 +133,8 @@ source repository:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  must do so in writing to the GRASS [PSC](https://trac.osgeo.org/grass/wiki/PSC)
  before copyright messages are removed. If license terms are changed, it has to
@@ -155,6 +158,7 @@ source repository:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -193,6 +197,8 @@ source repository:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  must do so in writing to the GRASS [PSC](https://trac.osgeo.org/grass/wiki/PSC) before copyright messages
  are removed. If license terms are changed, it has to be by agreement
@@ -212,6 +218,7 @@ source repository:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -240,6 +247,8 @@ source repository:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
  must do so in writing to the GRASS [PSC](https://trac.osgeo.org/grass/wiki/PSC) before copyright messages
  are removed. If license terms are changed, it has to be by agreement
@@ -259,6 +268,7 @@ source repository:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
  must do so in writing to the GRASS [PSC](https://trac.osgeo.org/grass/wiki/PSC) before copyright messages
  are removed. If license terms are changed, it has to be by agreement
@@ -300,6 +310,8 @@ source repository:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
  must do so in writing to the GRASS [PSC](https://trac.osgeo.org/grass/wiki/PSC) before copyright messages
  are removed. If license terms are changed, it has to be by agreement
@@ -324,6 +336,7 @@ source repository:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -352,6 +365,8 @@ source repository:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -370,6 +385,7 @@ source repository:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -427,6 +443,8 @@ source repository:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 * When substantial contributions are added to a file (such as
  substantial patches) the author/contributor should be added to the
  list of copyright holders for the file in the file header.
@@ -463,6 +481,7 @@ Internet: 
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -515,6 +534,8 @@ Internet: 
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -535,6 +556,7 @@ Internet: 
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -558,6 +580,8 @@ Internet: 
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 
@@ -578,6 +602,7 @@ Internet: 
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -647,3 +672,5 @@ Internet: 
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/doc/development/rfc/migration_github.md b/doc/development/rfc/migration_github.md
index 3a5a8101e85..c48eac67b9b 100644
--- a/doc/development/rfc/migration_github.md
+++ b/doc/development/rfc/migration_github.md
@@ -30,6 +30,7 @@ Status: Motion passed Apr 22, 2019
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -122,6 +123,10 @@ Status: Motion passed Apr 22, 2019
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
 GRASS GIS is an open source geoinformation system which is developed by a globally
 distributed team of developers. Besides the source code developers also message
 translators, people who write documentation, those who report bugs and wishes and
@@ -141,6 +146,7 @@ more are involved.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -179,6 +185,8 @@ more are involved.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 The centralized source code management system Subversion (SVN) has served the
 GRASS GIS project very well since 2007. The project has established routines and
@@ -202,6 +210,7 @@ platform.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -239,6 +248,8 @@ platform.
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 GRASS GIS is an open source geoinformation system which is developed by a globally distributed team of developers. Besides the source code developers also message translators, people who write documentation, those who report bugs and wishes and more are involved.
 
 The centralized source code management system Subversion (SVN) has served the GRASS GIS project very well since 2007. The project has established routines and infrastructure (code repository, ticketing system, developer wiki) connected to SVN. However, with an increasing number of Open Source developers using git (and here especially the success of GitHub), time has come to migrate the source code base from SVN kindly hosted by OSGeo to GitHub.com, a widely adopted development platform.
@@ -257,6 +268,7 @@ The centralized source code management system Subversion (SVN) has served the GR
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -286,6 +298,8 @@ The centralized source code management system Subversion (SVN) has served the GR
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 GRASS GIS is an open source geoinformation system which is developed by a globally distributed team of developers. Besides the source code developers also message translators, people who write documentation, those who report bugs and wishes and more are involved.
 
 The centralized source code management system Subversion (SVN) has served the GRASS GIS project very well since 2007. The project has established routines and infrastructure (code repository, ticketing system, developer wiki) connected to SVN. However, with an increasing number of Open Source developers using git (and here especially the success of GitHub), time has come to migrate the source code base from SVN kindly hosted by OSGeo to GitHub.com, a widely adopted development platform.
@@ -304,6 +318,7 @@ The centralized source code management system Subversion (SVN) has served the GR
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -342,6 +357,9 @@ The centralized source code management system Subversion (SVN) has served the GR
 =======
 >>>>>>> osgeo-main
 =======
+=======
+>>>>>>> osgeo-main
+=======
 GRASS GIS is an open source geoinformation system which is developed by a globally distributed team of developers. Besides the source code developers also message translators, people who write documentation, those who report bugs and wishes and more are involved.
 
 The centralized source code management system Subversion (SVN) has served the GRASS GIS project very well since 2007. The project has established routines and infrastructure (code repository, ticketing system, developer wiki) connected to SVN. However, with an increasing number of Open Source developers using git (and here especially the success of GitHub), time has come to migrate the source code base from SVN kindly hosted by OSGeo to GitHub.com, a widely adopted development platform.
@@ -363,6 +381,7 @@ more are involved.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -403,6 +422,8 @@ more are involved.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 The centralized source code management system Subversion (SVN) has served the
 GRASS GIS project very well since 2007. The project has established routines and
@@ -426,6 +447,7 @@ platform.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -454,6 +476,8 @@ platform.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -472,6 +496,7 @@ platform.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -529,6 +554,8 @@ platform.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 ## Background information of git migration
 
@@ -566,6 +593,7 @@ platform.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -632,6 +660,74 @@ platform.
 =======
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+Since migration is a huge effort, massive work on converting the existing source
+code (organized in branches) and the related trac tickets has been done. The main
+scope of weeks of efforts was to preserve as much information as possible by
+converting trac/svn references to full URLs pointing to the old system kept
+available in read-only mode.
+<<<<<<< HEAD
+=======
+Since migration is a huge effort, massive work on converting the existing source code (organized in branches) and the related trac tickets has been done. The main scope of weeks of efforts was to preserve as much information as possible by converting trac/svn references to full URLs pointing to the old system kept available in read-only mode.
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+
+The following new GitHub repositories have been
+[created](https://github.com/grass-svn2git). Note that the "cut-off" date of the
+main **grass** repository does not correspond to the first upload to CSV which
+was then migrated to SVN. The repositories **grass** and **grass-legacy** overlap
+in time since they contain different branches:
+
+* repository **grass**
+  * Source code from 2008 (as the starting commit r31142 was selected, i.e.
+    "Welcome to GRASS 7.0.svn") to present day (SVN-trunk -> git-master)
+  * i.e., all 7.x and later release branches + master
+* repository **grass-legacy**
+  * Source code from 1987 (pre-public internet times; manually reconstructed) -
+    2018 (r72361 - last commit to releasebranch_6_4)
+  * i.e., a separate repository for older GRASS GIS releases (3.2, 4.x, 5.x, 6.x)
+* repository **grass-addons**
+  * repository for addons
+  * code re-organized from directory-like layout (grass6, grass7) into
+    branches-like layout (master == grass7, grass6, ...)
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+Since migration is a huge effort, massive work on converting the existing source code (organized in branches) and the related trac tickets has been done. The main scope of weeks of efforts was to preserve as much information as possible by converting trac/svn references to full URLs pointing to the old system kept available in read-only mode.
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+
+The following new GitHub repositories have been
+[created](https://github.com/grass-svn2git). Note that the "cut-off" date of the
+main **grass** repository does not correspond to the first upload to CSV which
+was then migrated to SVN. The repositories **grass** and **grass-legacy** overlap
+in time since they contain different branches:
+
+* repository **grass**
+  * Source code from 2008 (as the starting commit r31142 was selected, i.e.
+    "Welcome to GRASS 7.0.svn") to present day (SVN-trunk -> git-master)
+  * i.e., all 7.x and later release branches + master
+* repository **grass-legacy**
+  * Source code from 1987 (pre-public internet times; manually reconstructed) -
+    2018 (r72361 - last commit to releasebranch_6_4)
+  * i.e., a separate repository for older GRASS GIS releases (3.2, 4.x, 5.x, 6.x)
+* repository **grass-addons**
+  * repository for addons
+<<<<<<< HEAD
+  * code re-organized from directory-like layout (grass6, grass7) into branches-like layout (master == grass7, grass6, ...)
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+=======
+  * code re-organized from directory-like layout (grass6, grass7) into
+    branches-like layout (master == grass7, grass6, ...)
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+=======
+=======
+>>>>>>> osgeo-main
 Since migration is a huge effort, massive work on converting the existing source
 code (organized in branches) and the related trac tickets has been done. The main
 scope of weeks of efforts was to preserve as much information as possible by
@@ -660,6 +756,7 @@ in time since they contain different branches:
   * repository for addons
   * code re-organized from directory-like layout (grass6, grass7) into
     branches-like layout (master == grass7, grass6, ...)
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1645,6 +1742,10 @@ in time since they contain different branches:
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 * repository **grass-promo**
   * repository for promotional material
 
@@ -1676,6 +1777,7 @@ The final destination of these repositories will be under >>>>>> main
 =======
@@ -1733,6 +1835,8 @@ The final destination of these repositories will be under >>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Given GRASS GIS’ history of 35+ years we had to invest major effort in identifying
 and mapping user names throughout the decades (CVS was used from 1999 to 2007; SVN
 has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tracking)).
@@ -1755,6 +1859,7 @@ has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tra
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1786,6 +1891,8 @@ has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tra
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Given GRASS GIS’ history of 35+ years we had to invest major effort in identifying and mapping user names throughout the decades (CVS was used from 1999 to 2007; SVN has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tracking)).
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1805,6 +1912,7 @@ Given GRASS GIS’ history of 35+ years we had to invest major effort in identif
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 Given GRASS GIS’ history of 35+ years we had to invest major effort in identifying and mapping user names throughout the decades (CVS was used from 1999 to 2007; SVN has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tracking)).
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -1841,6 +1949,8 @@ Given GRASS GIS’ history of 35+ years we had to invest major effort in identif
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 Given GRASS GIS’ history of 35+ years we had to invest major effort in identifying and mapping user names throughout the decades (CVS was used from 1999 to 2007; SVN has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tracking)).
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
@@ -1862,6 +1972,7 @@ has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tra
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1890,6 +2001,8 @@ has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tra
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -1908,6 +2021,7 @@ has been used since 2007, see [history](https://grasswiki.osgeo.org/wiki/Bug_tra
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1971,6 +2085,8 @@ Given GRASS GIS’ history of 35+ years we had to invest major effort in identif
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 The following circumstances could be identified:
 
@@ -2001,6 +2117,7 @@ The following circumstances could be identified:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2046,6 +2163,8 @@ The following circumstances could be identified:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 * user present in both with different name as some were changed in the CVS to
   SVN migration in 2007, leading to colliding user names
 =======
@@ -2088,6 +2207,7 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2111,6 +2231,8 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 * some users already having a GitHub account (with mostly different name again)
   * see here for the [author mapping table](https://trac.osgeo.org/grass/browser/grass-addons/tools/svn2git/)
 
@@ -2151,6 +2273,7 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2190,6 +2313,8 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 * user present in both with different name as some were changed in the CVS to
   SVN migration in 2007, leading to colliding user names
 * some users already having a GitHub account (with mostly different name again)
@@ -2224,6 +2349,7 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2479,6 +2605,10 @@ The tickets migrated from trac to GitHub contain updated links in the ticket tex
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 * links to trac wiki (now pointing to full trac URL)
 * links source code in SVN (now pointing to full trac URL)
 * images and attachments (now pointing to full trac URL)
@@ -2509,6 +2639,7 @@ Labels are preserved by transferring:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2572,6 +2703,8 @@ Labels are preserved by transferring:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 * "operating system" trac label into the GitHub issue text itself (following the
   new issue reporting template)
 * converting milestones/tickets/comments/labels
@@ -2593,6 +2726,7 @@ Labels are preserved by transferring:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2630,6 +2764,8 @@ Labels are preserved by transferring:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 * "operating system" trac label into the GitHub issue text itself (following the new issue reporting template)
 * converting milestones/tickets/comments/labels
 * converting trac usernames to known GitHub usernames (those missing at time can [claim](https://help.github.com/en/articles/why-are-my-commits-linked-to-the-wrong-user) commits)
@@ -2648,6 +2784,7 @@ Labels are preserved by transferring:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2677,6 +2814,8 @@ Labels are preserved by transferring:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 * "operating system" trac label into the GitHub issue text itself (following the new issue reporting template)
 * converting milestones/tickets/comments/labels
 * converting trac usernames to known GitHub usernames (those missing at time can [claim](https://help.github.com/en/articles/why-are-my-commits-linked-to-the-wrong-user) commits)
@@ -2695,6 +2834,7 @@ Labels are preserved by transferring:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 * "operating system" trac label into the GitHub issue text itself (following the new issue reporting template)
 * converting milestones/tickets/comments/labels
@@ -2737,6 +2877,8 @@ Labels are preserved by transferring:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 * "operating system" trac label into the GitHub issue text itself (following the new issue reporting template)
 * converting milestones/tickets/comments/labels
 * converting trac usernames to known GitHub usernames (those missing at time can [claim](https://help.github.com/en/articles/why-are-my-commits-linked-to-the-wrong-user) commits)
@@ -2763,6 +2905,7 @@ Labels are preserved by transferring:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -2791,6 +2934,8 @@ Labels are preserved by transferring:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -2809,6 +2954,7 @@ Labels are preserved by transferring:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2866,6 +3012,8 @@ Labels are preserved by transferring:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 * setting assignees if possible; otherwise set new "grass-svn2git" an assignee
 
 **New labels in the GitHub issue tracker:**
@@ -2894,6 +3042,7 @@ Labels are preserved by transferring:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2983,6 +3132,11 @@ The trac component of the bug reports have been cleaned up following other OSGeo
 projects like GDAL and QGIS, leading to the following categories:
 =======
 >>>>>>> osgeo-main
+=======
+The trac component of the bug reports have been cleaned up following other OSGeo
+projects like GDAL and QGIS, leading to the following categories:
+=======
+>>>>>>> osgeo-main
 The trac component of the bug reports have been cleaned up following other OSGeo projects like GDAL and QGIS, leading to the following categories:
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3006,6 +3160,7 @@ projects like GDAL and QGIS, leading to the following categories:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -3035,6 +3190,8 @@ projects like GDAL and QGIS, leading to the following categories:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 The trac component of the bug reports have been cleaned up following other OSGeo projects like GDAL and QGIS, leading to the following categories:
 =======
 The trac component of the bug reports have been cleaned up following other OSGeo
@@ -3055,6 +3212,7 @@ projects like GDAL and QGIS, leading to the following categories:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3142,6 +3300,8 @@ The trac component of the bug reports have been cleaned up following other OSGeo
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 * **Issue category**:
   * bug
@@ -3190,6 +3350,7 @@ The trac component of the bug reports have been cleaned up following other OSGeo
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3235,6 +3396,8 @@ The trac component of the bug reports have been cleaned up following other OSGeo
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Note that "normal" bugs reported will not carry a label in order to not overload
 the visual impact and readability.
 =======
@@ -3271,6 +3434,7 @@ the visual impact and readability.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3294,6 +3458,8 @@ the visual impact and readability.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 ## Rules and best practices for using Git
 
@@ -3328,6 +3494,7 @@ practices for dealing with the following:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3367,6 +3534,8 @@ practices for dealing with the following:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Note that "normal" bugs reported will not carry a label in order to not overload
 the visual impact and readability.
 
@@ -3395,6 +3564,7 @@ practices for dealing with the following:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3614,6 +3784,10 @@ practices for dealing with the following:
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 * _(add more)_
 
 ## Turning SVN/trac into readonly mode
@@ -3642,6 +3816,7 @@ practices for dealing with the following:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3734,6 +3909,10 @@ practices for dealing with the following:
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
 As soon as the above listed repositories are stable and functional,
 SVN/trac () at OSGeo will be set into readonly
 mode. They will serve as a reference for existing links and also for the
@@ -3754,6 +3933,7 @@ aforementioned converted commit messages and issues in the issue tracker.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727))
 =======
@@ -3801,6 +3981,9 @@ aforementioned converted commit messages and issues in the issue tracker.
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 As soon as the above listed repositories are stable and functional, SVN/trac () at OSGeo will be set into readonly mode. They will serve as a reference for existing links and also for the aforementioned converted commit messages and issues in the issue tracker.
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3822,6 +4005,7 @@ As soon as the above listed repositories are stable and functional, SVN/trac (>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -3851,6 +4035,8 @@ As soon as the above listed repositories are stable and functional, SVN/trac (>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 As soon as the above listed repositories are stable and functional, SVN/trac () at OSGeo will be set into readonly mode. They will serve as a reference for existing links and also for the aforementioned converted commit messages and issues in the issue tracker.
 =======
 As soon as the above listed repositories are stable and functional,
@@ -3873,6 +4059,7 @@ aforementioned converted commit messages and issues in the issue tracker.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3948,6 +4135,8 @@ As soon as the above listed repositories are stable and functional, SVN/trac (>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 ## Open issues
 
@@ -3980,6 +4169,7 @@ As soon as the above listed repositories are stable and functional, SVN/trac (>>>>>> main
 =======
@@ -4037,6 +4227,8 @@ As soon as the above listed repositories are stable and functional, SVN/trac (>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 GitHub is a closed platform. In case it would be shutdown, closed or GitHub would
 start asking unreasonable fees, a backup strategy is needed.
 
@@ -4059,6 +4251,7 @@ start asking unreasonable fees, a backup strategy is needed.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4090,6 +4283,8 @@ start asking unreasonable fees, a backup strategy is needed.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 GitHub is a closed platform. In case it would be shutdown, closed or GitHub would start asking unreasonable fees, a backup strategy is needed.
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4109,6 +4304,7 @@ GitHub is a closed platform. In case it would be shutdown, closed or GitHub woul
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 GitHub is a closed platform. In case it would be shutdown, closed or GitHub would start asking unreasonable fees, a backup strategy is needed.
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -4145,6 +4341,8 @@ GitHub is a closed platform. In case it would be shutdown, closed or GitHub woul
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 GitHub is a closed platform. In case it would be shutdown, closed or GitHub would start asking unreasonable fees, a backup strategy is needed.
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
@@ -4166,6 +4364,7 @@ start asking unreasonable fees, a backup strategy is needed.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -4194,6 +4393,8 @@ start asking unreasonable fees, a backup strategy is needed.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -4212,6 +4413,7 @@ start asking unreasonable fees, a backup strategy is needed.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4275,6 +4477,8 @@ GitHub is a closed platform. In case it would be shutdown, closed or GitHub woul
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 The proposed solution is
 
 * GitLab has an import module from GitHub.
@@ -4306,6 +4510,7 @@ The proposed solution is
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4364,6 +4569,8 @@ The proposed solution is
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 
 
@@ -4382,6 +4589,7 @@ The proposed solution is
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4411,6 +4619,8 @@ The proposed solution is
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 
 
@@ -4430,6 +4640,7 @@ The proposed solution is
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -4453,6 +4664,8 @@ The proposed solution is
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 
@@ -4475,6 +4688,7 @@ The proposed solution is
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4535,3 +4749,5 @@ The proposed solution is
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/doc/development/submitting/docs.md b/doc/development/submitting/docs.md
index 6657fd0be55..fb72783b5b2 100644
--- a/doc/development/submitting/docs.md
+++ b/doc/development/submitting/docs.md
@@ -194,6 +194,7 @@ with a width of 600 pixel but it is clickable in the manual page). If a larger
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 image is displayed as shrinked, both **width** and **height** HTML parameters
 =======
 <<<<<<< HEAD
@@ -236,6 +237,8 @@ image is displayed as shrinked, both **width** and **height** HTML parameters
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 image is displayed as shrunk, both **width** and **height** HTML parameters
 =======
 image is displayed as shrinked, both **width** and **height** HTML parameters
@@ -254,6 +257,7 @@ image is displayed as shrinked, both **width** and **height** HTML parameters
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 image is displayed as shrinked, both **width** and **height** HTML parameters
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -337,6 +341,11 @@ image is displayed as shrinked, both **width** and **height** HTML parameters
 image is displayed as shrinked, both **width** and **height** HTML parameters
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+image is displayed as shrinked, both **width** and **height** HTML parameters
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 (values must be calculated according to the picture size!) should be set:
 
 ```html
diff --git a/doc/development/submitting/general.md b/doc/development/submitting/general.md
index 57ed031c015..814c18a8d47 100644
--- a/doc/development/submitting/general.md
+++ b/doc/development/submitting/general.md
@@ -164,6 +164,7 @@ done manually, you can take an advantage of our [​CI](https://github.com/OSGeo
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -205,6 +206,8 @@ done manually, you can take an advantage of our [​CI](https://github.com/OSGeo
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Often there is more than one active release branch. You can also choose to backport
 only to the closest branch. If you are backporting to other release branches than
 just the closets one, make sure you always backport to all the branches between
@@ -226,6 +229,7 @@ have release branches 3.6 and 3.5, if you backport to 3.5, you should backport t
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -295,6 +299,10 @@ have release branches 3.6 and 3.5, if you backport to 3.5, you should backport t
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 Often there is more than one active release branch, if you are backporting, make
 sure you always backport to all the branches between "main" and the furthest
 branch you are backporting to. For example, let's say we have "main" and branches
@@ -317,6 +325,7 @@ You can also choose to backport only to the closest branch, in our example 8.2.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -408,6 +417,11 @@ You can also choose to backport only to the closest branch, in our example 8.2.
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 
 Backport only complete fixes. When you are not sure if the fix is complete or if
 there is an possibility that some details such as wording will change, wait with
@@ -466,6 +480,7 @@ should first seek consent in the grass-dev mailing list (see below), then you ne
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions
 =======
 <<<<<<< HEAD
@@ -508,6 +523,8 @@ to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 to expand 'configure.ac' and subsequently run `autoconf-2.71` (later versions
 =======
 to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions
@@ -526,6 +543,7 @@ to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -609,6 +627,11 @@ to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions
 to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+to expand 'configure.in' and run subsequently `autoconf-2.69` (later versions
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 will not work) to re-generate 'configure'.
 
 ## Naming Conventions
diff --git a/doc/development/submitting/python.md b/doc/development/submitting/python.md
index 16b5b47a197..d531e5f2b91 100644
--- a/doc/development/submitting/python.md
+++ b/doc/development/submitting/python.md
@@ -116,6 +116,7 @@ flake8 --config lib/python/.flake8 lib/python/temporal/register.py
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -157,6 +158,8 @@ flake8 --config lib/python/.flake8 lib/python/temporal/register.py
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 :exclamation:
 It is very convenient and recommended to [use pre-commit](./submitting.md#use-pre-commit)
 to do both Black formatting and Flake8 file validation.
@@ -177,6 +180,7 @@ to do both Black formatting and Flake8 file validation.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -246,6 +250,10 @@ to do both Black formatting and Flake8 file validation.
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 ### Editor settings for 4-space indentation
 
 The correct editor settings for Python indentation
@@ -267,6 +275,7 @@ The correct editor settings for Python indentation
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
   - Edit > Preferences > Editor > Intentation tab > Type: Spaces
 =======
@@ -309,6 +318,8 @@ The correct editor settings for Python indentation
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
   - Edit > Preferences > Editor > Indentation tab > Type: Spaces
 =======
@@ -328,6 +339,7 @@ The correct editor settings for Python indentation
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
   - Edit > Preferences > Editor > Intentation tab > Type: Spaces
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -411,6 +423,11 @@ The correct editor settings for Python indentation
   - Edit > Preferences > Editor > Intentation tab > Type: Spaces
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+  - Edit > Preferences > Editor > Intentation tab > Type: Spaces
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 - [​PyCharm](https://www.jetbrains.com/pycharm/) IDE:
   - already fine and includes code-linting
 - [​atom](https://atom.io/) IDE:
@@ -620,6 +637,7 @@ To enable translating of messages to other languages (than English), use full
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 strings, e.g.
 =======
 <<<<<<< HEAD
@@ -662,6 +680,8 @@ strings, e.g.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 strings, e.g. (good example):
 =======
 strings, e.g.
@@ -680,6 +700,7 @@ strings, e.g.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 strings, e.g.
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -763,6 +784,11 @@ strings, e.g.
 strings, e.g.
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+strings, e.g.
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 
 ```py
 if ...:
@@ -788,6 +814,7 @@ else:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 instead of constructing string from several parts:
 =======
 <<<<<<< HEAD
@@ -830,6 +857,8 @@ instead of constructing string from several parts:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 instead of constructing string from several parts (bad example):
 =======
 instead of constructing string from several parts:
@@ -848,6 +877,7 @@ instead of constructing string from several parts:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 instead of constructing string from several parts:
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -931,6 +961,11 @@ instead of constructing string from several parts:
 instead of constructing string from several parts:
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+instead of constructing string from several parts:
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 
 ```py
 if ...:
diff --git a/doc/development/submitting/submitting.md b/doc/development/submitting/submitting.md
index 360184ce82d..2bac4adb63b 100644
--- a/doc/development/submitting/submitting.md
+++ b/doc/development/submitting/submitting.md
@@ -36,6 +36,7 @@ Be sure to check your code against these rules:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -77,6 +78,8 @@ Be sure to check your code against these rules:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 ### Use pre-commit
 
 It is highly recommended to install and use [pre-commit](https://pre-commit.com)
@@ -154,6 +157,7 @@ pre-commit install
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -223,6 +227,10 @@ pre-commit install
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 ## GRASS GIS programming best practice
 
 There are many unwritten rules how GRASS modules should work, what they should
diff --git a/doc/development/submitting/submitting_c.md b/doc/development/submitting/submitting_c.md
index 83344b2756c..45008a2b080 100644
--- a/doc/development/submitting/submitting_c.md
+++ b/doc/development/submitting/submitting_c.md
@@ -179,6 +179,7 @@ Use function names which fulfill the official GNU naming convention:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 Instead of naming a function like: MyNewFunction() use underscores for seperation
 =======
 <<<<<<< HEAD
@@ -221,6 +222,8 @@ Instead of naming a function like: MyNewFunction() use underscores for seperatio
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Instead of naming a function like: MyNewFunction() use underscores for separation
 =======
 Instead of naming a function like: MyNewFunction() use underscores for seperation
@@ -239,6 +242,7 @@ Instead of naming a function like: MyNewFunction() use underscores for seperatio
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 Instead of naming a function like: MyNewFunction() use underscores for seperation
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -322,6 +326,11 @@ Instead of naming a function like: MyNewFunction() use underscores for seperatio
 Instead of naming a function like: MyNewFunction() use underscores for seperation
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+Instead of naming a function like: MyNewFunction() use underscores for seperation
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 and lower case letters: my_new_function()`.
 
 ### Comments
@@ -437,6 +446,7 @@ G_message() output is not expected to be sent to pipe or file.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 Always use the gettext macros with _("") for user messages, example:
 =======
 <<<<<<< HEAD
@@ -479,6 +489,8 @@ Always use the gettext macros with _("") for user messages, example:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Messages aiming at the user should be marked for translation. Output meant for
 automatic parsing by other software should not be marked for translation.
 Generally all modules producing output should include localisation header:
@@ -505,6 +517,7 @@ Always use the gettext macros with _("") for user messages, example:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 Always use the gettext macros with _("") for user messages, example:
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -588,6 +601,11 @@ Always use the gettext macros with _("") for user messages, example:
 Always use the gettext macros with _("") for user messages, example:
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+Always use the gettext macros with _("") for user messages, example:
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 
 ```c
 G_fatal_error(_("Vector map <%s> not found"), name);
@@ -612,6 +630,7 @@ hint to translators about meaning or use of cumbersome or obscure message. First
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 word in the comment must be GTC - GRASS translation comment,
 =======
 <<<<<<< HEAD
@@ -654,6 +673,8 @@ word in the comment must be GTC - GRASS translation comment,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 word in the comment must be GTC: GRASS translation comment,
 =======
 word in the comment must be GTC - GRASS translation comment,
@@ -672,6 +693,7 @@ word in the comment must be GTC - GRASS translation comment,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 word in the comment must be GTC - GRASS translation comment,
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -755,6 +777,11 @@ word in the comment must be GTC - GRASS translation comment,
 word in the comment must be GTC - GRASS translation comment,
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+word in the comment must be GTC - GRASS translation comment,
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 
 Example:
 
@@ -776,6 +803,7 @@ Example:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /* GTC A name of a projection */
 =======
 <<<<<<< HEAD
@@ -818,6 +846,8 @@ Example:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 /* GTC: Name of a projection */
 =======
 /* GTC A name of a projection */
@@ -836,6 +866,7 @@ Example:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 /* GTC A name of a projection */
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -919,6 +950,11 @@ Example:
 /* GTC A name of a projection */
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+/* GTC A name of a projection */
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 G_message(_("State Plane"));
 ```
 
@@ -940,6 +976,7 @@ Any message with a noun in plural form has to pass `n_()` macro, even if for the
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -981,6 +1018,8 @@ Any message with a noun in plural form has to pass `n_()` macro, even if for the
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 English language is not required! The syntax is
 `n_("English singular", "English plural", count)`
 
@@ -1017,6 +1056,7 @@ G_message( n_("Remove map", "Remove maps", count));
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -1086,6 +1126,10 @@ G_message( n_("Remove map", "Remove maps", count));
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 English language it is not required!
 
 ```c
@@ -1111,6 +1155,7 @@ See [locale/README](../../../locale/README) for details.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -1202,6 +1247,11 @@ See [locale/README](../../../locale/README) for details.
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 Pipe/file data output: For data output redirected to pipe or file, please use
 fprintf() and specify the stdout stream as follows:
 
@@ -1276,6 +1326,7 @@ These index manual pages are autogenerated during the build process of GRASS GIS
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1317,6 +1368,8 @@ These index manual pages are autogenerated during the build process of GRASS GIS
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 ## Source Code Formatting
 
 C and C++ code is formatted with [ClangFormat](https://clang.llvm.org/docs/ClangFormat.html).
@@ -1367,6 +1420,7 @@ GRASS_CLANG_FORMAT="clang-format-15" ./utils/grass_clang_format.sh
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -1436,6 +1490,10 @@ GRASS_CLANG_FORMAT="clang-format-15" ./utils/grass_clang_format.sh
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 ## Indentation
 
 To promote a consistent coding style for whitespace (spaces, tabs, newlines),
@@ -1479,6 +1537,7 @@ or `man indent` for explanation of individual switches.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -1570,6 +1629,11 @@ or `man indent` for explanation of individual switches.
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 
 ## Compilation
 
diff --git a/doc/git/investigating_history.md b/doc/git/investigating_history.md
index 06441cefd09..ed0bc74d4d0 100644
--- a/doc/git/investigating_history.md
+++ b/doc/git/investigating_history.md
@@ -43,6 +43,7 @@ ignored with `git blame`, please open an issue.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -135,6 +136,11 @@ ignored with `git blame`, please open an issue.
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 ## On GitHub
 
@@ -158,6 +164,7 @@ which is the icon between commit info and line numbers.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 392c6e8e0b (pygrass: Add update parameters method to Module (#1712))
@@ -249,3 +256,8 @@ which is the icon between commit info and line numbers.
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 392c6e8e0b (pygrass: Add update parameters method to Module (#1712))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/doc/grass_database.html b/doc/grass_database.html
index 51735682db4..adb9878213e 100644
--- a/doc/grass_database.html
+++ b/doc/grass_database.html
@@ -70,6 +70,7 @@ 
    GRASS GIS Database
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -111,6 +112,8 @@ 
    GRASS GIS Database
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
    GRASS Projects
    
 
 A project is further organized into mapsets which are subdirectories of
@@ -133,6 +136,7 @@ 
    GRASS Projects
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -202,6 +206,10 @@ 
    GRASS Projects
    
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
    GRASS Locations
    
 
 Location is a directory which contains GRASS Mapsets which are its subdirectories.
@@ -351,6 +359,7 @@ 
    Importing, exporting and linking data
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -392,6 +401,8 @@ 
    Importing, exporting and linking data
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
    Starting GRASS GIS
    
 
 After launching GRASS GIS for the first time,
@@ -412,6 +423,7 @@ 
    Starting GRASS GIS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -481,6 +493,10 @@ 
    Starting GRASS GIS
    
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
    Starting GRASS GIS using GUI
    
 
 After launching GRASS GIS, the startup window will open (Fig. 2).
@@ -549,6 +565,7 @@ 
    Starting GRASS GIS using command line
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -590,6 +607,8 @@ 
    Starting GRASS GIS using command line
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 grass -c EPSG:5514:3 ~/grassdata/myproject
 
 # Windows
@@ -609,6 +628,7 @@ 
    Starting GRASS GIS using command line
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
@@ -678,6 +698,10 @@ 
    Starting GRASS GIS using command line
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
 grass -c EPSG:5514:3 ~/grassdata/mylocation
 
 # Windows
@@ -699,6 +723,7 @@ 
    Starting GRASS GIS using command line
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    See grass command manual for more details. @@ -786,6 +811,11 @@

    Starting GRASS GIS using command line

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main See grass command manual for more details. @@ -806,6 +836,7 @@

    Starting GRASS GIS using command line

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -840,6 +871,8 @@

    Starting GRASS GIS using command line

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    Creating a New Project with the Project Wizard

    >>>>>>> osgeo-main @@ -861,6 +894,7 @@

    Creating a New Project with the Project Wizard

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -923,6 +957,10 @@

    Creating a New Project with the Project Wizard

    ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main

    Creating a New Location with the Location Wizard

    The wxGUI graphical user interface provides a @@ -987,6 +1025,7 @@

    See also

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1044,6 +1083,8 @@

    See also

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS GIS Reference Manual
    GRASS GIS startup program manual page @@ -1066,6 +1107,7 @@

    See also

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1105,6 +1147,8 @@

    See also

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS GIS 8 Reference Manual
    GRASS GIS 8 startup program manual page @@ -1123,6 +1167,7 @@

    See also

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -1152,6 +1197,8 @@

    See also

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= GRASS GIS 8 Reference Manual
    GRASS GIS 8 startup program manual page @@ -1170,6 +1217,7 @@

    See also

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1199,6 +1247,8 @@

    See also

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= GRASS GIS Reference Manual
    GRASS GIS startup program manual page @@ -1217,6 +1267,7 @@

    See also

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1246,6 +1297,8 @@

    See also

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= GRASS GIS Reference Manual
    GRASS GIS startup program manual page @@ -1264,6 +1317,7 @@

    See also

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1318,6 +1372,8 @@

    See also

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
    Importing data on GRASS Wiki
    diff --git a/doc/gui/wxpython/example/frame.py b/doc/gui/wxpython/example/frame.py index 8181858bc6a..b5752c8777c 100644 --- a/doc/gui/wxpython/example/frame.py +++ b/doc/gui/wxpython/example/frame.py @@ -373,6 +373,7 @@ def __init__(self, parent, giface, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -410,6 +411,8 @@ def __init__(self, parent, giface, **kwargs): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -429,6 +432,7 @@ def __init__(self, parent, giface, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -479,6 +483,8 @@ def __init__(self, parent, giface, **kwargs): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # init map panel ExampleMapPanel.__init__( diff --git a/doc/gui/wxpython/example/toolbars.py b/doc/gui/wxpython/example/toolbars.py index 79952e4061c..18847cf3d9a 100644 --- a/doc/gui/wxpython/example/toolbars.py +++ b/doc/gui/wxpython/example/toolbars.py @@ -129,6 +129,7 @@ def _toolbarData(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -169,6 +170,8 @@ def _toolbarData(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ( ("addRaster", BaseIcons["addRast"].label), @@ -191,6 +194,7 @@ def _toolbarData(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -259,6 +263,10 @@ def _toolbarData(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ("addRaster", BaseIcons["addRast"].label), BaseIcons["addRast"], @@ -281,6 +289,7 @@ def _toolbarData(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -371,6 +380,11 @@ def _toolbarData(self): >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ) @@ -408,6 +422,7 @@ def _toolbarData(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -448,6 +463,8 @@ def _toolbarData(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ( ("help", icons["help"].label), @@ -475,6 +492,7 @@ def _toolbarData(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -543,6 +561,10 @@ def _toolbarData(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ("help", icons["help"].label), icons["help"], @@ -570,6 +592,7 @@ def _toolbarData(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -660,5 +683,10 @@ def _toolbarData(self): >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ) diff --git a/doc/howto_release.md b/doc/howto_release.md index d3150fc3d70..c9624f97b63 100644 --- a/doc/howto_release.md +++ b/doc/howto_release.md @@ -23,6 +23,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD - Your own fork is the remote called "origin". - The OSGeo repo is the remote called "upstream". - You don't have any local un-pushed or un-committed changes. @@ -72,6 +73,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - The OSGeo repo is the remote called "upstream". - Your own fork is the remote called "origin" or "fork". - You don't have any local un-pushed or un-committed changes. @@ -96,6 +99,7 @@ _Note: Some later steps in this text are to be done by the development coordinat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -124,6 +128,8 @@ _Note: Some later steps in this text are to be done by the development coordinat >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main *Note: Some later steps in this text are to be done by the development coordinator (currently Markus Neteler and Martin Landa) due to needed logins.* @@ -135,6 +141,7 @@ _Note: Some later steps in this text are to be done by the development coordinat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -192,6 +199,9 @@ _Note: Some later steps in this text are to be done by the development coordinat >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= + >>>>>>> osgeo-main ======= - Your own fork is the remote called "origin". @@ -217,6 +227,7 @@ _Note: Some later steps in this text are to be done by the development coordinat <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -253,6 +264,8 @@ _Note: Some later steps in this text are to be done by the development coordinat >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## Prepare the local repo Update your remotes and switch to branch: @@ -275,6 +288,7 @@ Update your remotes and switch to branch: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD git fetch --all --prune && git checkout releasebranch_8_2 ======= <<<<<<< HEAD @@ -317,6 +331,8 @@ git fetch --all --prune && git checkout releasebranch_8_2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main git fetch --prune upstream && git checkout releasebranch_8_4 ======= git fetch --all --prune && git checkout releasebranch_8_2 @@ -335,6 +351,7 @@ git fetch --all --prune && git checkout releasebranch_8_2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= git fetch --all --prune && git checkout releasebranch_8_2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -418,6 +435,11 @@ git fetch --all --prune && git checkout releasebranch_8_2 git fetch --all --prune && git checkout releasebranch_8_2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +git fetch --all --prune && git checkout releasebranch_8_2 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ``` Confirm that you are on the right branch and have no local changes @@ -447,6 +469,7 @@ git diff --staged <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD git log upstream/releasebranch_8_2..HEAD # Should give the same as last commits visible on GitHub: git log --max-count=5 @@ -559,6 +582,8 @@ eval $(./utils/update_version.py status --bash) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main git log upstream/releasebranch_8_4..HEAD # There should be no commits which are not visible on GitHub: git log --max-count=5 @@ -693,6 +718,7 @@ Modify the VERSION file use the dedicated script, for RC1, e.g.: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -721,6 +747,8 @@ Modify the VERSION file use the dedicated script, for RC1, e.g.: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main The script will compute the correct version string and print a message containing it into the terminal (e.g., "version: GRASS GIS 8.2.0RC1"). ======= The script will compute the correct version string and print a message @@ -738,6 +766,7 @@ containing it into the terminal (e.g., "version: GRASS GIS 8.2.0RC1"). <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -778,6 +807,8 @@ The script will compute the correct version string and print a message containin >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Commit with a commit message suggested by the script, e.g.: @@ -801,6 +832,7 @@ git commit include/VERSION -m "version: GRASS GIS 8.2.0RC1" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -829,6 +861,8 @@ git commit include/VERSION -m "version: GRASS GIS 8.2.0RC1" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Check that there is exactly one commit on your local branch and that it is the version change: ======= Check that there is exactly one commit on your local branch and that it is the @@ -846,6 +880,7 @@ version change: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -886,6 +921,8 @@ Check that there is exactly one commit on your local branch and that it is the v >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ```bash git status @@ -922,6 +959,7 @@ eval $(./utils/update_version.py status --bash) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -951,6 +989,8 @@ eval $(./utils/update_version.py status --bash) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= git log upstream/releasebranch_8_2..HEAD # Should give the same as last commits visible on GitHub: git log --max-count=5 @@ -1003,6 +1043,7 @@ Modify the VERSION file use the dedicated script, for RC1, e.g.: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD The script will compute the correct version string and print a message containing it into the terminal (e.g., "version: GRASS GIS 8.2.0RC1"). ======= @@ -1068,6 +1109,10 @@ containing it into the terminal (e.g., "version: GRASS GIS 8.2.0RC1"). The script will compute the correct version string and print a message containing it into the terminal (e.g., "version: GRASS GIS 8.2.0RC1"). >>>>>>> osgeo-main +======= +The script will compute the correct version string and print a message +containing it into the terminal (e.g., "version: GRASS GIS 8.2.0RC1"). +>>>>>>> osgeo-main Commit with a commit message suggested by the script, e.g.: @@ -1090,6 +1135,7 @@ git commit include/VERSION -m "version: GRASS GIS 8.2.0RC1" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Check that there is exactly one commit on your local branch and that it is the version change: ======= @@ -1155,6 +1201,10 @@ version change: Check that there is exactly one commit on your local branch and that it is the version change: >>>>>>> osgeo-main +======= +Check that there is exactly one commit on your local branch and that it is the +version change: +>>>>>>> osgeo-main ```bash git status @@ -1191,6 +1241,7 @@ eval $(./utils/update_version.py status --bash) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1233,6 +1284,8 @@ eval $(./utils/update_version.py status --bash) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Version and tag are the same for all releases: ```bash @@ -1271,6 +1324,7 @@ Check on [GitHub Actions](https://github.com/OSGeo/grass/actions) or use GitHub <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD gh run list --branch releasebranch_8_2 ======= <<<<<<< HEAD @@ -1313,6 +1367,8 @@ gh run list --branch releasebranch_8_2 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main gh run list --branch releasebranch_8_4 ======= gh run list --branch releasebranch_8_2 @@ -1331,6 +1387,7 @@ gh run list --branch releasebranch_8_2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= gh run list --branch releasebranch_8_2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1414,6 +1471,11 @@ gh run list --branch releasebranch_8_2 gh run list --branch releasebranch_8_2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +gh run list --branch releasebranch_8_2 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ``` Some time was needed to run the checks, so before getting back to creating the tag, @@ -1442,6 +1504,7 @@ Create an annotated tag (a lightweight tag is okay too, but there is more metada <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1483,6 +1546,8 @@ Create an annotated tag (a lightweight tag is okay too, but there is more metada >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main stored for annotated tags including a date; message is suggested by the `./utils/update_version.py` script): @@ -1506,6 +1571,7 @@ git tag $TAG -a -m "..." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1575,6 +1641,10 @@ git tag $TAG -a -m "..." ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main stored for annotated tags including a date; message is suggested by the version script): ```bash @@ -1596,6 +1666,7 @@ git tag $TAG -a -m "GRASS GIS 8.2.0RC1" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1646,6 +1717,8 @@ git tag $TAG -a -m "GRASS GIS 8.2.0RC1" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) @@ -1661,6 +1734,7 @@ git tag $TAG -a -m "GRASS GIS 8.2.0RC1" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= ======= @@ -1702,6 +1776,8 @@ git tag $TAG -a -m "GRASS GIS 8.2.0RC1" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ``` List all tags (annotated will be at the top of both lists): @@ -1728,6 +1804,7 @@ git tag -n --sort=-taggerdate <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Now push the tag upstream - this will trigger the automated workflows linked to tags: ======= <<<<<<< HEAD @@ -1770,6 +1847,8 @@ Now push the tag upstream - this will trigger the automated workflows linked to >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Now push the tag upstream - this will trigger the [automated workflows](https://github.com/OSGeo/grass/actions) linked to tags: ======= @@ -1789,6 +1868,7 @@ Now push the tag upstream - this will trigger the automated workflows linked to <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Now push the tag upstream - this will trigger the automated workflows linked to tags: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1872,6 +1952,11 @@ Now push the tag upstream - this will trigger the automated workflows linked to Now push the tag upstream - this will trigger the automated workflows linked to tags: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +Now push the tag upstream - this will trigger the automated workflows linked to tags: +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ```bash git push upstream $TAG @@ -1901,6 +1986,7 @@ run from the top directory and will expect its configuration files <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1935,6 +2021,8 @@ run from the top directory and will expect its configuration files >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main to be in the *utils* directory. ======= <<<<<<< HEAD @@ -1952,6 +2040,7 @@ to be in the _utils_ directory. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2031,6 +2120,11 @@ to be in the *utils* directory. >>>>>>> osgeo-main ======= +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= + <<<<<<< HEAD <<<<<<< HEAD >>>>>>> osgeo-main @@ -2047,6 +2141,7 @@ to be in the *utils* directory. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= ======= @@ -2082,6 +2177,8 @@ to be in the *utils* directory. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #### Major and minor releases >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) @@ -2121,6 +2218,7 @@ python ./utils/generate_release_notes.py log releasebranch_8_4 8.4.0 $VERSION <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -2144,6 +2242,8 @@ python ./utils/generate_release_notes.py log releasebranch_8_4 8.4.0 $VERSION ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) For major and minor releases, GitHub API gives good results for the first release candidate because it contains contributor handles and can identify @@ -2162,6 +2262,7 @@ release candidate because it contains contributor handles and can identify <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -2190,6 +2291,8 @@ release candidate because it contains contributor handles and can identify >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main new contributors, so use with the *api* backend, e.g.: ======= new contributors, so use with the _api_ backend, e.g.: @@ -2208,6 +2311,7 @@ new contributors, so use with the _api_ backend, e.g.: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2244,6 +2348,8 @@ new contributors, so use with the _api_ backend, e.g.: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main to be in the *utils* directory. For major and minor releases, GitHub API gives good results for the first @@ -2264,6 +2370,7 @@ new contributors, so use with the *api* backend, e.g.: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2369,6 +2476,10 @@ new contributors, so use with the *api* backend, e.g.: >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main ```bash python ./generate_release_notes.py api releasebranch_8_2 8.0.0 $VERSION @@ -2395,6 +2506,7 @@ while the backports are usually direct commits without PRs. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main The *git log* command operates on commits, so use use the *log* backend: @@ -2473,6 +2585,11 @@ The *git log* command operates on commits, so use use the *log* backend: ======= <<<<<<< HEAD >>>>>>> osgeo-main +======= +The *git log* command operates on commits, so use use the *log* backend: +======= +<<<<<<< HEAD +>>>>>>> osgeo-main The _git log_ command operates on commits, so use use the _log_ backend: ======= The *git log* command operates on commits, so use use the *log* backend: @@ -2492,6 +2609,7 @@ The *git log* command operates on commits, so use use the *log* backend: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2546,6 +2664,8 @@ The *git log* command operates on commits, so use use the *log* backend: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ```bash python ./generate_release_notes.py log releasebranch_8_2 8.2.0 $VERSION @@ -2575,6 +2695,7 @@ python ./generate_release_notes.py log releasebranch_8_2 8.2.0 $VERSION <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main In between RCs and between last RC and final release, the *log* backend is useful @@ -2899,6 +3020,24 @@ In between RCs and between last RC and final release, the *log* backend is usefu >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) for showing updates since the last RC: +```bash +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +In between RCs and between last RC and final release, the _log_ backend is useful +======= +In between RCs and between last RC and final release, the *log* backend is useful +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +======= +In between RCs and between last RC and final release, the _log_ backend is useful +======= +In between RCs and between last RC and final release, the *log* backend is useful +>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +for showing updates since the last RC: + ```bash >>>>>>> osgeo-main <<<<<<< HEAD @@ -2923,6 +3062,7 @@ python ./generate_release_notes.py log releasebranch_8_2 8.2.0RC1 $VERSION <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2946,6 +3086,8 @@ python ./generate_release_notes.py log releasebranch_8_2 8.2.0RC1 $VERSION >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2967,6 +3109,7 @@ For the final release, the changes accumulated since the first RC need to be <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD added manually to the result from the _api_ backend. >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3142,6 +3285,14 @@ The script sorts them into categories defined in _utils/release.yml_. ======= added manually to the result from the *api* backend. +<<<<<<< HEAD +The script sorts them into categories defined in _utils/release.yml_. +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +added manually to the result from the *api* backend. + <<<<<<< HEAD The script sorts them into categories defined in _utils/release.yml_. <<<<<<< HEAD @@ -3173,6 +3324,7 @@ GitHub and further modify as needed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3235,6 +3387,10 @@ GitHub and further modify as needed. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main However, these notes need to be manually edited to collapse related items into one. Additionally, a _Highlights_ section needs to be added with manually identified new major features for major and minor releases. For all releases, a _Major_ section @@ -3264,6 +3420,7 @@ web interface. You can copy-paste the created release notes to GitHub and furthe <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3294,6 +3451,8 @@ web interface. You can copy-paste the created release notes to GitHub and furthe >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3312,6 +3471,7 @@ web interface. You can copy-paste the created release notes to GitHub and furthe <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -3341,6 +3501,8 @@ web interface. You can copy-paste the created release notes to GitHub and furthe ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= added manually to the result from the *api* backend. @@ -3359,6 +3521,7 @@ added manually to the result from the *api* backend. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3401,6 +3564,8 @@ added manually to the result from the *api* backend. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main The script sorts them into categories defined in *utils/release.yml*. However, these notes need to be manually edited to collapse related items into one. Additionally, a *Highlights* section needs to be added with manually @@ -3430,6 +3595,7 @@ GitHub and further modify as needed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3464,6 +3630,8 @@ GitHub and further modify as needed. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -3482,6 +3650,7 @@ GitHub and further modify as needed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3551,6 +3720,8 @@ GitHub and further modify as needed. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Older release description may or may not be a good inspiration: . @@ -3580,6 +3751,7 @@ Save the modified draft, but do not publish the release yet. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3621,6 +3793,8 @@ Save the modified draft, but do not publish the release yet. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## Update include/VERSION file Use the dedicated `update_version.py` script to edit the VERSION file. @@ -3641,6 +3815,7 @@ After a RC, update to development version: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3710,6 +3885,10 @@ After a RC, update to development version: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## Reset include/VERSION file to git development version Use a dedicated script to edit the VERSION file. @@ -3732,6 +3911,7 @@ After an RC, switch to development version: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3823,6 +4003,11 @@ After an RC, switch to development version: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ```bash ./utils/update_version.py dev @@ -3852,6 +4037,7 @@ After an RC, switch to development version: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main After a final release, switch to development version for the next micro, minor, @@ -3912,6 +4098,8 @@ or major version, e.g., for micro version, use: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main After a final release, update to the next micro (x.y.Z), minor (x.Y.z), or major (X.y.y) version. E.g., for micro version, use: ======= @@ -3932,6 +4120,7 @@ version, e.g., for micro version, use: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3961,6 +4150,8 @@ version, e.g., for micro version, use: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= After a final release, switch to development version for the next micro, minor, or major version, e.g., for micro version, use: >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3978,6 +4169,7 @@ version, e.g., for micro version, use: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6b0657b022 (Fix missing function prototypes (#2727)) ======= @@ -4007,6 +4199,8 @@ version, e.g., for micro version, use: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= After a final release, switch to development version for the next micro, minor, or major version, e.g., for micro version, use: >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -4024,6 +4218,7 @@ or major version, e.g., for micro version, use: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -4053,6 +4248,8 @@ or major version, e.g., for micro version, use: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= After a final release, switch to development version for the next micro, minor, or major version, e.g., for micro version, use: ======= @@ -4074,6 +4271,7 @@ or major version, e.g., for micro version, use: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4128,6 +4326,8 @@ or major version, e.g., for micro version, use: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ```bash ./utils/update_version.py micro @@ -4148,6 +4348,7 @@ or major version, e.g., for micro version, use: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Use *major* and *minor* operations for the other version updates. <<<<<<< HEAD <<<<<<< HEAD @@ -4192,6 +4393,9 @@ Use *major* and *minor* operations for the other version updates. Use *major* and *minor* operations for the other version updates. >>>>>>> osgeo-main ======= +Use *major* and *minor* operations for the other version updates. +>>>>>>> osgeo-main +======= <<<<<<< HEAD Use _major_ and _minor_ operations for the other version updates. ======= @@ -4209,6 +4413,7 @@ Use *major* and *minor* operations for the other version updates. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4245,6 +4450,8 @@ Use *major* and *minor* operations for the other version updates. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Use `--help` for details about the options. <<<<<<< HEAD @@ -4261,6 +4468,7 @@ Use `--help` for details about the options. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD Use *major* and *minor* operations for the other version updates. @@ -4331,6 +4539,8 @@ Use `--help` for details about the options. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Eventually, commit with the suggested commit message and push, e.g.: ```bash @@ -4378,6 +4588,7 @@ development coordinators. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -4447,6 +4658,10 @@ development coordinators. ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Commit with the suggested commit message and push, e.g.: ```bash @@ -4474,6 +4689,7 @@ git push upstream <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD This part requires extra permissions and needs to be done by one of the development coordinators. ======= @@ -4510,6 +4726,8 @@ development coordinators. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main This part requires extra permissions and needs to be done by one of the development coordinators. <<<<<<< HEAD <<<<<<< HEAD @@ -4534,6 +4752,7 @@ development coordinators. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -4563,6 +4782,8 @@ development coordinators. ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= This part requires extra permissions and needs to be done by one of the development coordinators. @@ -4582,6 +4803,7 @@ development coordinators. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4654,6 +4876,8 @@ This part requires extra permissions and needs to be done by one of the developm >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ### Get the tagged version @@ -4681,6 +4905,7 @@ git fetch upstream <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4722,6 +4947,8 @@ git fetch upstream >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Get the tagged source code, e.g. (modify the tag as needed): ```bash @@ -4741,6 +4968,7 @@ git checkout 8.4.0RC1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -4810,6 +5038,10 @@ git checkout 8.4.0RC1 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Get the tagged source code, e.g.: ```bash @@ -4831,6 +5063,7 @@ git checkout 8.2.0RC1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -4922,6 +5155,11 @@ git checkout 8.2.0RC1 ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ``` Create the Bash variables for version numbers: @@ -4967,6 +5205,7 @@ linked to the tag: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5056,6 +5295,11 @@ wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ -O ChangeLog_${VERSION}.gz ======= >>>>>>> osgeo-main +======= +wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ + -O ChangeLog_${VERSION}.gz +======= +>>>>>>> osgeo-main wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz -O ChangeLog_${VERSION}.gz >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5079,6 +5323,7 @@ wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -5108,6 +5353,8 @@ wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz -O ChangeLog_${VERSION}.gz ======= wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ @@ -5128,6 +5375,7 @@ wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5215,6 +5463,8 @@ wget https://github.com/OSGeo/grass/releases/download/${VERSION}/ChangeLog.gz -O >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ``` ### Get the source code tarball @@ -5245,6 +5495,7 @@ Note: servers 'osgeo8-grass' and 'osgeo7-download' only reachable via <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD jumphost (managed by OSGeo-SAC) - see ======= @@ -5288,6 +5539,8 @@ Note: servers 'osgeo8-grass' and 'osgeo7-download' only reachable via >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main jumphost (managed by OSGeo-SAC) - see ======= jumphost (managed by OSGeo-SAC) - see @@ -5306,6 +5559,7 @@ jumphost (managed by OSGeo-SAC) - see >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5389,6 +5643,11 @@ jumphost (managed by OSGeo-SAC) - see >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + jumphost (managed by OSGeo-SAC) - see +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ```bash # Store the source tarball (twice) in (use scp -p FILES grass:): @@ -5428,6 +5687,7 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5489,6 +5749,8 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main INSTALL.md REQUIREMENTS.md CONTRIBUTING.md $USER@$SERVER1:$SERVER1DIR @@ -5506,6 +5768,7 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) INSTALL.md REQUIREMENTS.html CONTRIBUTING.md $USER@$SERVER1:$SERVER1DIR @@ -5650,6 +5913,15 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) INSTALL.md REQUIREMENTS.html CONTRIBUTING.md $USER@$SERVER1:$SERVER1DIR +scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ + INSTALL.md REQUIREMENTS.html CONTRIBUTING.md $USER@$SERVER2:$SERVER2DIR +<<<<<<< HEAD +>>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) + INSTALL.md REQUIREMENTS.html CONTRIBUTING.md $USER@$SERVER1:$SERVER1DIR + scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ INSTALL.md REQUIREMENTS.html CONTRIBUTING.md $USER@$SERVER2:$SERVER2DIR <<<<<<< HEAD @@ -5669,6 +5941,7 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dd6a87c0fa (r.horizon manual - fix typo (#2794)) scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ @@ -5784,6 +6057,10 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ >>>>>>> osgeo-main ======= +======= +>>>>>>> osgeo-main +======= + ======= >>>>>>> osgeo-main INSTALL.md REQUIREMENTS.html CONTRIBUTING.md $USER@$SERVER1:$SERVER1DIR @@ -5803,6 +6080,7 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -5834,6 +6112,8 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Only at full release (i.e., not for RCs)! # generate link to "latest" source code ssh $USER@$SERVER1 "cd $SERVER1DIR ; rm -f grass-$MAJOR.$MINOR-latest.tar.gz" @@ -5862,6 +6142,7 @@ echo "https://grass.osgeo.org/grass$MAJOR$MINOR/source/" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ## Update winGRASS related files Update the winGRASS version at : @@ -5908,6 +6189,8 @@ Update the winGRASS version at >>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ### Update redirects For final minor and major releases (not release candidates and micro releases), @@ -5966,6 +6249,7 @@ Update the winGRASS version at >>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5995,6 +6279,8 @@ Update the winGRASS version at >>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ## Update winGRASS related files Update the winGRASS version at : @@ -6015,6 +6301,7 @@ Update the winGRASS version at >>>>>> main @@ -6057,6 +6344,8 @@ Update the winGRASS version at >>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main vim wingrass-maintenance-scripts/grass_packager_release.bat vim wingrass-maintenance-scripts/grass_addons.sh vim wingrass-maintenance-scripts/grass_copy_wwwroot.sh @@ -6084,6 +6373,7 @@ Add the new version to repos which build or test addons: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6118,6 +6408,8 @@ Add the new version to repos which build or test addons: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - (currently, for new branches only) - (add new release related line for new branches and final releases) <<<<<<< HEAD @@ -6140,6 +6432,7 @@ Add the new version to repos which build or test addons: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD @@ -6209,6 +6502,10 @@ Add the new version to repos which build or test addons: >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= >>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> osgeo-main - (currently, for new branches only) - @@ -6230,6 +6527,7 @@ Add the new version to repos which build or test addons: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6264,6 +6562,8 @@ Add the new version to repos which build or test addons: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -6282,6 +6582,7 @@ Add the new version to repos which build or test addons: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6360,6 +6661,8 @@ Add the new version to repos which build or test addons: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## Close milestone @@ -6383,6 +6686,7 @@ If there are any open issues or PRs, move them to another milestone <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD in the milestone view (all can be moved at once). ======= <<<<<<< HEAD @@ -6425,6 +6729,8 @@ in the milestone view (all can be moved at once). >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main in the milestone view (all can be moved at once by selecting the open issues and PRs and reassigning the next milestone). ======= @@ -6444,6 +6750,7 @@ in the milestone view (all can be moved at once). <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= in the milestone view (all can be moved at once). >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6527,6 +6834,11 @@ in the milestone view (all can be moved at once). in the milestone view (all can be moved at once). >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +in the milestone view (all can be moved at once). +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## Publish the release @@ -6554,6 +6866,7 @@ Release is done. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD For final releases only, go to Zenodo a get a Markdown badge for the release which Zenodo creates with a DOI for the published released. ======= @@ -6597,6 +6910,8 @@ which Zenodo creates with a DOI for the published released. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main For final releases only, go to [Zenodo](https://doi.org/10.5281/zenodo.5176030) and get a Markdown badge for the release which Zenodo creates with a DOI for the published release. @@ -6665,6 +6980,7 @@ which Zenodo creates with a DOI for the published released. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -6688,6 +7004,8 @@ which Zenodo creates with a DOI for the published released. ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= For final releases only, go to Zenodo a get a Markdown badge for the release which Zenodo creates with a DOI for the published released. @@ -6706,6 +7024,7 @@ which Zenodo creates with a DOI for the published released. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -6813,6 +7132,11 @@ For all releases, click the Binder badge to get Binder to build. Use it to test it and to cache the built image. Add more links to (or badges for) more notebooks if there are any which show well specific features added or updated in the release. >>>>>>> osgeo-main +======= +For all releases, click the Binder badge to get Binder to build. Use it to test +it and to cache the built image. Add more links to (or badges for) more notebooks +if there are any which show well specific features added or updated in the release. +>>>>>>> osgeo-main ## Create entries for the new release @@ -6838,6 +7162,7 @@ For a (final) release (not release candidate), write announcement and publish it <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -6860,6 +7185,8 @@ For a (final) release (not release candidate), write announcement and publish it >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - News section, @@ -6874,6 +7201,7 @@ Software pages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= @@ -6917,6 +7245,8 @@ Software pages: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - Linux: - Windows: @@ -6965,6 +7295,7 @@ Software pages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7171,6 +7502,8 @@ Software pages: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ======= @@ -7201,6 +7534,7 @@ Software pages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7232,6 +7566,8 @@ Software pages: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Write announcement and publish it: - News section: @@ -7259,6 +7595,7 @@ Write announcement and publish it: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7296,6 +7633,8 @@ Write announcement and publish it: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ### Only in case of new major release >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7321,6 +7660,7 @@ Write announcement and publish it: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -7350,6 +7690,8 @@ Write announcement and publish it: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD - update cronjob '[cron_grass8_main_src_snapshot.sh](https://github.com/OSGeo/grass-addons/tree/grass8/utils/cronjobs_osgeo_lxd/)' on grass.osgeo.org to next but one release tag for the differences @@ -7372,6 +7714,7 @@ Write announcement and publish it: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7426,6 +7769,8 @@ Write announcement and publish it: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - wiki updates, only when new major release: - {{cmd|xxxx}} macro: - update last version on main page @@ -7450,6 +7795,7 @@ Write announcement and publish it: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### WinGRASS notes ======= @@ -7495,6 +7841,8 @@ Write announcement and publish it: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ### WinGRASS notes >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7509,6 +7857,7 @@ Write announcement and publish it: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7543,6 +7892,8 @@ Write announcement and publish it: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ### WinGRASS notes >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -7591,6 +7942,7 @@ For new branches and final releases (see additional instructions in the repo): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD set MINOR=2 ======= @@ -7633,6 +7985,8 @@ For new branches and final releases (see additional instructions in the repo): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main set MINOR=4 ======= @@ -7652,6 +8006,7 @@ For new branches and final releases (see additional instructions in the repo): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= set MINOR=2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7734,6 +8089,11 @@ For new branches and final releases (see additional instructions in the repo): ======= set MINOR=2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + set MINOR=2 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main set PATCH=0RC1 ``` @@ -7757,6 +8117,7 @@ For new branches and final releases (see additional instructions in the repo): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD compile $GIT_PATH/grass8 $GISBASE_PATH/grass820RC1 $ADDON_PATH/grass820RC1/addons ======= @@ -7799,6 +8160,8 @@ For new branches and final releases (see additional instructions in the repo): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main compile $GIT_PATH/grass8 $GISBASE_PATH/grass840RC1 $ADDON_PATH/grass840RC1/addons ======= @@ -7818,6 +8181,7 @@ For new branches and final releases (see additional instructions in the repo): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= compile $GIT_PATH/grass8 $GISBASE_PATH/grass820RC1 $ADDON_PATH/grass820RC1/addons >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7901,6 +8265,11 @@ For new branches and final releases (see additional instructions in the repo): compile $GIT_PATH/grass8 $GISBASE_PATH/grass820RC1 $ADDON_PATH/grass820RC1/addons >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + compile $GIT_PATH/grass8 $GISBASE_PATH/grass820RC1 $ADDON_PATH/grass820RC1/addons +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ``` - Modify grass_copy_wwwroot.sh accordingly, eg. @@ -7922,6 +8291,7 @@ For new branches and final releases (see additional instructions in the repo): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD copy_addon 820RC1 8.2.0RC1 ``` @@ -7966,6 +8336,8 @@ For new branches and final releases (see additional instructions in the repo): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main copy_addon 840RC1 8.4.0RC1 ``` @@ -8004,6 +8376,7 @@ Add release to history page: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8032,6 +8405,8 @@ Add release to history page: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= copy_addon 820RC1 8.2.0RC1 ``` @@ -8051,6 +8426,7 @@ Add release to history page: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8093,6 +8469,8 @@ Add release to history page: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ### Ubuntu Launchpad notes - Create milestone and release: @@ -8115,6 +8493,7 @@ Add release to history page: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8206,6 +8585,11 @@ Add release to history page: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ### Other notes - @@ -8230,6 +8614,7 @@ Add release to history page: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD - If release candidate: - @@ -8289,6 +8674,8 @@ Via Web / Social media: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - If release candidate (just a short invitation to test it): - @@ -8342,6 +8729,7 @@ Via Web / Social media: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8371,6 +8759,8 @@ Via Web / Social media: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= - If release candidate: - @@ -8404,6 +8794,7 @@ Via Web / Social media: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8446,6 +8837,8 @@ Via Web / Social media: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## Update VERSION file to next version number @@ -8480,6 +8873,7 @@ git commit include/VERSION -m "version: GRASS GIS 8.2.1" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8571,3 +8965,8 @@ git commit include/VERSION -m "version: GRASS GIS 8.2.1" ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main diff --git a/doc/infrastructure.md b/doc/infrastructure.md index 0536d2b5e51..29c16077370 100644 --- a/doc/infrastructure.md +++ b/doc/infrastructure.md @@ -21,6 +21,7 @@ Last changed: July 2020 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -49,6 +50,8 @@ Last changed: July 2020 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Related Wiki documents: @@ -66,6 +69,7 @@ Related Wiki documents: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -119,6 +123,10 @@ Related Wiki documents: ======= >>>>>>> osgeo-main ======= +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -130,6 +138,7 @@ Related Wiki documents: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -228,6 +237,11 @@ Related Wiki documents: ======= >>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> osgeo-main +======= +>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794)) + ======= >>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -257,6 +271,7 @@ The GitHub repositories are: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * GRASS GIS core (7.x): * GRASS GIS legacy (3.x-6.x): * GRASS GIS Add-ons: @@ -312,6 +327,8 @@ Issues: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - GRASS GIS core (7+): - GRASS GIS legacy (3.x-6.x): - GRASS GIS Add-ons: @@ -351,6 +368,7 @@ Statistics: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -379,6 +397,8 @@ Statistics: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Git usage: @@ -445,6 +465,7 @@ Statistics: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -458,10 +479,13 @@ Issues: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= @@ -774,6 +798,10 @@ Statistics: >>>>>>> osgeo-main ======= +======= +>>>>>>> osgeo-main +======= + ======= >>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -798,6 +826,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * * osgeo8-grass: LXD container on osgeo8 () * OS: Debian Buster @@ -881,6 +910,8 @@ Maintainer: M. Neteler >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - - osgeo8-grass: LXD container on osgeo8 () @@ -912,6 +943,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -940,6 +972,8 @@ Maintainer: M. Neteler >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - Backups: ======= ======= @@ -956,6 +990,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -999,6 +1034,8 @@ Maintainer: M. Neteler >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * GRASS programmer's manual (https://grass.osgeo.org/programming8/) * HTML: cronjob run Wednesday morning California time * HTML: cronjob run Saturday morning California time @@ -1081,6 +1118,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6b0657b022 (Fix missing function prototypes (#2727)) ======= @@ -1135,6 +1173,10 @@ Maintainer: M. Neteler * Shared virtual OSGeo machine (osgeo6) hosted at Oregon State University Open Source Lab server: osgeo6.osgeo.osuosl.org) >>>>>>> osgeo-main +======= + * Shared virtual OSGeo machine (osgeo6) hosted at Oregon State University + Open Source Lab server: osgeo6.osgeo.osuosl.org) +>>>>>>> osgeo-main ======= * Shared virtual OSGeo machine (osgeo6) hosted at Oregon State University Open Source Lab server: osgeo6.osgeo.osuosl.org) @@ -1178,6 +1220,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1201,6 +1244,8 @@ Maintainer: M. Neteler ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= * * osgeo8-grass: LXD container on osgeo8 () * OS: Debian Buster @@ -1224,6 +1269,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1251,6 +1297,8 @@ Maintainer: M. Neteler ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * Shared virtual OSGeo machine (osgeo6) hosted at Oregon State University Open Source Lab server: osgeo6.osgeo.osuosl.org) @@ -1270,6 +1318,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1316,6 +1365,8 @@ Maintainer: M. Neteler ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * Login: via OSGeo LDAP, there is a "grass" LDAP group * Software: @@ -1359,6 +1410,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1428,6 +1480,11 @@ Maintainer: M. Neteler >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) * i18N translation statistics () <<<<<<< HEAD +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +* i18N translation statistics () +<<<<<<< HEAD >>>>>>> osgeo-main * generated during compilation of Linux binary snapshot, stats of `(cd locale; make)` are extracted into text file @@ -1453,6 +1510,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1521,6 +1579,8 @@ Maintainer: M. Neteler ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * text file parsed by PHP page and shown as table * GRASS GIS version is coded in devel/i18n_stats.inc @@ -1555,6 +1615,7 @@ Maintainer: M. Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1639,6 +1700,8 @@ Maintainer: M. Neteler ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) @@ -1647,6 +1710,9 @@ Maintainer: M. Neteler >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1672,6 +1738,7 @@ Summary: The system should run almost autonomously. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * ======= <<<<<<< HEAD @@ -1700,6 +1767,8 @@ Summary: The system should run almost autonomously. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main See ======= ======= @@ -1716,6 +1785,7 @@ See <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) @@ -1765,6 +1835,8 @@ See >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD <<<<<<< HEAD @@ -1777,6 +1849,7 @@ See <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1824,6 +1897,8 @@ See ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -1837,6 +1912,7 @@ See <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1914,6 +1990,10 @@ See >>>>>>> osgeo-main ======= +======= +>>>>>>> osgeo-main +======= + ======= >>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -1940,6 +2020,7 @@ Available lists: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * at OSGeo.org (): * grass-abm Integration of GRASS with JAVA based agent based modeling (ABM) @@ -2002,6 +2083,8 @@ Notes: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - at OSGeo.org (): - grass-abm: Integration of GRASS with JAVA based agent based modeling (ABM) @@ -2032,6 +2115,7 @@ Notes: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6b0657b022 (Fix missing function prototypes (#2727)) ======= @@ -2059,6 +2143,8 @@ Notes: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * grass-abm Integration of GRASS with JAVA based agent based modeling (ABM) @@ -2083,6 +2169,7 @@ Notes: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2106,6 +2193,8 @@ Notes: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= * at OSGeo.org (): @@ -2122,6 +2211,7 @@ Notes: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2154,6 +2244,8 @@ Notes: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main grass-abm Integration of GRASS with JAVA based agent based modeling (ABM) grass-announce GRASS announcements @@ -2175,6 +2267,7 @@ Notes: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6b0657b022 (Fix missing function prototypes (#2727)) @@ -2209,6 +2302,9 @@ Notes: >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= + >>>>>>> osgeo-main >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) * OLD, UNUSED: at FBK-irst (): @@ -2243,6 +2339,7 @@ Notes: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2397,6 +2494,8 @@ Notes: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) - grass-announce: @@ -2425,6 +2524,7 @@ Notes: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -2454,6 +2554,8 @@ Notes: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= * grass-abm Integration of GRASS with JAVA based agent based modeling (ABM) @@ -2490,6 +2592,7 @@ Notes: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2526,6 +2629,8 @@ Notes: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * grass-announce: * moderated by M. Neteler * has monthly password reminder disabled to avoid leakage into publicly @@ -2552,6 +2657,7 @@ Notes: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2611,6 +2717,9 @@ Notes: ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main ## GRASS Wiki @@ -2633,6 +2742,7 @@ Maintainer: Martin Landa, Markus Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2674,6 +2784,8 @@ Maintainer: Martin Landa, Markus Neteler >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - - Mediawiki software <<<<<<< HEAD @@ -2697,6 +2809,7 @@ Maintainer: Martin Landa, Markus Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2766,6 +2879,10 @@ Maintainer: Martin Landa, Markus Neteler ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main * * Mediawiki * mirrored at CZ Tech University @@ -2789,18 +2906,25 @@ Maintainer: Martin Landa, Markus Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Summary: The system should run almost autonomous. An eye must be be kept on people trying to spam the site ======= +======= +>>>>>>> osgeo-main Summary: The system should run almost autonomous. An eye must be be kept on people trying to spam the site. Several layers of registration protection are in place due to excessive spam. >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main Macros for manual pages (src, cmd, API, ...): <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -2894,6 +3018,8 @@ Macros for manual pages (src, cmd, API, ...): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - @@ -2931,6 +3057,7 @@ Former freenode IRC: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -2954,6 +3081,8 @@ Former freenode IRC: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= Summary: The system should run almost autonomous. An eye must be be kept on people @@ -2976,6 +3105,7 @@ Macros for manual pages (src, cmd, API, ...): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -3005,6 +3135,8 @@ Macros for manual pages (src, cmd, API, ...): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= Summary: The system should run almost autonomous. An eye must be be kept on people trying to spam the site @@ -3028,6 +3160,7 @@ Macros for manual pages (src, cmd, API, ...): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3088,6 +3221,8 @@ Macros for manual pages (src, cmd, API, ...): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * ## GRASS IRC @@ -3109,6 +3244,7 @@ Web based client: See <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * channel owner: Alessandro Frigeri < afrigeri unipg.it > ("geoalf") ======= * channel owner: Alessandro Frigeri ("geoalf") @@ -3160,6 +3296,9 @@ Web based client: See ======= * channel owner: Alessandro Frigeri < afrigeri unipg.it > ("geoalf") >>>>>>> osgeo-main +======= +* channel owner: Alessandro Frigeri < afrigeri unipg.it > ("geoalf") +>>>>>>> osgeo-main * quasi guru level: Markus Neteler ("markusN") * further operators: * Jachym ("jachym") @@ -3183,6 +3322,7 @@ Web based client: See <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3274,6 +3414,11 @@ Web based client: See ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## GRASS Bugtracker @@ -3295,6 +3440,7 @@ Current bugtracker (Jan 2020 - today): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3336,6 +3482,8 @@ Current bugtracker (Jan 2020 - today): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - @@ -3357,6 +3505,7 @@ Old bugtrackers: see <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3805,6 +3954,10 @@ Very very old bugtracker (Dec 2000 * Dec 2006): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main * @@ -3892,6 +4045,7 @@ Details: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main * Windows-addons: grass-addons/utils/addons/README.txt @@ -3944,6 +4098,8 @@ Details: ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - Windows-addons: `grass-addons/utils/addons/README.txt` ======= ======= @@ -3952,6 +4108,9 @@ Details: >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3979,6 +4138,7 @@ Details: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -4001,6 +4161,8 @@ Details: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -4023,6 +4185,7 @@ Details: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4052,6 +4215,8 @@ Details: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= * Windows-addons: grass-addons/utils/addons/README.txt * Addon manual pages cronjob: * Rendered manuals: @@ -4070,6 +4235,7 @@ Details: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4136,6 +4302,8 @@ Details: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main The redirect to the latest `grassX` directory is defined on grass.osgeo.org: `/etc/apache2/includes/grass.osgeo.org.inc` @@ -4162,6 +4330,7 @@ Procedure building of binaries (Windows): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main @@ -4223,6 +4392,8 @@ Procedure of granting write access to Addons repo: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - Addons module are compiled on winGRASS build server, at the CTU in Prague) and publishing their manual pages on publishing server, i.e. grass.osgeo.org. @@ -4263,6 +4434,7 @@ XML file for g.extension: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6b0657b022 (Fix missing function prototypes (#2727)) ======= @@ -4292,6 +4464,8 @@ XML file for g.extension: ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= * Addons module are compiled on build server, currently at the CTU in Prague) and publishing their manual pages on publishing server, i.e. grass.osgeo.org. @@ -4308,6 +4482,7 @@ XML file for g.extension: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4408,6 +4583,8 @@ XML file for g.extension: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * A new compilation is triggered everytime when a commit is done in the Addons-SVN. * Logs: * Linux log files: (compiled on @@ -4468,6 +4645,7 @@ XML file for g.extension: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -4630,6 +4808,10 @@ XML file for g.extension: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## GRASS Travis CI @@ -4652,6 +4834,7 @@ Maintainer: Martin Landa <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4687,6 +4870,8 @@ Maintainer: Martin Landa >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - - ======= @@ -4706,6 +4891,7 @@ Maintainer: Martin Landa <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4757,6 +4943,8 @@ Maintainer: Martin Landa >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * * * OLD: @@ -4773,6 +4961,7 @@ Maintainer: Martin Landa <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4801,6 +4990,8 @@ Maintainer: Martin Landa >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Travis CI control files: trunk/.travis/ @@ -4831,6 +5022,7 @@ The github update is run as a cronjob on server "geo102" (CTU, CZ). <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -4958,6 +5150,9 @@ The github update is run as a cronjob on server "geo102" (CTU, CZ). ======= >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -4977,6 +5172,7 @@ The github update is run as a cronjob on server "geo102" (CTU, CZ). <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5025,6 +5221,8 @@ The github update is run as a cronjob on server "geo102" (CTU, CZ). >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## GRASS CI: GitHub Actions Started in Apr. 2020 @@ -5048,6 +5246,7 @@ Maintainer: Vaclav Petras <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -5089,6 +5288,8 @@ Maintainer: Vaclav Petras >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - - Details: - CI workflow with: @@ -5122,6 +5323,7 @@ Helper files placed in .github/workflows/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5191,6 +5393,10 @@ Helper files placed in .github/workflows/ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main * * Details: @@ -5212,6 +5418,7 @@ Helper files placed in .github/workflows/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -5251,6 +5458,8 @@ Helper files placed in .github/workflows/ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * A build job which is not parallelized and is meant for clear & relatively fast check of compilation and building in general. (Duplicating what is running on Travis) * A test job which of course needs to build, but the main focus is to run tests, so the compilation is parallelized (depending on nproc) and thus potentially less readable. This runs the whole test suite. (You need to run it locally to see the actual error, but you can see which tests are failing.) @@ -5277,6 +5486,7 @@ Helper files placed in .github/workflows/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5307,6 +5517,8 @@ Helper files placed in .github/workflows/ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5325,6 +5537,7 @@ Helper files placed in .github/workflows/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD @@ -5393,6 +5606,10 @@ Helper files placed in .github/workflows/ ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= >>>>>>> osgeo-main * A build job which is not parallelized and is meant for clear & relatively fast check of compilation and building in general. (Duplicating what is running @@ -5424,6 +5641,7 @@ Helper files placed in .github/workflows/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -5458,6 +5676,8 @@ Helper files placed in .github/workflows/ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -5476,6 +5696,7 @@ Helper files placed in .github/workflows/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5545,6 +5766,8 @@ Helper files placed in .github/workflows/ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## GRASS docker images @@ -5565,6 +5788,7 @@ Helper files placed in .github/workflows/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -5606,6 +5830,8 @@ Helper files placed in .github/workflows/ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Maintainer: Carmen Tawalika, Vaclav Petras + OSGeo-SAC Docker images are created with a GitHub action. Subsequently, login is done @@ -5658,6 +5884,7 @@ Explanations: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -5727,6 +5954,10 @@ Explanations: ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main ## GRASS Coverity Scan Maintainer: Markus Neteler @@ -5748,6 +5979,7 @@ Maintainer: Markus Neteler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * ======= <<<<<<< HEAD @@ -5790,6 +6022,8 @@ Maintainer: Markus Neteler >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Coverity Scan is a service to find security issues. At time the service is used only occasionally. ======= @@ -5809,6 +6043,7 @@ is used only occasionally. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -5837,6 +6072,8 @@ is used only occasionally. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= * @@ -5853,6 +6090,7 @@ is used only occasionally. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5893,6 +6131,8 @@ is used only occasionally. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD - @@ -5912,6 +6152,7 @@ is used only occasionally. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5948,6 +6189,8 @@ is used only occasionally. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -5977,6 +6220,7 @@ Messages are extracted with `gettext` message macros. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6012,6 +6256,8 @@ Messages are extracted with `gettext` message macros. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Translations may be done using the OSGeo Weblate platform: ======= ======= @@ -6030,6 +6276,7 @@ Translations may be done using the OSGeo Weblate platform: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6078,6 +6325,8 @@ Translations may be done using the OSGeo Weblate platform: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main * Dashboard: * Auto-update URL to fetch files: * @@ -6104,6 +6353,7 @@ Translations may be done using the OSGeo Weblate platform: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6148,6 +6398,9 @@ Translations may be done using the OSGeo Weblate platform: ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main <<<<<<< HEAD >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6166,6 +6419,7 @@ Translations may be done using the OSGeo Weblate platform: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) @@ -6232,6 +6486,8 @@ Translations may be done using the OSGeo Weblate platform: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6249,6 +6505,7 @@ Translations may be done using the OSGeo Weblate platform: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6292,6 +6549,8 @@ Translations may be done using the OSGeo Weblate platform: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - Weblate: - GRASS GIS Weblate server: @@ -6353,6 +6612,7 @@ Further notification/functionality test systems: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -6444,6 +6704,11 @@ Further notification/functionality test systems: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ## Previous hosting sponsors @@ -6470,6 +6735,7 @@ Numerous institutions have sponsored the GRASS Project with Hardware/Bandwidth <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -6511,6 +6777,8 @@ Numerous institutions have sponsored the GRASS Project with Hardware/Bandwidth >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main - 1997-1999: Institut fuer Landschaftspflege und Naturschutz (ILN), Universitaet Hannover, Germany - 1999-2001: Institut fuer Physische Geographie und Landschaftsoekologie, @@ -6533,6 +6801,7 @@ Numerous institutions have sponsored the GRASS Project with Hardware/Bandwidth <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -6602,6 +6871,10 @@ Numerous institutions have sponsored the GRASS Project with Hardware/Bandwidth ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main * 1997-1999: Institut fuer Landschaftspflege und Naturschutz (ILN), Universitaet Hannover, Germany * 1999-2001: Institut fuer Physische Geographie und Landschaftsoekologie, diff --git a/doc/notebooks/README.md b/doc/notebooks/README.md index 21cd2ca7e34..98851436a63 100644 --- a/doc/notebooks/README.md +++ b/doc/notebooks/README.md @@ -28,6 +28,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -85,6 +86,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Clone this repository with `git clone` first. Then, locally start the Jupyter notebook server from the command line in the `doc/notebooks/` directory containing the `*.ipynb` files with: @@ -107,6 +110,7 @@ the `*.ipynb` files with: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -138,6 +142,8 @@ the `*.ipynb` files with: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Clone this repository with `git clone` first. Then, locally start the Jupyter notebook server from the command line in the `doc/notebooks/` directory containing the `*.ipynb` files with: >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -159,6 +165,7 @@ server from the command line in the `doc/notebooks/` directory containing the `* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Clone this repository with `git clone` first. Then, locally start the Jupyter notebook server from the command line in the `doc/notebooks/` directory containing the `*.ipynb` files with: @@ -198,6 +205,8 @@ server from the command line in the `doc/notebooks/` directory containing the `* ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= Clone this repository with `git clone` first. Then, locally start the Jupyter notebook server from the command line in the `doc/notebooks/` directory containing the `*.ipynb` files with: >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -220,6 +229,7 @@ the `*.ipynb` files with: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -248,6 +258,8 @@ the `*.ipynb` files with: >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -266,6 +278,7 @@ the `*.ipynb` files with: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -332,6 +345,8 @@ server from the command line in the `doc/notebooks/` directory containing the `* >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main `jupyter notebook` This will open a new browser tab or window with a list of the contents of the current @@ -375,6 +390,7 @@ See also the official documentation for [The Jupyter Notebook](https://jupyter-n <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -427,6 +443,8 @@ See also the official documentation for [The Jupyter Notebook](https://jupyter-n ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -447,6 +465,7 @@ See also the official documentation for [The Jupyter Notebook](https://jupyter-n <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -470,6 +489,8 @@ See also the official documentation for [The Jupyter Notebook](https://jupyter-n ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -490,6 +511,7 @@ See also the official documentation for [The Jupyter Notebook](https://jupyter-n <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -559,3 +581,5 @@ See also the official documentation for [The Jupyter Notebook](https://jupyter-n >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main diff --git a/doc/notebooks/example_notebook.ipynb b/doc/notebooks/example_notebook.ipynb index 4b0aabfaea4..973a92babaf 100644 --- a/doc/notebooks/example_notebook.ipynb +++ b/doc/notebooks/example_notebook.ipynb @@ -14,6 +14,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -53,6 +54,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "metadata": { "language_info": { @@ -87,6 +90,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -122,6 +126,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "source": [ "# Try GRASS GIS in Jupyter Notebook with Python\n", @@ -155,6 +161,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -233,6 +240,11 @@ "cell_type": "markdown", "metadata": {} >>>>>>> osgeo-main +======= + ], + "cell_type": "markdown", + "metadata": {} +>>>>>>> osgeo-main ======= ], "cell_type": "markdown", @@ -292,6 +304,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -330,6 +343,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "source": [ "## Raster buffer\n", @@ -351,6 +366,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -429,6 +445,11 @@ "cell_type": "markdown", "metadata": {} >>>>>>> osgeo-main +======= + ], + "cell_type": "markdown", + "metadata": {} +>>>>>>> osgeo-main ======= ], "cell_type": "markdown", @@ -465,6 +486,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -503,6 +525,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "source": [ "## Vector buffer\n", @@ -525,6 +549,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -603,6 +628,11 @@ "cell_type": "markdown", "metadata": {} >>>>>>> osgeo-main +======= + ], + "cell_type": "markdown", + "metadata": {} +>>>>>>> osgeo-main ======= ], "cell_type": "markdown", @@ -639,6 +669,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -772,4 +803,8 @@ } ] >>>>>>> osgeo-main +======= + } + ] +>>>>>>> osgeo-main } diff --git a/doc/notebooks/hydrology.ipynb b/doc/notebooks/hydrology.ipynb index 0649140224a..acc30219eaf 100644 --- a/doc/notebooks/hydrology.ipynb +++ b/doc/notebooks/hydrology.ipynb @@ -85,6 +85,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "elev_map.d_legend(raster=\"elevation\", at=(65, 90, 85, 88), fontsize=12, flags=\"b\", title=\"DTM\")\n", ======= @@ -127,6 +128,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "elev_map.d_legend(\n", " raster=\"elevation\", at=(65, 90, 85, 88), fontsize=12, flags=\"b\", title=\"DTM\"\n", @@ -148,6 +151,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "elev_map.d_legend(raster=\"elevation\", at=(65, 90, 85, 88), fontsize=12, flags=\"b\", title=\"DTM\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -230,6 +234,11 @@ ======= "elev_map.d_legend(raster=\"elevation\", at=(65, 90, 85, 88), fontsize=12, flags=\"b\", title=\"DTM\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "elev_map.d_legend(raster=\"elevation\", at=(65, 90, 85, 88), fontsize=12, flags=\"b\", title=\"DTM\")\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "\n", "# Display map\n", @@ -267,6 +276,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.fill.dir\", input=\"elevation\", output=\"elev_fill1\", direction=\"dir1\", areas=\"area1\")\n", "gs.run_command(\"r.fill.dir\", input=\"elev_fill1\", output=\"elev_fill2\", direction=\"dir2\", areas=\"area2\")\n", @@ -311,6 +321,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.fill.dir\",\n", @@ -352,6 +364,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -380,6 +393,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= "gs.run_command(\"r.fill.dir\", input=\"elevation\", output=\"elev_fill1\", direction=\"dir1\", areas=\"area1\")\n", "gs.run_command(\"r.fill.dir\", input=\"elev_fill1\", output=\"elev_fill2\", direction=\"dir2\", areas=\"area2\")\n", @@ -399,6 +414,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -440,6 +456,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.mapcalc(\"depr_bin = if((elevation-elev_fill3) < 0., 1, null())\")\n", "gs.run_command(\"r.colors\", map=\"depr_bin\", color=\"blues\")" @@ -494,6 +512,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -534,6 +553,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.watershed\",\n", @@ -559,6 +580,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -627,6 +649,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "gs.run_command(\"r.watershed\", \n", " elevation=\"elevation@PERMANENT\",\n", @@ -652,6 +678,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -742,6 +769,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "\n", "# Convert streams raster to vector\n", @@ -783,6 +815,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "# elevation is in PERMANENT, not user1), the `r.colors` will not change \n", ======= @@ -825,6 +858,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "# elevation is in PERMANENT, not user1), the `r.colors` will not change\n", ======= @@ -844,6 +879,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "# elevation is in PERMANENT, not user1), the `r.colors` will not change \n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -926,6 +962,11 @@ ======= "# elevation is in PERMANENT, not user1), the `r.colors` will not change \n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "# elevation is in PERMANENT, not user1), the `r.colors` will not change \n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "# the color in InteractiveMap.\n", "gs.run_command(\"r.colors\", map=\"drainage\", color=\"aspect\")\n", @@ -976,6 +1017,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1016,6 +1058,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.stats.zonal\",\n", @@ -1045,6 +1089,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1113,6 +1158,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "gs.run_command(\"r.stats.zonal\", base=\"watersheds\", cover=\"elevation\", method=\"count\", output=\"watersheds_count\")\n", "\n", @@ -1138,6 +1187,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1228,6 +1278,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "\n", "# Calculate watersheds areas and convert from m2 to km2\n", @@ -1266,6 +1321,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1306,6 +1362,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "\n", "watershed_map = gj.Map()\n", @@ -1336,6 +1394,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1404,6 +1463,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main " \n", "watershed_map = gj.Map()\n", @@ -1434,6 +1497,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1524,6 +1588,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "watershed_map.show()" ] @@ -1574,6 +1643,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "slope_map.d_legend(raster=\"slope\", at=(65, 90, 85, 90), fontsize=15, flags=\"b\", title=\"Slope\", units=\"°\")\n", ======= @@ -1616,6 +1686,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "slope_map.d_legend(\n", " raster=\"slope\",\n", @@ -1642,6 +1714,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "slope_map.d_legend(raster=\"slope\", at=(65, 90, 85, 90), fontsize=15, flags=\"b\", title=\"Slope\", units=\"°\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1724,6 +1797,11 @@ ======= "slope_map.d_legend(raster=\"slope\", at=(65, 90, 85, 90), fontsize=15, flags=\"b\", title=\"Slope\", units=\"°\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "slope_map.d_legend(raster=\"slope\", at=(65, 90, 85, 90), fontsize=15, flags=\"b\", title=\"Slope\", units=\"°\")\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "slope_map.show()" ] @@ -1760,6 +1838,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1800,6 +1879,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "columns = defaultdict(list) # each value in each column is appended to a list\n", "\n", @@ -1826,6 +1907,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1894,6 +1976,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "columns = defaultdict(list) # each value in each column is appended to a list\n", "\n", @@ -1920,6 +2006,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2010,6 +2097,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "\n", "watersheds = columns[\"zone\"]\n", @@ -2068,6 +2160,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.to.vect\", flags=\"s\", input=\"watersheds\", output=\"watersheds_vector\", type=\"area\")" ======= @@ -2110,6 +2203,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.to.vect\", flags=\"s\", input=\"watersheds\", output=\"watersheds_vector\", type=\"area\"\n", @@ -2131,6 +2226,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "gs.run_command(\"r.to.vect\", flags=\"s\", input=\"watersheds\", output=\"watersheds_vector\", type=\"area\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2213,6 +2309,11 @@ ======= "gs.run_command(\"r.to.vect\", flags=\"s\", input=\"watersheds\", output=\"watersheds_vector\", type=\"area\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "gs.run_command(\"r.to.vect\", flags=\"s\", input=\"watersheds\", output=\"watersheds_vector\", type=\"area\")" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ] }, @@ -2242,6 +2343,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2282,6 +2384,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "watershed_vect_map.d_vect(\n", " map=\"watersheds_vector\",\n", @@ -2308,6 +2412,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2376,6 +2481,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "watershed_vect_map.d_vect(map=\"watersheds_vector\",\n", " fill_color=\"none\",\n", @@ -2402,6 +2511,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2492,6 +2602,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "watershed_vect_map.show()" ] diff --git a/doc/notebooks/jupyter_example.ipynb b/doc/notebooks/jupyter_example.ipynb index 68fdaaba0c1..175aa24cbe5 100644 --- a/doc/notebooks/jupyter_example.ipynb +++ b/doc/notebooks/jupyter_example.ipynb @@ -24,6 +24,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "This is a quick introduction to *GRASS GIS* in a *Jupyter Notebook* using the [_grass.jupyter_](https://grass.osgeo.org/grass82/manuals/libpython/grass.jupyter.html) package and the *Python* scripting language. The _grass.jupyter_ package simplifies the launch of *GRASS GIS* in *Jupyter Notebook* and provides several useful classes for creating, displaying, and saving *GRASS GIS* maps.\n", ======= @@ -66,6 +67,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "This is a quick introduction to *GRASS GIS* in a *Jupyter Notebook* using the [_grass.jupyter_](https://grass.osgeo.org/grass-stable/manuals/libpython/grass.jupyter.html) package and the *Python* scripting language. The _grass.jupyter_ package simplifies the launch of *GRASS GIS* in *Jupyter Notebook* and provides several useful classes for creating, displaying, and saving *GRASS GIS* maps.\n", ======= @@ -85,6 +88,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "This is a quick introduction to *GRASS GIS* in a *Jupyter Notebook* using the [_grass.jupyter_](https://grass.osgeo.org/grass82/manuals/libpython/grass.jupyter.html) package and the *Python* scripting language. The _grass.jupyter_ package simplifies the launch of *GRASS GIS* in *Jupyter Notebook* and provides several useful classes for creating, displaying, and saving *GRASS GIS* maps.\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -167,6 +171,11 @@ ======= "This is a quick introduction to *GRASS GIS* in a *Jupyter Notebook* using the [_grass.jupyter_](https://grass.osgeo.org/grass82/manuals/libpython/grass.jupyter.html) package and the *Python* scripting language. The _grass.jupyter_ package simplifies the launch of *GRASS GIS* in *Jupyter Notebook* and provides several useful classes for creating, displaying, and saving *GRASS GIS* maps.\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "This is a quick introduction to *GRASS GIS* in a *Jupyter Notebook* using the [_grass.jupyter_](https://grass.osgeo.org/grass82/manuals/libpython/grass.jupyter.html) package and the *Python* scripting language. The _grass.jupyter_ package simplifies the launch of *GRASS GIS* in *Jupyter Notebook* and provides several useful classes for creating, displaying, and saving *GRASS GIS* maps.\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "\n", "The _grass.jupyter_ package was initially written as part of Google Summer of Code in 2021 by Caitlin Haedrich and was experimentally included in version 8.0.0. Caitlin further improved it thanks to the GRASS Mini Grant 2022. The package was officially released for the first time as part of version 8.2.0. If you are curious about how the package improves the integration of *GRASS GIS* and *Jupyter Notebooks*, compare it with [scripting_example.ipynb](scripting_example.ipynb). More features of the _grass.jupyter_ package are presented in [jupyter_tutorial.ipynb](jupyter_tutorial.ipynb).\n", @@ -238,6 +247,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", ======= @@ -280,6 +290,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500]\n", @@ -301,6 +313,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -383,6 +396,11 @@ ======= "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "\n", "# Start a Map\n", @@ -436,6 +454,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "v_buffer_map.d_vect(map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\")\n", ======= @@ -478,6 +497,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "v_buffer_map.d_vect(\n", " map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\"\n", @@ -499,6 +520,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "v_buffer_map.d_vect(map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -581,6 +603,11 @@ ======= "v_buffer_map.d_vect(map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "v_buffer_map.d_vect(map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\")\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "v_buffer_map.d_vect(map=\"buffer\", fill_color=\"#F8766D\", legend_label=\"Inner portion\")\n", "v_buffer_map.d_legend_vect(at=(10, 35))\n", diff --git a/doc/notebooks/jupyter_integration.ipynb b/doc/notebooks/jupyter_integration.ipynb index ab2fa981466..eacacb588a7 100644 --- a/doc/notebooks/jupyter_integration.ipynb +++ b/doc/notebooks/jupyter_integration.ipynb @@ -19,6 +19,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "As part of Google Summer of Code 2021, we've been working to shorten and simplify the launch of GRASS in Jupyter and imporve the map displays. You can find out more about the project and follow the progress on the [GRASS wiki page](https://trac.osgeo.org/grass/wiki/GSoC/2021/JupyterAndGRASS).\n", ======= @@ -68,6 +69,9 @@ ======= "As part of Google Summer of Code 2021, we've been working to shorten and simplify the launch of GRASS in Jupyter and imporve the map displays. You can find out more about the project and follow the progress on the [GRASS wiki page](https://trac.osgeo.org/grass/wiki/GSoC/2021/JupyterAndGRASS).\n", >>>>>>> osgeo-main +======= + "As part of Google Summer of Code 2021, we've been working to shorten and simplify the launch of GRASS in Jupyter and imporve the map displays. You can find out more about the project and follow the progress on the [GRASS wiki page](https://trac.osgeo.org/grass/wiki/GSoC/2021/JupyterAndGRASS).\n", +>>>>>>> osgeo-main ======= "As part of Google Summer of Code 2021, we've been working to shorten and simplify the launch of GRASS in Jupyter and imporve the map displays. You can find out more about the project and follow the progress on the [GRASS wiki page](https://trac.osgeo.org/grass/wiki/GSoC/2021/JupyterAndGRASS).\n", >>>>>>> osgeo-main @@ -98,6 +102,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "import sys" ======= @@ -150,6 +155,9 @@ ======= "import sys" >>>>>>> osgeo-main +======= + "import sys" +>>>>>>> osgeo-main ======= "import sys" >>>>>>> osgeo-main @@ -196,6 +204,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 83bcaf56ef (wxGUI/Single-Window: New change page event for AuiNotebook (#1780)) ======= @@ -251,6 +260,10 @@ "# Start GRASS Session\n", "gj.init(\"../../data/grassdata\", \"nc_basic_spm_grass7\", \"user1\")" >>>>>>> osgeo-main +======= + "# Start GRASS Session\n", + "gj.init(\"../../data/grassdata\", \"nc_basic_spm_grass7\", \"user1\")" +>>>>>>> osgeo-main ======= "# Start GRASS Session\n", "gj.init(\"../../data/grassdata\", \"nc_basic_spm_grass7\", \"user1\")" @@ -274,6 +287,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -342,6 +356,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "# Set computational region to the study area.\n", "gs.run_command(\"g.region\", raster=\"elevation\")" @@ -367,6 +383,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -754,6 +771,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "cell_type": "code", "execution_count": null, @@ -875,6 +894,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "3.8.10" ======= @@ -924,6 +944,9 @@ ======= "version": "3.8.10" >>>>>>> osgeo-main +======= + "version": "3.8.10" +>>>>>>> osgeo-main ======= "version": "3.8.10" >>>>>>> osgeo-main diff --git a/doc/notebooks/jupyter_tutorial.ipynb b/doc/notebooks/jupyter_tutorial.ipynb index 68b18ecdc24..7cda3be7edf 100644 --- a/doc/notebooks/jupyter_tutorial.ipynb +++ b/doc/notebooks/jupyter_tutorial.ipynb @@ -23,6 +23,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -63,6 +64,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "This notebook introduces the [_grass.jupyter_](https://grass.osgeo.org/grass-stable/manuals/libpython/grass.jupyter.html) package which simplifies the usage of *GRASS GIS* in *Jupyter Notebook*.\n", "\n", @@ -84,6 +87,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -152,6 +156,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "This notebook introduces the [_grass.jupyter_](https://grass.osgeo.org/grass82/manuals/libpython/grass.jupyter.html) package which simplifies the usage of *GRASS GIS* in *Jupyter Notebook*.\n", "\n", @@ -175,6 +183,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -265,6 +274,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "\n", "This interactive notebook is available online thanks to the [Binder](https://mybinder.org) service. To run the select part (called a *cell*), hit `Shift + Enter`." @@ -414,6 +428,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "example_map.run(\"d.vect\", map = \"zipcodes\", color=\"red\", fill_color=\"none\")\n", ======= @@ -456,6 +471,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "example_map.run(\"d.vect\", map=\"zipcodes\", color=\"red\", fill_color=\"none\")\n", ======= @@ -475,6 +492,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "example_map.run(\"d.vect\", map = \"zipcodes\", color=\"red\", fill_color=\"none\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -557,6 +575,11 @@ ======= "example_map.run(\"d.vect\", map = \"zipcodes\", color=\"red\", fill_color=\"none\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "example_map.run(\"d.vect\", map = \"zipcodes\", color=\"red\", fill_color=\"none\")\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "example_map.show()" ] @@ -641,6 +664,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "The `InteractiveMap` class displays *GRASS GIS* rasters and vectors with [*folium*](http://python-visualization.github.io/folium/), a [*leaflet*](https://leafletjs.com/) library for *Python*." ======= @@ -682,6 +706,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "The `InteractiveMap` class displays *GRASS GIS* rasters and vectors with [*folium*](http://python-visualization.github.io/folium/) or [*ipyleaflet*](https://ipyleaflet.readthedocs.io/en/latest/).\n", "Backend is detected automatically; when both libraries are available, ipyleaflet is used. The backend can be also selected with the `map_backend` parameter." @@ -691,6 +717,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -714,6 +743,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "The `InteractiveMap` class displays *GRASS GIS* rasters and vectors with [*folium*](http://python-visualization.github.io/folium/), a [*leaflet*](https://leafletjs.com/) library for *Python*." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -787,12 +817,19 @@ >>>>>>> 3ecb21a9ab (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ======= +>>>>>>> 3ecb21a9ab (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= ======= "The `InteractiveMap` class displays *GRASS GIS* rasters and vectors with [*folium*](http://python-visualization.github.io/folium/), a [*leaflet*](https://leafletjs.com/) library for *Python*." >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 82b75069a1 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ======= >>>>>>> 82b75069a1 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -845,6 +882,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "raleigh_map = gj.InteractiveMap(width = 600)" ======= @@ -887,6 +925,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "raleigh_map = gj.InteractiveMap(width=600)" ======= @@ -906,6 +946,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "raleigh_map = gj.InteractiveMap(width = 600)" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -988,6 +1029,11 @@ ======= "raleigh_map = gj.InteractiveMap(width = 600)" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "raleigh_map = gj.InteractiveMap(width = 600)" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ] }, @@ -1019,6 +1065,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "raleigh_map.add_layer_control(position = \"bottomright\")" ======= @@ -1061,6 +1108,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "raleigh_map.add_layer_control(position=\"bottomright\")" ======= @@ -1080,6 +1129,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "raleigh_map.add_layer_control(position = \"bottomright\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1115,6 +1165,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -1131,6 +1183,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1168,6 +1221,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ] }, @@ -1231,6 +1286,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1271,6 +1327,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "import folium\n", "\n", @@ -1292,6 +1350,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1360,6 +1419,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "import folium \n", "\n", @@ -1385,6 +1448,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1475,6 +1539,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "\n", "# Create and add elevation layer to map\n", @@ -1502,6 +1571,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1542,6 +1612,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main " [35.781608, -78.675800], popup=\"Point of Interest\", tooltip=tooltip\n", ").add_to(m)\n", @@ -1600,6 +1672,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1668,6 +1741,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main " [35.781608,-78.675800], popup=\"Point of Interest\", tooltip=tooltip\n", ").add_to(m)\n", @@ -1694,6 +1771,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1784,6 +1862,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ] }, @@ -1900,6 +1983,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1940,6 +2024,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "## Animating Series of Maps\n", "\n", @@ -2019,6 +2105,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2087,6 +2174,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "## Switching Mapsets and Session Management\n", "\n", @@ -2139,6 +2230,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "display_name": "Python 3", ======= @@ -2181,6 +2273,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "display_name": "Python 3 (ipykernel)", ======= @@ -2200,6 +2294,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "display_name": "Python 3", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2282,6 +2377,11 @@ ======= "display_name": "Python 3", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "display_name": "Python 3", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "language": "python", "name": "python3" diff --git a/doc/notebooks/scripting_example.ipynb b/doc/notebooks/scripting_example.ipynb index 470b5cf46b8..a1b6dca9e3a 100644 --- a/doc/notebooks/scripting_example.ipynb +++ b/doc/notebooks/scripting_example.ipynb @@ -90,6 +90,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", ======= @@ -132,6 +133,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500]\n", @@ -153,6 +156,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -235,6 +239,11 @@ ======= "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "gs.run_command(\"r.buffer\", input=\"lakes\", output=\"lakes_buff\", distances=[60, 120, 240, 500])\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "gs.run_command(\"d.erase\")\n", "gs.run_command(\"d.rast\", map=\"lakes_buff\")\n", @@ -279,6 +288,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"d.vect\", map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\")\n", "gs.run_command(\"d.vect\", map=\"buffer\", fill_color=\"#F8766D\", legend_label=\"Inner portion\")\n", @@ -322,6 +332,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"d.vect\", map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\"\n", @@ -347,6 +359,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -375,6 +388,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= "gs.run_command(\"d.vect\", map=\"boundary_state\", fill_color=\"#5A91ED\", legend_label=\"State boundary\")\n", "gs.run_command(\"d.vect\", map=\"buffer\", fill_color=\"#F8766D\", legend_label=\"Inner portion\")\n", @@ -393,6 +408,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -434,6 +450,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\"d.legend.vect\", at=(10, 35))\n", "Image(filename=\"map.png\")" diff --git a/doc/notebooks/solar_potential.ipynb b/doc/notebooks/solar_potential.ipynb index d57e1814a6b..5ed485ecb29 100644 --- a/doc/notebooks/solar_potential.ipynb +++ b/doc/notebooks/solar_potential.ipynb @@ -109,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.sunmask\", elevation=\"elevation\", year=\"2001\", month=\"12\", day=\"22\", hour=\"16\", minute=\"15\", sec=\"0\", timezone=\"-5\", flags=\"s\")" ======= @@ -151,6 +152,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.sunmask\",\n", @@ -181,6 +184,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "gs.run_command(\"r.sunmask\", elevation=\"elevation\", year=\"2001\", month=\"12\", day=\"22\", hour=\"16\", minute=\"15\", sec=\"0\", timezone=\"-5\", flags=\"s\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -263,6 +267,11 @@ ======= "gs.run_command(\"r.sunmask\", elevation=\"elevation\", year=\"2001\", month=\"12\", day=\"22\", hour=\"16\", minute=\"15\", sec=\"0\", timezone=\"-5\", flags=\"s\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "gs.run_command(\"r.sunmask\", elevation=\"elevation\", year=\"2001\", month=\"12\", day=\"22\", hour=\"16\", minute=\"15\", sec=\"0\", timezone=\"-5\", flags=\"s\")" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ] }, @@ -297,6 +306,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.run_command(\"r.sun\", elevation=\"elevation\", aspect=\"aspect\", slope=\"slope\", incidout=\"incident\", day=\"356\", time=\"16.25\")\n", ======= @@ -339,6 +349,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.sun\",\n", @@ -366,6 +378,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "gs.run_command(\"r.sun\", elevation=\"elevation\", aspect=\"aspect\", slope=\"slope\", incidout=\"incident\", day=\"356\", time=\"16.25\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -448,6 +461,11 @@ ======= "gs.run_command(\"r.sun\", elevation=\"elevation\", aspect=\"aspect\", slope=\"slope\", incidout=\"incident\", day=\"356\", time=\"16.25\")\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "gs.run_command(\"r.sun\", elevation=\"elevation\", aspect=\"aspect\", slope=\"slope\", incidout=\"incident\", day=\"356\", time=\"16.25\")\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "gs.parse_command(\"r.info\", map=\"incident\", flags=\"g\")\n", "gs.run_command(\"r.colors\", map=\"incident\", co=\"bcyr\", flags=\"e\")" @@ -535,6 +553,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -575,6 +594,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.run_command(\n", " \"r.sun\",\n", @@ -611,6 +632,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -679,6 +701,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "gs.run_command(\"r.sun\", elevation=\"elevation\", aspect=\"aspect\", slope=\"slope\", day=\"356\", glob_rad=\"winter\", insol_time=\"its356\")\n", "gs.run_command(\"r.colors\", map=\"winter\", co=\"gyr\", flags=\"e\")\n", @@ -701,6 +727,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -791,6 +818,11 @@ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "gs.run_command(\"r.colors\", map=\"summer\", co=\"gyr\", flags=\"e\")" ] diff --git a/doc/notebooks/temporal.ipynb b/doc/notebooks/temporal.ipynb index bf978611122..32ffab882f0 100644 --- a/doc/notebooks/temporal.ipynb +++ b/doc/notebooks/temporal.ipynb @@ -48,6 +48,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "shutil.unpack_archive(\"../../data/NC_spm_temporal_workshop.zip\", \"../../data/grassdata\", \"zip\")" ======= @@ -90,6 +91,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "shutil.unpack_archive(\n", " \"../../data/NC_spm_temporal_workshop.zip\", \"../../data/grassdata\", \"zip\"\n", @@ -111,6 +114,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "shutil.unpack_archive(\"../../data/NC_spm_temporal_workshop.zip\", \"../../data/grassdata\", \"zip\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -193,6 +197,11 @@ ======= "shutil.unpack_archive(\"../../data/NC_spm_temporal_workshop.zip\", \"../../data/grassdata\", \"zip\")" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "shutil.unpack_archive(\"../../data/NC_spm_temporal_workshop.zip\", \"../../data/grassdata\", \"zip\")" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ] }, @@ -396,6 +405,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "precip_map.d_legend(color=\"black\", at=(10,40,2,6)) #Add legend\n", ======= @@ -438,6 +448,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "precip_map.d_legend(color=\"black\", at=(10, 40, 2, 6)) # Add legend\n", ======= @@ -457,6 +469,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "precip_map.d_legend(color=\"black\", at=(10,40,2,6)) #Add legend\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -539,6 +552,11 @@ ======= "precip_map.d_legend(color=\"black\", at=(10,40,2,6)) #Add legend\n", >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "precip_map.d_legend(color=\"black\", at=(10,40,2,6)) #Add legend\n", +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "precip_map.d_vect(map=\"boundary_county\", fill_color=\"none\")\n", "precip_map.d_barscale()\n", @@ -576,6 +594,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "Image(precip_map.save(\"image.gif\", duration=500, label=True, text_size=16, text_color=\"gray\"))" ======= @@ -618,6 +637,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "Image(\n", " precip_map.save(\n", @@ -641,6 +662,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "Image(precip_map.save(\"image.gif\", duration=500, label=True, text_size=16, text_color=\"gray\"))" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -723,6 +745,11 @@ ======= "Image(precip_map.save(\"image.gif\", duration=500, label=True, text_size=16, text_color=\"gray\"))" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "Image(precip_map.save(\"image.gif\", duration=500, label=True, text_size=16, text_color=\"gray\"))" +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ] }, diff --git a/doc/notebooks/viewshed_analysis.ipynb b/doc/notebooks/viewshed_analysis.ipynb index 8ebf5d1803a..fd5c8237093 100644 --- a/doc/notebooks/viewshed_analysis.ipynb +++ b/doc/notebooks/viewshed_analysis.ipynb @@ -81,6 +81,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "gs.write_command(\"v.in.ascii\", input=\"-\", stdin=\"%s|%s\" % (642212, 224767), output=\"viewpoints\")\n", "gs.run_command(\"r.viewshed\", input=\"elevation\", output=\"tower_los\", coordinates=\"642212,224767\", observer_elevation=\"165\", max_distance=\"10000\")" @@ -124,6 +125,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "gs.write_command(\n", " \"v.in.ascii\", input=\"-\", stdin=\"%s|%s\" % (642212, 224767), output=\"viewpoints\"\n", @@ -154,6 +157,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -182,6 +186,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= "gs.write_command(\"v.in.ascii\", input=\"-\", stdin=\"%s|%s\" % (642212, 224767), output=\"viewpoints\")\n", "gs.run_command(\"r.viewshed\", input=\"elevation\", output=\"tower_los\", coordinates=\"642212,224767\", observer_elevation=\"165\", max_distance=\"10000\")" @@ -200,6 +206,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -241,6 +248,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ] }, diff --git a/doc/projectionintro.html b/doc/projectionintro.html index 8b8a13c8cb9..6bda0e9d674 100644 --- a/doc/projectionintro.html +++ b/doc/projectionintro.html @@ -44,6 +44,7 @@

    Raster map transformation

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -135,6 +136,11 @@

    Raster map transformation

    ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main four corner points or by seeking several ground control points (i.group, i.target, g.gui.gcp) and then transformed into the @@ -176,6 +182,7 @@

    Vector map transformation

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD into the location with projection and geocoded within this location by defining four corner points or by seeking several ground control points. These points are stored into an ASCII file and then transformed within @@ -220,6 +227,8 @@

    Vector map transformation

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main into the project with projection and geocoded within this project by defining four corner points or by seeking several ground control points. These points are stored into an ASCII file and then transformed within @@ -242,6 +251,7 @@

    Vector map transformation

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -271,6 +281,8 @@

    Vector map transformation

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= into the location with projection and geocoded within this location by defining four corner points or by seeking several ground control points. These points are stored into an ASCII file and then transformed within @@ -289,6 +301,7 @@

    Vector map transformation

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -331,6 +344,8 @@

    Vector map transformation

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main the same location (v.transform). >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) diff --git a/doc/python/raster_example_ctypes.py b/doc/python/raster_example_ctypes.py index 67f7a2cf4cb..54de0aab30b 100644 --- a/doc/python/raster_example_ctypes.py +++ b/doc/python/raster_example_ctypes.py @@ -40,10 +40,7 @@ sys.exit("You must be in GRASS GIS to run this program") # parse command line arguments, prompt user for a raster map name if one wasn't given -if len(sys.argv) == 2: - input = sys.argv[1] -else: - input = input("Name of raster map? ") +input = sys.argv[1] if len(sys.argv) == 2 else input("Name of raster map? ") # initialize GRASS library G_gisinit("") diff --git a/doc/python/vector_example_ctypes.py b/doc/python/vector_example_ctypes.py index ae3877224d0..27053d653c9 100644 --- a/doc/python/vector_example_ctypes.py +++ b/doc/python/vector_example_ctypes.py @@ -33,10 +33,7 @@ if "GISBASE" not in os.environ: sys.exit("You must be in GRASS GIS to run this program.") -if len(sys.argv) == 2: - input = sys.argv[1] -else: - input = input("Name of vector map? ") +input = sys.argv[1] if len(sys.argv) == 2 else input("Name of vector map? ") # initialize GRASS library G_gisinit("") diff --git a/doc/vector/v.example/main.c b/doc/vector/v.example/main.c index eb9d55bdf9c..7a12c56d7dd 100644 --- a/doc/vector/v.example/main.c +++ b/doc/vector/v.example/main.c @@ -126,6 +126,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* Output information useful for debuging ======= @@ -168,6 +169,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* Output information useful for debugging ======= @@ -187,6 +190,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /* Output information useful for debuging >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -269,6 +273,11 @@ int main(int argc, char *argv[]) ======= /* Output information useful for debuging >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /* Output information useful for debuging +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main include/vect/dig_structs.h */ diff --git a/docker/README.md b/docker/README.md index 4f37d371ae5..210324ac1ca 100644 --- a/docker/README.md +++ b/docker/README.md @@ -18,6 +18,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -62,6 +63,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main [![Docker Pulls](https://img.shields.io/docker/pulls/osgeo/grass-gis.svg)](https://grass.osgeo.org/download/docker/) @@ -101,6 +104,7 @@ docker pull osgeo/grass-gis: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -287,6 +291,10 @@ the table above): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main [![Docker Pulls](https://img.shields.io/docker/pulls/mundialis/grass-py3-pdal.svg)](https://grass.osgeo.org/download/software/docker-images/) @@ -326,6 +334,7 @@ the table above): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -373,6 +382,8 @@ the table above): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ## GRASS GIS docker matrix @@ -414,6 +425,7 @@ the table above): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -460,6 +472,8 @@ the table above): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ```bash docker pull mundialis/grass-py3-pdal: ``` @@ -481,6 +495,7 @@ docker pull mundialis/grass-py3-pdal: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -572,4 +587,9 @@ docker pull mundialis/grass-py3-pdal: ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main See also: diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 0e5bb6026be..3ca91d8b811 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -16,6 +16,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD FROM alpine:3.15 as common ======= <<<<<<< HEAD @@ -40,12 +41,17 @@ FROM alpine:3.15 as common ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main FROM alpine:3.20@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d as common ======= ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -60,6 +66,7 @@ FROM alpine:3.20@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9a <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main FROM alpine:3.20@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 as common ======= @@ -111,6 +118,8 @@ FROM alpine:3.20@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main FROM alpine:3.20@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 as common ======= ======= @@ -127,6 +136,7 @@ FROM alpine:3.20@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) FROM alpine:3.19@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b as common ======= @@ -176,6 +186,8 @@ FROM alpine:3.20@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main FROM alpine:3.19@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b as common ======= FROM alpine:3.15 as common @@ -191,6 +203,7 @@ FROM alpine:3.15 as common <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -262,12 +275,17 @@ FROM alpine:3.15 as common ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -285,6 +303,7 @@ FROM alpine:3.15 as common <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main ======= @@ -305,6 +324,9 @@ FROM alpine:3.15 as common ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Based on: # https://github.com/mundialis/docker-grass-gis/blob/master/Dockerfile @@ -331,6 +353,7 @@ ARG PYTHON_VERSION=3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # List of packages to be installed ENV PACKAGES="\ attr \ @@ -375,6 +398,8 @@ ENV PACKAGES="\ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # List of packages to be installed (proj-data omitted: 570.04 MB) ENV GRASS_RUN_PACKAGES="\ attr \ @@ -400,6 +425,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -433,6 +459,10 @@ ENV PACKAGES="\ ======= >>>>>>> osgeo-main ======= +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main +======= # List of packages to be installed ENV PACKAGES="\ attr \ @@ -451,6 +481,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -494,6 +525,9 @@ ENV PACKAGES="\ >>>>>>> osgeo-main ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main bash \ bison \ @@ -521,6 +555,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -561,6 +596,8 @@ ENV PACKAGES="\ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main g++ \ gcc \ @@ -589,6 +626,7 @@ ENV PACKAGES="\ gettext \ geos \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD geos-dev \ git \ @@ -775,6 +813,11 @@ ENV PACKAGES="\ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main gnutls \ jsoncpp \ @@ -797,6 +840,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -837,6 +881,8 @@ ENV PACKAGES="\ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main libgeotiff \ libjpeg-turbo \ @@ -859,6 +905,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -927,6 +974,10 @@ ENV PACKAGES="\ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main libexecinfo \ libgeotiff \ @@ -950,6 +1001,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1040,6 +1092,11 @@ ENV PACKAGES="\ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main musl \ musl-utils \ @@ -1067,6 +1124,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1107,6 +1165,8 @@ ENV PACKAGES="\ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main python3 \ >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) @@ -1128,6 +1188,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1196,6 +1257,10 @@ ENV PACKAGES="\ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main py3-six \ pdal \ @@ -1218,6 +1283,7 @@ ENV PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1308,6 +1374,11 @@ ENV PACKAGES="\ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main proj-util \ py3-numpy \ @@ -1343,6 +1414,7 @@ WORKDIR /src <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1384,6 +1456,8 @@ WORKDIR /src >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Add the packages RUN echo "Install main packages";\ apk update; \ @@ -1403,6 +1477,7 @@ RUN echo "Install main packages";\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1472,6 +1547,10 @@ RUN echo "Install main packages";\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ENV PYTHONBIN=python$PYTHON_VERSION RUN echo "Install Python";\ @@ -1504,6 +1583,7 @@ RUN echo "Install main packages";\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1595,6 +1675,11 @@ RUN echo "Install main packages";\ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main FROM common as build @@ -1658,6 +1743,7 @@ ENV GRASS_BUILD_PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD g++ \ gcc \ @@ -1703,6 +1789,8 @@ ENV GRASS_BUILD_PACKAGES="\ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= g++ \ gcc \ @@ -1722,6 +1810,7 @@ ENV GRASS_BUILD_PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1750,6 +1839,8 @@ ENV GRASS_BUILD_PACKAGES="\ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= g++ \ gcc \ @@ -1769,6 +1860,7 @@ ENV GRASS_BUILD_PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1810,6 +1902,8 @@ ENV GRASS_BUILD_PACKAGES="\ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main geos-dev \ git \ @@ -1833,6 +1927,7 @@ ENV GRASS_BUILD_PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD make \ ======= @@ -1966,6 +2061,9 @@ ENV GRASS_BUILD_PACKAGES="\ ======= libpq-dev \ >>>>>>> osgeo-main +======= + libpq-dev \ +>>>>>>> osgeo-main <<<<<<< HEAD ======= ======= @@ -1975,6 +2073,9 @@ ENV GRASS_BUILD_PACKAGES="\ make \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2000,6 +2101,7 @@ ENV GRASS_BUILD_PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD postgresql-dev \ ======= @@ -2037,6 +2139,8 @@ ENV GRASS_BUILD_PACKAGES="\ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= postgresql-dev \ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2057,6 +2161,7 @@ ENV GRASS_BUILD_PACKAGES="\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2107,6 +2212,8 @@ ENV GRASS_BUILD_PACKAGES="\ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main proj-dev \ py3-numpy-dev \ @@ -2159,6 +2266,7 @@ RUN echo " => Configure and compile grass" && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2209,6 +2317,8 @@ RUN echo " => Configure and compile grass" && \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/alpine/Dockerfile <<<<<<< HEAD:docker/alpine/Dockerfile # Get rid of version number here, restore in next stage via symbolic link @@ -2246,6 +2356,7 @@ RUN ./configure \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # Reduce the image size - Remove unnecessary grass files >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)):docker/alpine/Dockerfile_alpine @@ -2322,6 +2433,11 @@ RUN ./configure \ # Reduce the image size - Remove unnecessary grass files >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)):docker/alpine/Dockerfile_alpine >>>>>>> osgeo-main +======= +======= +# Reduce the image size - Remove unnecessary grass files +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)):docker/alpine/Dockerfile_alpine +>>>>>>> osgeo-main RUN cp /usr/local/grass80/gui/wxpython/xml/module_items.xml module_items.xml; \ rm -rf /usr/local/grass80/demolocation; \ rm -rf /usr/local/grass80/fonts; \ @@ -2343,6 +2459,7 @@ RUN cp /usr/local/grass80/gui/wxpython/xml/module_items.xml module_items.xml; \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -2371,6 +2488,8 @@ RUN cp /usr/local/grass80/gui/wxpython/xml/module_items.xml module_items.xml; \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/alpine/Dockerfile >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)):docker/alpine/Dockerfile_alpine ======= @@ -2389,6 +2508,7 @@ RUN cp /usr/local/grass80/gui/wxpython/xml/module_items.xml module_items.xml; \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2468,6 +2588,11 @@ RUN cp /usr/local/grass80/gui/wxpython/xml/module_items.xml module_items.xml; \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Reduce the image size - Remove unnecessary grass files RUN cp /usr/local/grass83/gui/wxpython/xml/module_items.xml module_items.xml; \ rm -rf /usr/local/grass83/demolocation; \ @@ -2493,6 +2618,7 @@ RUN cp /usr/local/grass83/gui/wxpython/xml/module_items.xml module_items.xml; \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2600,6 +2726,11 @@ RUN cp /usr/local/grass83/gui/wxpython/xml/module_items.xml module_items.xml; \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main FROM common as grass @@ -2625,6 +2756,7 @@ FROM common as grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2668,6 +2800,8 @@ FROM common as grass >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/alpine/Dockerfile ======= ======= @@ -2686,6 +2820,7 @@ FROM common as grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2767,6 +2902,10 @@ FROM common as grass ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main ENV LC_ALL="en_US.UTF-8" # Copy GRASS GIS from build image @@ -2793,6 +2932,7 @@ COPY --from=build /usr/local/grass* /usr/local/grass/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2842,6 +2982,8 @@ COPY --from=build /usr/local/grass* /usr/local/grass/ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # pip 20.0.0 fix RUN apk add curl && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py pip==20.0.2 && rm get-pip.py @@ -2864,6 +3006,7 @@ RUN apk add curl && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && p <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main <<<<<<< HEAD:docker/alpine/Dockerfile @@ -2895,6 +3038,8 @@ RUN apk add curl && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && p >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/alpine/Dockerfile <<<<<<< HEAD:docker/alpine/Dockerfile RUN pip3 install --upgrade pip six grass-session --ignore-installed six @@ -2916,6 +3061,7 @@ RUN pip3 install --upgrade grass-session <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -2939,6 +3085,8 @@ RUN pip3 install --upgrade grass-session ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= RUN pip3 install --upgrade pip six grass-session --ignore-installed six >>>>>>> 7c10386e82 (g.proj: fix reading input WKT (#1582)):docker/alpine/Dockerfile_alpine @@ -2960,6 +3108,7 @@ RUN pip3 install --upgrade pip six grass-session --ignore-installed six <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3011,6 +3160,8 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main RUN ln -sf /usr/local/grass `grass --config path` RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \ ======= @@ -3025,6 +3176,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3058,6 +3210,8 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # install external Python API RUN pip3 install --upgrade pip six grass-session --ignore-installed six @@ -3081,6 +3235,7 @@ RUN grass --tmp-location XY --exec g.version -rge && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3238,6 +3393,11 @@ RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main pdal --version && \ python3 --version @@ -3272,6 +3432,7 @@ ENV GRASSBIN=grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3315,6 +3476,8 @@ ENV GRASSBIN=grass >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal # Not yet ready for GRASS GIS 8: @@ -3338,6 +3501,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.learn.ml <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3407,6 +3571,10 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.learn.ml ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Test grass-session # Not yet ready for GRASS GIS 8: @@ -3434,6 +3602,7 @@ RUN grass --tmp-location XY --exec g.extension extension=r.learn.ml2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3556,6 +3725,11 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.learn.ml ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main FROM grass as final @@ -3581,6 +3755,7 @@ FROM grass as final <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3610,6 +3785,8 @@ FROM grass as final >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> e526e86235 (Dockerfile_alpine: fix broken pip six installation (#1568)):docker/alpine/Dockerfile_alpine ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3627,6 +3804,7 @@ FROM grass as final <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3732,6 +3910,13 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \ ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \ ======= >>>>>>> osgeo-main +======= +# GRASS GIS specific +# allow work with MAPSETs that are not owned by current user +<<<<<<< HEAD +ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \ +======= +>>>>>>> osgeo-main ENV GRASSBIN="/usr/local/bin/grass" \ GRASS_SKIP_MAPSET_OWNER_CHECK=1 \ <<<<<<< HEAD @@ -3745,6 +3930,7 @@ ENV GRASSBIN="/usr/local/bin/grass" \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -3868,6 +4054,11 @@ ENV GRASSBIN="/usr/local/bin/grass" \ ======= <<<<<<< HEAD >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +<<<<<<< HEAD +>>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main SHELL="/bin/bash" \ # https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK @@ -3910,6 +4101,7 @@ RUN ln -sf /usr/local/grass $(grass --config path); \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3988,6 +4180,10 @@ ENV PROJ_NETWORK="ON" ======= && python --version ======= +>>>>>>> osgeo-main +======= + && python --version +======= >>>>>>> osgeo-main && python3 --version ======= @@ -4019,6 +4215,7 @@ RUN grass --tmp-location XY --exec g.version -rge && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -4098,6 +4295,8 @@ RUN grass --tmp-location XY --exec g.version -rge && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704)) @@ -4111,6 +4310,7 @@ RUN grass --tmp-location XY --exec g.version -rge && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -4189,6 +4389,9 @@ RUN grass --tmp-location XY --exec g.version -rge && \ >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= + >>>>>>> osgeo-main # test r.in.pdal in final image because test stage is not executed in github action COPY docker/testdata/simple.laz /tmp/simple.laz @@ -4210,6 +4413,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4259,6 +4463,9 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main # test r.in.pdal in final image because test stage is not executed in github action COPY docker/testdata/simple.laz /tmp/simple.laz RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g @@ -4279,6 +4486,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4321,6 +4529,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Data workdir WORKDIR /grassdb VOLUME /grassdb @@ -4342,6 +4552,7 @@ VOLUME /grassdb <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD CMD $GRASSBIN --version ======= <<<<<<< HEAD @@ -4384,6 +4595,8 @@ CMD $GRASSBIN --version >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main CMD ["$GRASSBIN", "--version"] ======= CMD $GRASSBIN --version @@ -4402,6 +4615,7 @@ CMD $GRASSBIN --version <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= CMD $GRASSBIN --version >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4485,3 +4699,8 @@ CMD $GRASSBIN --version CMD $GRASSBIN --version >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +CMD $GRASSBIN --version +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main diff --git a/docker/alpine/Dockerfile_alpine_latest b/docker/alpine/Dockerfile_alpine_latest index 2157943df0b..7ed30d58e7f 100644 --- a/docker/alpine/Dockerfile_alpine_latest +++ b/docker/alpine/Dockerfile_alpine_latest @@ -19,6 +19,7 @@ LABEL maintainer="peter.zamb@gmail.com,neteler@osgeo.org" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # without PDAL ======= @@ -80,6 +81,10 @@ LABEL maintainer="peter.zamb@gmail.com,neteler@osgeo.org" ======= # without PDAL +>>>>>>> osgeo-main +======= +# without PDAL + >>>>>>> osgeo-main # PACKAGES VERSIONS ARG PYTHON_VERSION=3 @@ -258,6 +263,7 @@ RUN echo " => Configure and compile grass";\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -285,6 +291,8 @@ RUN echo " => Configure and compile grass";\ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main rm -rf /usr/local/grass83/demolocation; \ rm -rf /usr/local/grass83/fonts; \ @@ -302,6 +310,7 @@ RUN echo " => Configure and compile grass";\ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -349,6 +358,8 @@ RUN echo " => Configure and compile grass";\ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Unset environmental variables to avoid later compilation issues diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index 28c47af6ed0..92ac7d7eaa8 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -23,6 +23,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -53,6 +54,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main FROM debian:bookworm-20240612-slim@sha256:67f3931ad8cb1967beec602d8c0506af1e37e8d73c2a0b38b181ec5d8560d395 ======= ======= @@ -70,6 +73,7 @@ FROM debian:bookworm-20240612-slim@sha256:67f3931ad8cb1967beec602d8c0506af1e37e8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main <<<<<<< HEAD FROM debian:stable@sha256:82f8da149d6d567c74564cccd6f355fb5ade42a958e4cde10a1100eaeb24d42e @@ -201,6 +205,8 @@ FROM debian:stable@sha256:82f8da149d6d567c74564cccd6f355fb5ade42a958e4cde10a1100 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main FROM debian:stable@sha256:82f8da149d6d567c74564cccd6f355fb5ade42a958e4cde10a1100eaeb24d42e ======= ======= @@ -216,6 +222,7 @@ FROM debian:stable@sha256:82f8da149d6d567c74564cccd6f355fb5ade42a958e4cde10a1100 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -233,6 +240,8 @@ FROM debian:stable@sha256:82f8da149d6d567c74564cccd6f355fb5ade42a958e4cde10a1100 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main FROM debian:stable@sha256:84725fb1debbf461f54a23030be0bcde8449f2fa4eba8adf857b1a4c707fec8d >>>>>>> 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) # currently Debian 12 @@ -247,6 +256,7 @@ FROM debian:stable@sha256:84725fb1debbf461f54a23030be0bcde8449f2fa4eba8adf857b1a <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -281,6 +291,8 @@ FROM debian:stable@sha256:84725fb1debbf461f54a23030be0bcde8449f2fa4eba8adf857b1a >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # apt-get update && apt-get install lsb-release -y && lsb_release -a ======= @@ -301,6 +313,7 @@ FROM debian:10.1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -324,6 +337,8 @@ FROM debian:10.1 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= FROM debian:10.1 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -341,6 +356,7 @@ FROM debian:10.1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD FROM debian:10.1 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= @@ -424,6 +440,11 @@ FROM debian:10.1 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= >>>>>>> osgeo-main +======= +FROM debian:10.1 +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> osgeo-main FROM debian:stable # currently Debian 11 @@ -446,6 +467,7 @@ FROM debian:stable <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -480,6 +502,8 @@ FROM debian:stable >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -498,6 +522,7 @@ FROM debian:stable <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -564,6 +589,8 @@ FROM debian:10.1 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" LABEL maintainer="tawalika@mundialis.de,neteler@mundialis.de,weinmann@mundialis.de" @@ -594,6 +621,7 @@ ENV DEBIAN_FRONTEND noninteractive <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # define versions to be used (PDAL is not available on Debian, so we compile it here) @@ -859,6 +887,14 @@ ARG PDAL_VERSION=2.7.2 ARG PDAL_VERSION=2.7.2 >>>>>>> osgeo-main ======= +# define versions to be used (PDAL is not available on Debian, so we compile it here) +# https://github.com/PDAL/PDAL/releases +<<<<<<< HEAD +# renovate: datasource=github-tags depName=PDAL/PDAL +<<<<<<< HEAD +ARG PDAL_VERSION=2.7.2 +>>>>>>> osgeo-main +======= ARG PDAL_VERSION=2.7.1 ======= ARG PDAL_VERSION=2.5.5 @@ -868,6 +904,9 @@ ARG PDAL_VERSION=2.5.5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -890,6 +929,7 @@ ARG PDAL_VERSION=2.5.5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -910,6 +950,8 @@ ARG PDAL_VERSION=2.5.5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # define versions to be used ARG PDAL_VERSION=1.8.0 ARG PROJ_VERSION=5.2.0 @@ -926,6 +968,7 @@ ARG LAZ_PERF_VERSION=1.3.0 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= @@ -940,6 +983,8 @@ ARG LAZ_PERF_VERSION=1.3.0 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD >>>>>>> 12b43eb397 (wxpyimgview: explicit conversion to int (#2704)) @@ -954,6 +999,7 @@ ARG LAZ_PERF_VERSION=1.3.0 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -973,6 +1019,8 @@ ARG LAZ_PERF_VERSION=1.3.0 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -989,6 +1037,7 @@ ARG LAZ_PERF_VERSION=1.3.0 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -1008,6 +1057,8 @@ ARG LAZ_PERF_VERSION=1.3.0 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -1030,6 +1081,7 @@ ARG PDAL_VERSION=2.4.3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 446049deb7 (r.horizon manual - fix typo (#2794)) ======= ======= @@ -1049,6 +1101,8 @@ ARG PDAL_VERSION=2.4.3 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -1063,6 +1117,7 @@ ARG PDAL_VERSION=2.4.3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebf041644a (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD @@ -1132,6 +1187,8 @@ ARG PDAL_VERSION=2.4.3 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main SHELL ["/bin/bash", "-c"] @@ -1171,6 +1228,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD libfreetype6-dev \ ======= @@ -1213,6 +1271,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main libfreetype-dev \ ======= @@ -1232,6 +1292,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= libfreetype6-dev \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1314,6 +1375,11 @@ RUN apt-get update && apt-get upgrade -y && \ ======= libfreetype6-dev \ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + libfreetype6-dev \ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main libgdal-dev \ libgeos-dev \ @@ -1321,6 +1387,7 @@ RUN apt-get update && apt-get upgrade -y && \ libjpeg-dev \ libjsoncpp-dev \ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD libnetcdf-dev \ <<<<<<< HEAD @@ -1381,6 +1448,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= <<<<<<< HEAD ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main libncurses-dev \ libnetcdf-dev \ @@ -1390,6 +1459,9 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD libncurses-dev \ <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1411,6 +1483,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1443,6 +1516,10 @@ RUN apt-get update && apt-get upgrade -y && \ >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main +======= +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main ======= libncurses5-dev \ libopenblas-base \ @@ -1461,6 +1538,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1504,6 +1582,9 @@ RUN apt-get update && apt-get upgrade -y && \ >>>>>>> osgeo-main ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main libopenblas-dev \ libopenjp2-7 \ @@ -1534,6 +1615,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1603,6 +1685,10 @@ RUN apt-get update && apt-get upgrade -y && \ libproj-dev \ ======= >>>>>>> osgeo-main +======= + libproj-dev \ +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1628,6 +1714,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1723,6 +1810,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main libpython3-all-dev \ libsqlite3-dev \ @@ -1758,6 +1847,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main proj-bin \ @@ -1879,6 +1969,12 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD python-is-python3 \ >>>>>>> osgeo-main +======= + proj-bin \ + proj-data \ +<<<<<<< HEAD + python-is-python3 \ +>>>>>>> osgeo-main ======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1895,6 +1991,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -1918,6 +2015,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1933,6 +2032,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -1956,6 +2056,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= proj-bin \ proj-data \ @@ -1973,6 +2075,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 08401a0a3a (r.horizon manual - fix typo (#2794)) ======= ======= @@ -1996,6 +2099,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= ======= proj-bin \ @@ -2013,6 +2118,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> osgeo-main @@ -2127,6 +2233,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main python3 \ python3-dateutil \ @@ -2161,6 +2269,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD zlib1g-dev ======= @@ -2203,6 +2312,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main zlib1g-dev \ && apt-get clean all && rm -rf /var/lib/apt/lists/* @@ -2223,6 +2334,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= zlib1g-dev >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2306,6 +2418,11 @@ RUN apt-get update && apt-get upgrade -y && \ zlib1g-dev >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + zlib1g-dev +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main RUN echo LANG="en_US.UTF-8" > /etc/default/locale RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen @@ -2334,6 +2451,7 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2380,6 +2498,8 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2396,6 +2516,7 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2451,6 +2572,8 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## install a more recent projection library for GRASS GIS WORKDIR /src RUN wget -q http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz && \ @@ -2496,6 +2619,7 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2526,6 +2650,8 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2545,6 +2671,7 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -2574,6 +2701,8 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -2591,6 +2720,7 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2657,6 +2787,8 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## fetch vertical datums for PDAL and store into PROJ dir WORKDIR /src RUN mkdir vdatum && \ @@ -2697,6 +2829,7 @@ RUN mkdir vdatum && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2772,6 +2905,10 @@ RUN mkdir vdatum && \ ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled ======= >>>>>>> osgeo-main +======= +## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled +======= +>>>>>>> osgeo-main ## install pdal >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2794,6 +2931,7 @@ RUN mkdir vdatum && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -2823,6 +2961,8 @@ RUN mkdir vdatum && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ## install pdal ======= ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled @@ -2842,6 +2982,7 @@ RUN mkdir vdatum && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2926,6 +3067,8 @@ RUN mkdir vdatum && \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ENV NUMTHREADS=4 WORKDIR /src RUN wget -q \ @@ -2972,6 +3115,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3034,6 +3178,8 @@ RUN wget -q \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -3054,6 +3200,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3086,6 +3233,8 @@ RUN wget -q \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3102,6 +3251,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3150,6 +3300,8 @@ RUN wget -q \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=ON \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -3175,6 +3327,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3205,6 +3358,8 @@ RUN wget -q \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3223,6 +3378,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= ======= @@ -3284,6 +3440,10 @@ RUN wget -q \ ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -3304,6 +3464,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -3332,6 +3493,8 @@ RUN wget -q \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -3350,6 +3513,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3418,6 +3582,8 @@ RUN wget -q \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main -DWITH_LAZPERF=ON \ -DWITH_TESTS=ON && \ @@ -3452,6 +3618,7 @@ WORKDIR /src/grass_build <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3535,6 +3702,11 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* ======= >>>>>>> osgeo-main +======= +# Cleanup potentially leftover GISRC file with wrong path to "demolocation" +RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3562,6 +3734,7 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3662,6 +3835,8 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Set environmental variables for GRASS GIS compilation, without debug symbols # Set gcc/g++ environmental variables for GRASS GIS compilation, without debug symbols @@ -3734,6 +3909,7 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # Create generic GRASS GIS lib name regardless of version number @@ -3786,6 +3962,8 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/debian/Dockerfile <<<<<<< HEAD:docker/debian/Dockerfile # https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK @@ -3807,6 +3985,7 @@ ENV PROJ_NETWORK=ON <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)):docker/ubuntu/Dockerfile_ubuntu_pdal ======= @@ -3965,6 +4144,14 @@ RUN ln -sf /usr/local/grass85 /usr/local/grass RUN ln -sf /usr/local/grass85 /usr/local/grass ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)):docker/ubuntu/Dockerfile_ubuntu_pdal +# Create generic GRASS GIS lib name regardless of version number +<<<<<<< HEAD +RUN ln -sf /usr/local/grass85 /usr/local/grass +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/debian/Dockerfile <<<<<<< HEAD:docker/debian/Dockerfile <<<<<<< HEAD:docker/debian/Dockerfile @@ -3985,6 +4172,7 @@ RUN ln -sf /usr/local/grass `grass --config path` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4ed9bfe3ea (Dockerfile: fix broken lib link (#1625)) ======= ======= @@ -4018,6 +4206,8 @@ RUN ln -sf /usr/local/grass `grass --config path` ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN ln -sf /usr/local/grass `grass --config path` >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)):docker/ubuntu/Dockerfile_ubuntu_pdal @@ -4032,6 +4222,7 @@ RUN ln -sf /usr/local/grass `grass --config path` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 310f1e65b4 (Dockerfile: fix broken lib link (#1625)) <<<<<<< HEAD <<<<<<< HEAD @@ -4074,6 +4265,9 @@ RUN ln -sf /usr/local/grass `grass --config path` >>>>>>> 310f1e65b4 (Dockerfile: fix broken lib link (#1625)) >>>>>>> osgeo-main ======= +>>>>>>> 310f1e65b4 (Dockerfile: fix broken lib link (#1625)) +>>>>>>> osgeo-main +======= ======= RUN ln -sf /usr/local/grass80 /usr/local/grass >>>>>>> a8e084d159 (Dockerfile Debian: versionless link fix):docker/ubuntu/Dockerfile_ubuntu_pdal @@ -4088,6 +4282,7 @@ RUN ln -sf /usr/local/grass80 /usr/local/grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d59e928d20 (Dockerfile Debian: versionless link fix) <<<<<<< HEAD <<<<<<< HEAD @@ -4130,6 +4325,9 @@ RUN ln -sf /usr/local/grass80 /usr/local/grass >>>>>>> d59e928d20 (Dockerfile Debian: versionless link fix) >>>>>>> osgeo-main ======= +>>>>>>> d59e928d20 (Dockerfile Debian: versionless link fix) +>>>>>>> osgeo-main +======= ======= RUN ln -sf /usr/local/grass80 /usr/local/grass >>>>>>> aac6232e2b (Dockerfile Debian: versionless link fix):docker/ubuntu/Dockerfile_ubuntu_pdal @@ -4144,6 +4342,7 @@ RUN ln -sf /usr/local/grass80 /usr/local/grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 40d5941958 (Dockerfile Debian: versionless link fix) <<<<<<< HEAD <<<<<<< HEAD @@ -4186,6 +4385,9 @@ RUN ln -sf /usr/local/grass80 /usr/local/grass >>>>>>> 40d5941958 (Dockerfile Debian: versionless link fix) >>>>>>> osgeo-main ======= +>>>>>>> 40d5941958 (Dockerfile Debian: versionless link fix) +>>>>>>> osgeo-main +======= ======= # Create generic GRASS GIS lib name regardless of version number RUN ln -sf /usr/local/grass83 /usr/local/grass @@ -4201,6 +4403,7 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12b43eb397 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD @@ -4243,6 +4446,9 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass >>>>>>> 12b43eb397 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ======= +>>>>>>> 12b43eb397 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= ======= # Create generic GRASS GIS lib name regardless of version number RUN ln -sf /usr/local/grass83 /usr/local/grass @@ -4259,6 +4465,7 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4319,6 +4526,8 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # show GRASS GIS, PROJ, GDAL etc versions RUN grass --tmp-project EPSG:4326 --exec g.version -rge && \ @@ -4345,6 +4554,7 @@ WORKDIR /scripts <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4405,6 +4615,8 @@ RUN pip3 install grass-session >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # enable GRASS GIS Python session support ## grass --config python-path ENV PYTHONPATH "/usr/local/grass/etc/python:${PYTHONPATH}" @@ -4425,6 +4637,7 @@ ENV LD_LIBRARY_PATH "/usr/local/grass/lib:$LD_LIBRARY_PATH" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD RUN pip3 install grass-session --break-system-packages ======= ======= @@ -4524,6 +4737,8 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main RUN pip3 install grass-session --break-system-packages ======= ======= @@ -4546,6 +4761,7 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -4611,6 +4827,8 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -4621,6 +4839,9 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension extension=r.in.pdal <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4648,6 +4869,7 @@ ENV LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GISBASE/lib" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4679,6 +4901,8 @@ ENV LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GISBASE/lib" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main WORKDIR /tmp COPY docker/testdata/simple.laz . @@ -4697,6 +4921,7 @@ COPY docker/testdata/test_grass_session.py . <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4725,6 +4950,8 @@ COPY docker/testdata/test_grass_session.py . >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## run GRASS GIS python session and scan the test LAZ file RUN python /scripts/test_grass_session.py RUN rm -rf /tmp/grasstest_epsg_25832 @@ -4741,6 +4968,7 @@ RUN grass --tmp-project EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" outp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4965,6 +5193,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## just scan the LAZ file # Not yet ready for GRASS GIS 8: #RUN /usr/bin/python3 /scripts/test_grass_session.py @@ -4993,6 +5223,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625)) ======= ======= @@ -5012,6 +5243,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)):docker/ubuntu/Dockerfile_ubuntu_pdal @@ -5026,6 +5259,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b4039859b5 (Dockerfile: fix broken lib link (#1625)) ======= ======= @@ -5045,6 +5279,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -5059,6 +5295,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -5078,6 +5315,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5092,6 +5331,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -5111,6 +5351,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -5125,6 +5367,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 488180fefd (Fix missing function prototypes (#2727)) ======= ======= @@ -5144,6 +5387,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s ======= @@ -5160,6 +5405,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebf041644a (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD @@ -5248,6 +5494,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main WORKDIR /grassdb VOLUME /grassdb diff --git a/docker/testdata/test_grass_session.py b/docker/testdata/test_grass_session.py index 8f793c543f0..a014b408e81 100644 --- a/docker/testdata/test_grass_session.py +++ b/docker/testdata/test_grass_session.py @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -39,6 +40,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Import GRASS GIS Python bindings (requires 8.4+) and test r.in.pdal # PYTHONPATH=$(grass --config python-path) python @@ -53,6 +56,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -110,6 +114,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # Import GRASS Python bindings # https://github.com/zarch/grass-session <<<<<<< HEAD @@ -129,6 +135,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4ed9bfe3ea (Dockerfile: fix broken lib link (#1625)) ======= ======= @@ -157,6 +164,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)) >>>>>>> 310f1e65b4 (Dockerfile: fix broken lib link (#1625)) @@ -170,6 +179,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> e946d8e472 (Dockerfile: fix broken lib link (#1625)) ======= >>>>>>> osgeo-main @@ -229,6 +239,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main import grass.script as gs diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 007a75a3fb1..d879d15c4b5 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -16,6 +16,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" @@ -52,12 +53,17 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # syntax=docker/dockerfile:1.10@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5 ======= ======= >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -72,6 +78,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main >>>>>>> main ======= @@ -86,6 +93,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # syntax=docker/dockerfile:1.8@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd ======= ======= @@ -98,6 +107,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # syntax=docker/dockerfile:1.8@sha256:d6d396f3780b1dd56a3acbc975f57bd2fc501989b50164c41387c42d04e780d0 <<<<<<< HEAD <<<<<<< HEAD @@ -161,6 +171,9 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" # syntax=docker/dockerfile:1.8@sha256:d6d396f3780b1dd56a3acbc975f57bd2fc501989b50164c41387c42d04e780d0 >>>>>>> osgeo-main ======= +# syntax=docker/dockerfile:1.8@sha256:d6d396f3780b1dd56a3acbc975f57bd2fc501989b50164c41387c42d04e780d0 +>>>>>>> osgeo-main +======= ======= >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -174,6 +187,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -219,13 +233,18 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile. # Changes to this file must be copied over to the other file. ARG GUI=without -FROM ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe as common_start +FROM ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 as common_start LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Stefan Blumentrath" ======= @@ -247,6 +266,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -276,6 +296,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" @@ -294,6 +316,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -336,6 +359,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LABEL maintainer="tawalika@mundialis.de,neteler@mundialis.de,weinmann@mundialis.de" ENV DEBIAN_FRONTEND noninteractive @@ -364,6 +389,7 @@ ENV DEBIAN_FRONTEND noninteractive <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # define versions to be used (PDAL is not available on Ubuntu/Debian, so we compile it here) @@ -400,6 +426,8 @@ ARG PDAL_VERSION=2.4.3 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -437,6 +465,7 @@ ARG PDAL_VERSION=2.4.3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -575,6 +604,8 @@ ARG PDAL_VERSION=2.4.3 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main SHELL ["/bin/bash", "-c"] WORKDIR /tmp @@ -596,6 +627,7 @@ WORKDIR /tmp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -637,6 +669,8 @@ WORKDIR /tmp >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ARG GUI # Todo: re-consider required dev packages for addons (~400MB in dev packages) @@ -654,6 +688,7 @@ RUN apt-get update && apt-get upgrade -y && \ bzip2 \ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -832,6 +867,8 @@ RUN apt-get update && apt-get upgrade -y && \ >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cmake \ <<<<<<< HEAD @@ -839,6 +876,9 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -864,6 +904,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -904,6 +945,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main geos-bin \ git \ @@ -971,6 +1014,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1039,6 +1083,10 @@ RUN apt-get update && apt-get upgrade -y && \ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main git \ language-pack-en-base \ @@ -1105,6 +1153,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1195,6 +1244,11 @@ RUN apt-get update && apt-get upgrade -y && \ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main unzip \ vim \ @@ -1217,6 +1271,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1257,6 +1312,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main zlib1g \ " @@ -1460,6 +1517,7 @@ WORKDIR /src/grass_build <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1528,6 +1586,10 @@ WORKDIR /src/grass_build ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main zlib1g-dev @@ -1553,6 +1615,7 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1625,6 +1688,10 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen ======= <<<<<<< HEAD >>>>>>> osgeo-main +======= +======= +<<<<<<< HEAD +>>>>>>> osgeo-main ## install laz-perf (missing from https://packages.ubuntu.com/) RUN apt-get install cmake WORKDIR /src @@ -1651,6 +1718,7 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -1740,6 +1808,11 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main ## fetch vertical datums for PDAL and store into PROJ dir WORKDIR /src RUN mkdir vdatum && \ @@ -1775,6 +1848,7 @@ RUN mkdir vdatum && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled @@ -1853,6 +1927,11 @@ RUN mkdir vdatum && \ ======= <<<<<<< HEAD >>>>>>> osgeo-main +======= +## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled +======= +<<<<<<< HEAD +>>>>>>> osgeo-main ## install pdal ======= ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled @@ -1872,6 +1951,7 @@ RUN mkdir vdatum && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1926,6 +2006,8 @@ RUN mkdir vdatum && \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ENV NUMTHREADS=4 WORKDIR /src RUN wget -q \ @@ -1969,6 +2051,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2005,6 +2088,8 @@ RUN wget -q \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -2025,6 +2110,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2094,6 +2180,10 @@ RUN wget -q \ ======= ======= <<<<<<< HEAD +>>>>>>> osgeo-main +======= +======= +<<<<<<< HEAD >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=ON \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -2113,6 +2203,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -2141,6 +2232,8 @@ RUN wget -q \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -2162,6 +2255,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2221,6 +2315,8 @@ RUN wget -q \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main -DWITH_LAZPERF=ON \ -DWITH_TESTS=ON && \ @@ -2252,6 +2348,7 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -2343,6 +2440,11 @@ RUN rm -f /src/grass_build/dist.*/demolocation/.grassrc* ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main # Set environmental variables for GRASS GIS compilation, without debug symbols # Set gcc/g++ environmental variables for GRASS GIS compilation, without debug symbols ENV MYCFLAGS "-O2 -std=gnu99 -m64" @@ -2366,6 +2468,7 @@ ENV MYLDFLAGS "-s" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2388,6 +2491,8 @@ ENV MYLDFLAGS "-s" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ENV LD_LIBRARY_PATH "/usr/local/lib" ======= ======= @@ -2403,6 +2508,7 @@ ENV LD_LIBRARY_PATH "/usr/local/lib" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main <<<<<<< HEAD @@ -2455,6 +2561,8 @@ ENV LD_LIBRARY_PATH "/usr/local/lib" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #ENV LD_LIBRARY_PATH "/usr/local/lib" ======= ENV LD_LIBRARY_PATH "/usr/local/lib" @@ -2473,6 +2581,7 @@ ENV LD_LIBRARY_PATH "/usr/local/lib" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ENV LD_LIBRARY_PATH "/usr/local/lib" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2527,6 +2636,9 @@ ENV LD_LIBRARY_PATH "/usr/local/lib" >>>>>>> 12b43eb397 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ======= +>>>>>>> 12b43eb397 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= ======= ENV LD_LIBRARY_PATH "/usr/local/lib" >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2542,6 +2654,7 @@ ENV LD_LIBRARY_PATH "/usr/local/lib" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2578,6 +2691,8 @@ ENV LD_LIBRARY_PATH "/usr/local/lib" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ENV LDFLAGS "$MYLDFLAGS" ENV CFLAGS "$MYCFLAGS" ENV CXXFLAGS "$MYCXXFLAGS" @@ -2602,6 +2717,7 @@ RUN make distclean || echo "nothing to clean" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2643,6 +2759,8 @@ RUN make distclean || echo "nothing to clean" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main RUN ./configure $GRASS_CONFIG \ && make -j $NUMTHREADS \ && make install && ldconfig \ @@ -2728,6 +2846,7 @@ VOLUME /grassdb <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2743,6 +2862,10 @@ CMD ["$GRASSBIN", "--version"] CMD ["$GRASSBIN", "--version"] ======= >>>>>>> osgeo-main +======= +CMD ["$GRASSBIN", "--version"] +======= +>>>>>>> osgeo-main CMD ["bash", "-c", "$GRASSBIN", "--version"] ======= ======= @@ -2752,6 +2875,7 @@ CMD ["bash", "-c", "$GRASSBIN", "--version"] <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3023,6 +3147,8 @@ CMD ["bash", "-c", "$GRASSBIN", "--version"] >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main RUN /src/grass_build/configure \ --with-cxx \ --enable-largefile \ @@ -3112,6 +3238,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # test LAZ file RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g >>>>>>> ebf041644a (r.horizon manual - fix typo (#2794)) @@ -3140,6 +3267,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s ======= # test LAZ file @@ -3164,6 +3293,7 @@ VOLUME /grassdb <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -3187,6 +3317,8 @@ VOLUME /grassdb ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704)) @@ -3200,6 +3332,7 @@ VOLUME /grassdb <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -3263,3 +3396,5 @@ VOLUME /grassdb >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main diff --git a/docker/ubuntu_wxgui/Dockerfile b/docker/ubuntu_wxgui/Dockerfile index c9ea419ee5d..02f847ee12a 100644 --- a/docker/ubuntu_wxgui/Dockerfile +++ b/docker/ubuntu_wxgui/Dockerfile @@ -19,6 +19,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main FROM ubuntu:22.04 @@ -44,12 +45,22 @@ FROM ubuntu:22.04@sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b ======= ======= >>>>>>> osgeo-main +======= +FROM ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 +======= +======= +>>>>>>> 981b1a43cf (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD +>>>>>>> osgeo-main FROM ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe ======= ======= >>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -61,6 +72,7 @@ FROM ubuntu:22.04@sha256:adbb90115a21969d2fe6fa7f9af4253e16d45f8d4c1e930182610c4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main FROM ubuntu:22.04@sha256:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 ======= @@ -116,6 +128,8 @@ FROM ubuntu:22.04@sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main FROM ubuntu:22.04@sha256:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 ======= ======= @@ -127,6 +141,7 @@ FROM ubuntu:22.04@sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727)) ======= ======= @@ -162,6 +177,10 @@ FROM ubuntu:22.04@sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5 ======= >>>>>>> 17e5fe5619 (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 17e5fe5619 (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main <<<<<<< HEAD FROM ubuntu:22.04@sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b0761bbfb2 >>>>>>> 95125e7509 (Fix missing function prototypes (#2727)) @@ -173,6 +192,7 @@ FROM ubuntu:22.04@sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 488180fefd (Fix missing function prototypes (#2727)) ======= <<<<<<< HEAD @@ -201,6 +221,11 @@ FROM ubuntu:22.04@sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b >>>>>>> 2c0ff799c3 (Fix missing function prototypes (#2727)) >>>>>>> a3af1d0366 (Fix missing function prototypes (#2727)) >>>>>>> osgeo-main +======= +>>>>>>> 2c0ff799c3 (Fix missing function prototypes (#2727)) +>>>>>>> a3af1d0366 (Fix missing function prototypes (#2727)) +>>>>>>> 3b4a1c4066 (Fix missing function prototypes (#2727)) +>>>>>>> osgeo-main <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile @@ -219,6 +244,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> osgeo-main FROM ubuntu:22.04@sha256:a6d2b38300ce017add71440577d5b0a90460d0e57fd7aec21dd0d1b0761bbfb2 @@ -255,6 +281,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)):docker/debian/Dockerfile_debian_pdal ======= @@ -274,6 +302,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= FROM ubuntu:22.04 @@ -364,6 +393,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" @@ -374,6 +405,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD <<<<<<< HEAD @@ -428,6 +460,9 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann" >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) >>>>>>> osgeo-main ======= +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +>>>>>>> osgeo-main +======= FROM ubuntu:22.04 LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" @@ -438,6 +473,7 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= >>>>>>> osgeo-main @@ -456,6 +492,8 @@ LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo" >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main LABEL maintainer="tawalika@mundialis.de,neteler@mundialis.de,weinmann@mundialis.de" ENV DEBIAN_FRONTEND noninteractive @@ -481,6 +519,7 @@ ENV DEBIAN_FRONTEND noninteractive <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -530,6 +569,8 @@ ENV DEBIAN_FRONTEND noninteractive >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # define versions to be used (PDAL is not available on Ubuntu/Debian, so we compile it here) # https://github.com/PDAL/PDAL/releases <<<<<<< HEAD @@ -591,6 +632,7 @@ ARG PDAL_VERSION=2.7.1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -650,6 +692,8 @@ ARG PDAL_VERSION=2.7.1 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ARG PDAL_VERSION=2.4.3 ======= # define versions to be used @@ -669,6 +713,7 @@ ARG LAZ_PERF_VERSION=3.2.0 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 95125e7509 (Fix missing function prototypes (#2727)) >>>>>>> 446049deb7 (r.horizon manual - fix typo (#2794)) ======= @@ -692,6 +737,8 @@ ARG LAZ_PERF_VERSION=3.2.0 ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= # define versions to be used (PDAL is not available on Ubuntu/Debian, so we compile it here) # https://github.com/PDAL/PDAL/releases ARG PDAL_VERSION=2.4.3 @@ -707,6 +754,7 @@ ARG PDAL_VERSION=2.4.3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ab7a7d8f0a (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD >>>>>>> osgeo-main @@ -744,6 +792,9 @@ ARG PDAL_VERSION=2.4.3 >>>>>>> ab7a7d8f0a (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main ======= +>>>>>>> ab7a7d8f0a (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= ======= # define versions to be used (PDAL is not available on Ubuntu/Debian, so we compile it here) # https://github.com/PDAL/PDAL/releases @@ -761,6 +812,7 @@ ARG PDAL_VERSION=2.4.3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -815,6 +867,8 @@ ARG PDAL_VERSION=2.7.1 >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main SHELL ["/bin/bash", "-c"] @@ -885,6 +939,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main libnotify4 \ @@ -994,6 +1049,22 @@ RUN apt-get update && apt-get upgrade -y && \ libnotify4 \ ======= >>>>>>> osgeo-main +======= + libnetcdf-dev \ +======= +======= +>>>>>>> a3af1d0366 (Fix missing function prototypes (#2727)) +======= +>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794)) +<<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile +<<<<<<< HEAD +>>>>>>> 73cc5e30fa (Dockerfile: fix broken lib link (#1625)) +======= +<<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile +>>>>>>> 4385ab760c (Dockerfile: fix broken lib link (#1625)) + libnotify4 \ +======= +>>>>>>> osgeo-main >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)):docker/debian/Dockerfile_debian_pdal ======= >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)):docker/debian/Dockerfile_debian_pdal @@ -1017,6 +1088,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1112,6 +1184,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main libopenblas-base \ libopenblas-dev \ @@ -1171,6 +1245,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD zlib1g-dev ======= @@ -1213,6 +1288,8 @@ RUN apt-get update && apt-get upgrade -y && \ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main zlib1g-dev \ && apt-get clean all && rm -rf /var/lib/apt/lists/* @@ -1233,6 +1310,7 @@ RUN apt-get update && apt-get upgrade -y && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= zlib1g-dev >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -1316,6 +1394,11 @@ RUN apt-get update && apt-get upgrade -y && \ zlib1g-dev >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= + zlib1g-dev +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main # wxGUI RUN pip install -U \ @@ -1354,6 +1437,7 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1408,6 +1492,8 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile @@ -1430,6 +1516,7 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ## install a more recent projection library for GRASS GIS >>>>>>> aac6232e2b (Dockerfile Debian: versionless link fix):docker/debian/Dockerfile_debian_pdal @@ -1521,6 +1608,11 @@ RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen ## install a more recent projection library for GRASS GIS >>>>>>> aac6232e2b (Dockerfile Debian: versionless link fix):docker/debian/Dockerfile_debian_pdal >>>>>>> osgeo-main +======= +======= +## install a more recent projection library for GRASS GIS +>>>>>>> aac6232e2b (Dockerfile Debian: versionless link fix):docker/debian/Dockerfile_debian_pdal +>>>>>>> osgeo-main WORKDIR /src RUN wget -q http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz && \ tar xzf proj-${PROJ_VERSION}.tar.gz && \ @@ -1548,6 +1640,7 @@ RUN wget -q http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ## install laz-perf (missing from https://packages.ubuntu.com/) >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -1624,6 +1717,11 @@ RUN wget -q http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz && \ ## install laz-perf (missing from https://packages.ubuntu.com/) >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) >>>>>>> osgeo-main +======= +======= +## install laz-perf (missing from https://packages.ubuntu.com/) +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +>>>>>>> osgeo-main RUN apt-get install cmake WORKDIR /src RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz -O laz-perf-${LAZ_PERF_VERSION}.tar.gz && \ @@ -1654,6 +1752,7 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1690,6 +1789,8 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625)):docker/debian/Dockerfile_debian_pdal ======= @@ -1709,6 +1810,7 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -1732,6 +1834,8 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -1749,6 +1853,7 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -1845,6 +1950,10 @@ RUN wget -q https://github.com/hobu/laz-perf/archive/${LAZ_PERF_VERSION}.tar.gz ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main ## fetch vertical datums for PDAL and store into PROJ dir WORKDIR /src RUN mkdir vdatum && \ @@ -1882,6 +1991,7 @@ RUN mkdir vdatum && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1948,6 +2058,10 @@ RUN mkdir vdatum && \ ## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled ======= >>>>>>> osgeo-main +======= +## compile and install PDAL (not available on Debian/Ubuntu) with laz-perf enabled +======= +>>>>>>> osgeo-main ## install pdal >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -1970,6 +2084,7 @@ RUN mkdir vdatum && \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2048,6 +2163,8 @@ RUN mkdir vdatum && \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ENV NUMTHREADS=4 WORKDIR /src RUN wget -q \ @@ -2091,6 +2208,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2175,6 +2293,10 @@ RUN wget -q \ ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -2196,6 +2318,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= @@ -2252,6 +2375,9 @@ RUN wget -q \ >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main -DBUILD_PLUGIN_PGPOINTCLOUD=ON \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -2272,6 +2398,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 08401a0a3a (r.horizon manual - fix typo (#2794)) ======= @@ -2300,6 +2427,8 @@ RUN wget -q \ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= -DBUILD_PLUGIN_PGPOINTCLOUD=OFF \ -DBUILD_PGPOINTCLOUD_TESTS=OFF \ @@ -2320,6 +2449,7 @@ RUN wget -q \ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -2394,6 +2524,10 @@ RUN wget -q \ ======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main -DWITH_LAZPERF=ON \ -DWITH_TESTS=ON && \ @@ -2484,6 +2618,7 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main # Create generic GRASS GIS lib name regardless of version number @@ -2536,6 +2671,8 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile # https://proj.org/usage/environmentvars.html#envvar-PROJ_NETWORK @@ -2557,6 +2694,7 @@ ENV PROJ_NETWORK=ON <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)):docker/debian/Dockerfile_debian_pdal ======= @@ -2715,6 +2853,14 @@ RUN ln -sf /usr/local/grass85 /usr/local/grass RUN ln -sf /usr/local/grass85 /usr/local/grass ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)):docker/debian/Dockerfile_debian_pdal +# Create generic GRASS GIS lib name regardless of version number +<<<<<<< HEAD +RUN ln -sf /usr/local/grass85 /usr/local/grass +======= +>>>>>>> osgeo-main <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile <<<<<<< HEAD:docker/ubuntu_wxgui/Dockerfile @@ -2735,6 +2881,7 @@ RUN ln -sf /usr/local/grass `grass --config path` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4ed9bfe3ea (Dockerfile: fix broken lib link (#1625)) ======= ======= @@ -2768,6 +2915,8 @@ RUN ln -sf /usr/local/grass `grass --config path` ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN ln -sf /usr/local/grass `grass --config path` >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)):docker/debian/Dockerfile_debian_pdal @@ -2782,6 +2931,7 @@ RUN ln -sf /usr/local/grass `grass --config path` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 310f1e65b4 (Dockerfile: fix broken lib link (#1625)) <<<<<<< HEAD <<<<<<< HEAD @@ -2824,6 +2974,9 @@ RUN ln -sf /usr/local/grass `grass --config path` >>>>>>> 310f1e65b4 (Dockerfile: fix broken lib link (#1625)) >>>>>>> osgeo-main ======= +>>>>>>> 310f1e65b4 (Dockerfile: fix broken lib link (#1625)) +>>>>>>> osgeo-main +======= ======= RUN ln -sf /usr/local/grass80 /usr/local/grass >>>>>>> a8e084d159 (Dockerfile Debian: versionless link fix):docker/debian/Dockerfile_debian_pdal @@ -2838,6 +2991,7 @@ RUN ln -sf /usr/local/grass80 /usr/local/grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> d59e928d20 (Dockerfile Debian: versionless link fix) <<<<<<< HEAD <<<<<<< HEAD @@ -2880,6 +3034,9 @@ RUN ln -sf /usr/local/grass80 /usr/local/grass >>>>>>> d59e928d20 (Dockerfile Debian: versionless link fix) >>>>>>> osgeo-main ======= +>>>>>>> d59e928d20 (Dockerfile Debian: versionless link fix) +>>>>>>> osgeo-main +======= ======= RUN ln -sf /usr/local/grass80 /usr/local/grass >>>>>>> aac6232e2b (Dockerfile Debian: versionless link fix):docker/debian/Dockerfile_debian_pdal @@ -2894,6 +3051,7 @@ RUN ln -sf /usr/local/grass80 /usr/local/grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 40d5941958 (Dockerfile Debian: versionless link fix) <<<<<<< HEAD <<<<<<< HEAD @@ -2936,6 +3094,9 @@ RUN ln -sf /usr/local/grass80 /usr/local/grass >>>>>>> 40d5941958 (Dockerfile Debian: versionless link fix) >>>>>>> osgeo-main ======= +>>>>>>> 40d5941958 (Dockerfile Debian: versionless link fix) +>>>>>>> osgeo-main +======= ======= # Create generic GRASS GIS lib name regardless of version number RUN ln -sf /usr/local/grass83 /usr/local/grass @@ -2951,6 +3112,7 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 95125e7509 (Fix missing function prototypes (#2727)) <<<<<<< HEAD <<<<<<< HEAD @@ -2993,6 +3155,9 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass >>>>>>> 95125e7509 (Fix missing function prototypes (#2727)) >>>>>>> osgeo-main ======= +>>>>>>> 95125e7509 (Fix missing function prototypes (#2727)) +>>>>>>> osgeo-main +======= ======= # Create generic GRASS GIS lib name regardless of version number RUN ln -sf /usr/local/grass83 /usr/local/grass @@ -3009,6 +3174,7 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3069,6 +3235,8 @@ RUN ln -sf /usr/local/grass83 /usr/local/grass >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main # show GRASS GIS, PROJ, GDAL etc versions RUN grass --tmp-project EPSG:4326 --exec g.version -rge && \ @@ -3106,6 +3274,7 @@ COPY docker/testdata/test_grass_session.py . <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3134,6 +3303,8 @@ COPY docker/testdata/test_grass_session.py . >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## run GRASS GIS python session and scan the test LAZ file RUN python /scripts/test_grass_session.py RUN rm -rf /tmp/grasstest_epsg_25832 @@ -3150,6 +3321,7 @@ RUN grass --tmp-project EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" outp <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3324,6 +3496,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ## just scan the LAZ file # Not yet ready for GRASS GIS 8: #RUN /usr/bin/python3 /scripts/test_grass_session.py @@ -3350,6 +3524,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625)) ======= ======= @@ -3369,6 +3544,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -s >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625)):docker/debian/Dockerfile_debian_pdal @@ -3383,6 +3560,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b4039859b5 (Dockerfile: fix broken lib link (#1625)) ======= ======= @@ -3402,6 +3580,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -3416,6 +3596,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 488180fefd (Fix missing function prototypes (#2727)) ======= ======= @@ -3435,6 +3616,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= # test LAZ file RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" output="count_1" method="n" resolution=1 -g @@ -3448,6 +3631,7 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebf041644a (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD @@ -3513,6 +3697,8 @@ RUN grass --tmp-location EPSG:25832 --exec r.in.pdal input="/tmp/simple.laz" out >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main WORKDIR /grassdb VOLUME /grassdb diff --git a/general/g.filename/main.c b/general/g.filename/main.c index 8639a42463f..9f27fa6b33e 100644 --- a/general/g.filename/main.c +++ b/general/g.filename/main.c @@ -96,6 +96,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -129,6 +130,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* Create element directory if requested and in current mapset. */ @@ -171,6 +174,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -196,6 +200,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* Create element directory if requested and in current mapset. */ @@ -222,6 +228,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -344,6 +351,9 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_file_name(path, element, name, mapset); diff --git a/general/g.findfile/g.findfile.html b/general/g.findfile/g.findfile.html index c75c73957bb..c970f0e9016 100644 --- a/general/g.findfile/g.findfile.html +++ b/general/g.findfile/g.findfile.html @@ -99,6 +99,7 @@

    PYTHON

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -174,6 +175,10 @@

    PYTHON

    See Python ======= >>>>>>> osgeo-main +======= +See Python +======= +>>>>>>> osgeo-main See Python >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -196,6 +201,7 @@

    PYTHON

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= See     Python >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -321,6 +327,11 @@

    PYTHON

    See     Python >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +See Python +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Scripting Library for more info.

    Note: The Python tab in the wxGUI can be used for entering the diff --git a/general/g.findfile/local_proto.h b/general/g.findfile/local_proto.h index 8be2f2c81bc..900f98a788d 100644 --- a/general/g.findfile/local_proto.h +++ b/general/g.findfile/local_proto.h @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main void list_elements(void); @@ -72,6 +73,8 @@ int check_element(const char *); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void list_elements(void); /* int check_element(const char *); */ ======= @@ -91,6 +94,7 @@ void list_elements(); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -114,6 +118,8 @@ void list_elements(); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= void list_elements(void); >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= @@ -134,6 +140,7 @@ void list_elements(void); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -180,6 +187,8 @@ void list_elements(void); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int check_element(const char *); <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -197,6 +206,7 @@ int check_element(const char *); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -254,3 +264,5 @@ int check_element(const char *); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main diff --git a/general/g.gisenv/g.gisenv.html b/general/g.gisenv/g.gisenv.html index 583e2fef78c..eea14f3e9a9 100644 --- a/general/g.gisenv/g.gisenv.html +++ b/general/g.gisenv/g.gisenv.html @@ -163,6 +163,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD variables are stored in <gisdbase>/<location>/<mapset>/VAR after the current GRASS session is closed. @@ -246,6 +247,11 @@

    NOTES

    variables are stored in <gisdbase>/<project>/<mapset>/VAR after the current GRASS session is closed. +>>>>>>> osgeo-main +======= +variables are stored in <gisdbase>/<project>/<mapset>/VAR +after the current GRASS session is closed. + >>>>>>> osgeo-main <<<<<<< HEAD

    EXAMPLES

    @@ -277,6 +283,9 @@

    Number of threads for parallel computing

    ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -297,6 +306,7 @@

    Number of threads for parallel computing

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -373,6 +383,8 @@

    Number of threads for parallel computing

    ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -380,6 +392,9 @@

    Number of threads for parallel computing

    >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -389,6 +404,7 @@

    Number of threads for parallel computing

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 08401a0a3a (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 10cb905c76 (r.horizon manual - fix typo (#2794)) @@ -397,6 +413,9 @@

    Number of threads for parallel computing

    >>>>>>> 10cb905c76 (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main ======= +>>>>>>> 10cb905c76 (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= ======= ======= @@ -404,6 +423,7 @@

    Number of threads for parallel computing

    >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> osgeo-main @@ -465,6 +485,9 @@

    Number of threads for parallel computing

    ======= >>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +>>>>>>> bb9e769d49 (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main

    GRASS Debugging

    To print debugging messages, the variable DEBUG must be set to level diff --git a/general/g.gui/g.gui.html b/general/g.gui/g.gui.html index 6d7b3cdf53f..a677a776d4e 100644 --- a/general/g.gui/g.gui.html +++ b/general/g.gui/g.gui.html @@ -29,6 +29,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -104,6 +105,10 @@

    DESCRIPTION

    GRASS GIS comes with both a wxPython-based GUI ======= >>>>>>> osgeo-main +======= +GRASS GIS comes with both a wxPython-based GUI +======= +>>>>>>> osgeo-main GRASS GIS 8 comes with both a wxPython-based GUI >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -126,6 +131,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= GRASS GIS comes with both a wxPython-based GUI >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -251,6 +257,11 @@

    DESCRIPTION

    GRASS GIS comes with both a wxPython-based GUI >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +GRASS GIS comes with both a wxPython-based GUI +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main aka wxGUI (ui=wxpython) and command line text-based UI (ui=text). diff --git a/general/g.mapset/main.c b/general/g.mapset/main.c index ff23549b028..3609430d11a 100644 --- a/general/g.mapset/main.c +++ b/general/g.mapset/main.c @@ -66,6 +66,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "mapsets in given location."); ======= @@ -108,6 +109,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "mapsets in given project (location)."); ======= @@ -127,6 +130,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "mapsets in given location."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -209,6 +213,11 @@ int main(int argc, char *argv[]) ======= "mapsets in given location."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "mapsets in given location."); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main opt.mapset = G_define_standard_option(G_OPT_M_MAPSET); diff --git a/general/g.mapsets/list.c b/general/g.mapsets/list.c index 774414f75b6..2e611a93eb3 100644 --- a/general/g.mapsets/list.c +++ b/general/g.mapsets/list.c @@ -22,6 +22,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD void list_available_mapsets(const char **mapset_name, int nmapsets, const char *fs) { @@ -66,6 +67,8 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main // Function to initialize a JSON object with a mapsets array static JSON_Object *initialize_json_object(void) { @@ -90,6 +93,7 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -125,6 +129,8 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int n; @@ -174,6 +180,7 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -211,6 +218,8 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main // Function to serialize and print JSON object static void serialize_and_print_json_object(JSON_Value *root_value) { @@ -259,6 +268,7 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -307,6 +317,9 @@ void list_available_mapsets(const char **mapset_name, int nmapsets, ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main void list_accessible_mapsets(const char *fs) { int n; @@ -332,6 +345,7 @@ void list_accessible_mapsets(const char *fs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -390,6 +404,9 @@ void list_accessible_mapsets(const char *fs) >>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (strcmp(fs, "newline") == 0) fprintf(stdout, "\n"); diff --git a/general/g.mapsets/main.c b/general/g.mapsets/main.c index 9beb10155b6..0a0c3f45476 100644 --- a/general/g.mapsets/main.c +++ b/general/g.mapsets/main.c @@ -87,6 +87,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD @@ -128,6 +129,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main enum OutputFormat format; ======= @@ -147,6 +150,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -228,6 +232,11 @@ int main(int argc, char *argv[]) ======= ======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main char **mapset_name; @@ -281,6 +290,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -307,6 +317,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main opt.format = G_define_standard_option(G_OPT_F_FORMAT); ======= @@ -323,6 +335,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= opt.format = G_define_standard_option(G_OPT_F_FORMAT); @@ -370,6 +383,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main opt.format = G_define_option(); opt.format->key = "format"; @@ -401,6 +416,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -469,6 +485,10 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main opt.fs = G_define_standard_option(G_OPT_F_SEP); opt.fs->label = _("Field separator for printing (-l and -p flags)"); @@ -491,6 +511,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -581,6 +602,11 @@ int main(int argc, char *argv[]) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main opt.list = G_define_flag(); @@ -643,6 +669,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -683,6 +710,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (strcmp(opt.format->answer, "json") == 0) format = JSON; @@ -720,6 +749,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -788,6 +818,10 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fs = G_option_to_separator(opt.fs); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) diff --git a/general/g.message/g.message.html b/general/g.message/g.message.html index 3b588ee2252..aedd1323a9d 100644 --- a/general/g.message/g.message.html +++ b/general/g.message/g.message.html @@ -70,6 +70,7 @@

    Usage in Python scripts

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -145,6 +146,10 @@

    Usage in Python scripts

    GRASS ======= >>>>>>> osgeo-main +======= +GRASS +======= +>>>>>>> osgeo-main GRASS >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -167,6 +172,7 @@

    Usage in Python scripts

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD =======     GRASS >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -292,6 +298,11 @@

    Usage in Python scripts

    GRASS >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +GRASS +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Python Scripting Library defines special wrappers for g.message. diff --git a/general/g.mkfontcap/g.mkfontcap.html b/general/g.mkfontcap/g.mkfontcap.html index f5113fac27f..7ecde07d27b 100644 --- a/general/g.mkfontcap/g.mkfontcap.html +++ b/general/g.mkfontcap/g.mkfontcap.html @@ -69,6 +69,7 @@

    SEE ALSO

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -136,6 +137,10 @@

    SEE ALSO

    >>>>>>> osgeo-main ======= +======= +>>>>>>> osgeo-main +======= + ======= >>>>>>> osgeo-main ======= @@ -165,6 +170,7 @@

    SEE ALSO

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -255,6 +261,8 @@

    SEE ALSO

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main d.font diff --git a/general/g.mkfontcap/main.c b/general/g.mkfontcap/main.c index 87f3c3636f9..0378fd32e3d 100644 --- a/general/g.mkfontcap/main.c +++ b/general/g.mkfontcap/main.c @@ -22,6 +22,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -56,6 +57,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * COPYRIGHT: (C) 2007-2024 by the GRASS Development Team ======= @@ -75,6 +78,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -122,6 +126,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * COPYRIGHT: (C) 2007-2015 by the GRASS Development Team >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -199,6 +205,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -290,6 +297,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main overwrite = G_define_flag(); @@ -313,6 +325,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -403,6 +416,11 @@ int main(int argc, char *argv[]) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main tostdout = G_define_flag(); @@ -451,6 +469,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -491,6 +510,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (!G_get_overwrite()) G_fatal_error(_("Fontcap file %s already exists; use " @@ -512,6 +533,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -580,6 +602,10 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (!overwrite->answer) G_fatal_error( @@ -603,6 +629,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -693,6 +720,11 @@ int main(int argc, char *argv[]) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } } diff --git a/general/g.pnmcomp/main.c b/general/g.pnmcomp/main.c index 29838328597..b8accf368c8 100644 --- a/general/g.pnmcomp/main.c +++ b/general/g.pnmcomp/main.c @@ -91,6 +91,7 @@ static void read_header(FILE *fp, unsigned char *magic, int *maxval) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -181,6 +182,11 @@ static void read_header(FILE *fp, unsigned char *magic, int *maxval) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_fatal_error(_("Invalid PPM file")); diff --git a/general/g.proj/create.c b/general/g.proj/create.c index 0066aa561fe..5dadfdd627a 100644 --- a/general/g.proj/create.c +++ b/general/g.proj/create.c @@ -29,6 +29,7 @@ void create_location(const char *location) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_message(_("Location <%s> created"), location); else if (ret == -1) @@ -73,6 +74,8 @@ void create_location(const char *location) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_message(_("Project <%s> created"), location); else if (ret == -1) @@ -96,6 +99,7 @@ void create_location(const char *location) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -124,6 +128,8 @@ void create_location(const char *location) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= G_message(_("Location <%s> created"), location); else if (ret == -1) @@ -143,6 +149,7 @@ void create_location(const char *location) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -184,6 +191,8 @@ void create_location(const char *location) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main strerror(errno)); else if (ret == -2) @@ -208,6 +217,7 @@ void create_location(const char *location) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -248,6 +258,8 @@ void create_location(const char *location) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_fatal_error(_("Unable to create project <%s>"), location); @@ -268,6 +280,7 @@ void create_location(const char *location) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -336,6 +349,10 @@ void create_location(const char *location) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_fatal_error(_("Unable to create location <%s>"), location); @@ -358,6 +375,7 @@ void create_location(const char *location) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -449,6 +467,11 @@ void create_location(const char *location) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main } void modify_projinfo(void) @@ -475,6 +498,7 @@ void modify_projinfo(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "current location's projection (current mapset is <%s>)"), ======= @@ -517,6 +541,8 @@ void modify_projinfo(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "current project's coordinate reference system" " (current mapset is <%s>)"), @@ -537,6 +563,7 @@ void modify_projinfo(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "current location's projection (current mapset is <%s>)"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -619,6 +646,11 @@ void modify_projinfo(void) ======= "current location's projection (current mapset is <%s>)"), >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "current location's projection (current mapset is <%s>)"), +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main mapset); diff --git a/general/g.proj/g.proj.html b/general/g.proj/g.proj.html index be23413cc45..6e945635d08 100644 --- a/general/g.proj/g.proj.html +++ b/general/g.proj/g.proj.html @@ -28,6 +28,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
  • Reporting the projection information for the current location, either in conventional GRASS (-p flag) or PROJ (-j flag) format
  • Changing the datum, or reporting and modifying the datum transformation @@ -72,6 +73,8 @@

    DESCRIPTION

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
  • Reporting the CRS information for the current project (previously called location), either in conventional GRASS (-p flag) or PROJ (-j flag) format
    • @@ -103,6 +106,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -132,6 +136,8 @@

    DESCRIPTION

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +=======
  • Reporting the projection information for the current location, either in conventional GRASS (-p flag) or PROJ (-j flag) format
  • Changing the datum, or reporting and modifying the datum transformation @@ -150,6 +156,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -192,6 +199,8 @@

    DESCRIPTION

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main parameters, for the current location
    • @@ -234,6 +243,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
    description should be a projection description in ======= <<<<<<< HEAD @@ -276,6 +286,8 @@

    DESCRIPTION

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
    description should be a CRS description in =======
    description should be a projection description in @@ -294,6 +306,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD =======
    description should be a projection description in >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -377,6 +390,11 @@

    DESCRIPTION

    description should be a projection description in >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +
    description should be a projection description in +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main PROJ format, enclosed in quotation marks if there are any spaces. If - is given for description, the PROJ description will be read from stdin rather @@ -426,6 +444,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -467,6 +486,8 @@

    DESCRIPTION

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main create new GRASS CRS files (PROJ_INFO, PROJ_UNITS, WIND and DEFAULT_WIND) based on the imported information. If the project parameter is specified in addition to -c, then a new project will be created. @@ -486,6 +507,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD @@ -555,6 +577,10 @@

    DESCRIPTION

    ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main create new GRASS projection files (PROJ_INFO, PROJ_UNITS, WIND and DEFAULT_WIND) based on the imported information. If the location parameter is specified in addition to -c, then a new location will be created. @@ -594,6 +620,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD used when creating a location, other GRASS modules will use the "default" ======= <<<<<<< HEAD @@ -636,6 +663,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main used when creating a project, other GRASS modules will use the "default" ======= used when creating a location, other GRASS modules will use the "default" @@ -654,6 +683,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= used when creating a location, other GRASS modules will use the "default" >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -737,6 +767,11 @@

    NOTES

    used when creating a location, other GRASS modules will use the "default" >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +used when creating a location, other GRASS modules will use the "default" +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main (likely non-optimum) parameters for this datum if necessary in the future.
    Any other number less than or equal to the number of parameter sets available for this datum: Choose this parameter set and add it to the @@ -764,6 +799,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD

    Output is simply based on the input projection information. g.proj does ======= <<<<<<< HEAD @@ -806,6 +842,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    Output is simply based on the input CRS information. g.proj does =======

    Output is simply based on the input projection information. g.proj does @@ -824,6 +862,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD =======

    Output is simply based on the input projection information. g.proj does >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -907,6 +946,11 @@

    NOTES

    Output is simply based on the input projection information. g.proj does >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +

    Output is simply based on the input projection information. g.proj does +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main not attempt to verify that the co-ordinate system thus described matches an existing system in use in the world. In particular, this means there are no EPSG Authority codes in the WKT output. @@ -1061,6 +1105,7 @@

    SEE ALSO

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1128,6 +1173,10 @@

    SEE ALSO

    >>>>>>> osgeo-main ======= +======= +>>>>>>> osgeo-main +======= + ======= >>>>>>> osgeo-main ======= @@ -1157,6 +1206,7 @@

    SEE ALSO

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1247,6 +1297,8 @@

    SEE ALSO

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main m.proj, r.proj, diff --git a/general/g.proj/input.c b/general/g.proj/input.c index d45b672dc67..feda407c844 100644 --- a/general/g.proj/input.c +++ b/general/g.proj/input.c @@ -142,6 +142,7 @@ int input_wkt(char *wktfile) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -240,6 +241,10 @@ int input_wkt(char *wktfile) ======= ======= >>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582)) >>>>>>> osgeo-main size_t wktlen; @@ -269,6 +274,7 @@ int input_wkt(char *wktfile) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -302,6 +308,8 @@ int input_wkt(char *wktfile) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= <<<<<<< HEAD ======= >>>>>>> 7c10386e82 (g.proj: fix reading input WKT (#1582)) @@ -318,6 +326,7 @@ int input_wkt(char *wktfile) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 398a3c2388 (g.proj: fix reading input WKT (#1582)) @@ -373,6 +382,8 @@ int input_wkt(char *wktfile) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main size_t wktlen; @@ -402,6 +413,7 @@ int input_wkt(char *wktfile) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 250c6900d1 (g.proj: fix reading input WKT (#1582)) ======= @@ -430,6 +442,8 @@ int input_wkt(char *wktfile) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> b3579a4902 (g.proj: fix reading input WKT (#1582)) ======= size_t wktlen; @@ -448,6 +462,7 @@ int input_wkt(char *wktfile) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -476,6 +491,8 @@ int input_wkt(char *wktfile) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= size_t wktlen; @@ -492,6 +509,7 @@ int input_wkt(char *wktfile) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -528,6 +546,8 @@ int input_wkt(char *wktfile) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main wktlen = fread(buff, 1, sizeof(buff), infd); if (wktlen == sizeof(buff)) @@ -556,6 +576,7 @@ int input_wkt(char *wktfile) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -578,6 +599,8 @@ int input_wkt(char *wktfile) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -598,6 +621,7 @@ int input_wkt(char *wktfile) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -666,6 +690,8 @@ int input_wkt(char *wktfile) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } else diff --git a/general/g.proj/main.c b/general/g.proj/main.c index 798e6b662c4..20584a9dfec 100644 --- a/general/g.proj/main.c +++ b/general/g.proj/main.c @@ -79,6 +79,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_no_gisinit(); /* We don't call G_gisinit() here because it validates the * mapset, whereas this module may legitmately be used @@ -123,6 +124,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_no_gisinit(); ======= @@ -144,6 +147,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -172,6 +176,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= G_no_gisinit(); /* We don't call G_gisinit() here because it validates the * mapset, whereas this module may legitmately be used @@ -191,6 +197,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -232,6 +239,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main module = G_define_module(); @@ -257,6 +266,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD module->description = _("Can also be used to create new GRASS locations."); ======= @@ -299,6 +309,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main module->description = _("Can also be used to create new GRASS projects."); ======= @@ -318,6 +330,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= module->description = _("Can also be used to create new GRASS locations."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -401,6 +414,11 @@ int main(int argc, char *argv[]) module->description = _("Can also be used to create new GRASS locations."); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= + module->description = _("Can also be used to create new GRASS locations."); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #else module->description = _("Prints and manipulates GRASS projection information files."); @@ -449,6 +467,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD dontprettify->description = _("Print 'flat' output with no linebreaks (applies to " @@ -497,6 +516,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #ifdef HAVE_OGR dontprettify->description = _("Print 'flat' output with no linebreaks " "(applies to WKT and PROJ.4 output)"); @@ -526,6 +547,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -554,6 +576,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= dontprettify->description = _("Print 'flat' output with no linebreaks (applies to " @@ -576,6 +600,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -618,6 +643,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #ifdef HAVE_OGR printwkt = G_define_flag(); @@ -835,6 +862,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -875,6 +903,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (formats > 1) { #ifdef HAVE_OGR @@ -904,6 +934,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -972,6 +1003,10 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (formats > 1) G_fatal_error(_("Only one of -%c, -%c, -%c, -%c" diff --git a/general/g.proj/output.c b/general/g.proj/output.c index 0609d0335e2..da347c45eb5 100644 --- a/general/g.proj/output.c +++ b/general/g.proj/output.c @@ -294,6 +294,7 @@ void print_wkt(int esristyle, int dontprettify) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G_free(outwkt); ======= @@ -336,6 +337,8 @@ void print_wkt(int esristyle, int dontprettify) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main CPLFree(outwkt); ======= @@ -355,6 +358,7 @@ void print_wkt(int esristyle, int dontprettify) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= G_free(outwkt); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -437,6 +441,11 @@ void print_wkt(int esristyle, int dontprettify) ======= G_free(outwkt); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + G_free(outwkt); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } else diff --git a/general/g.region/g.region.html b/general/g.region/g.region.html index 7e46ea171a1..5e3caa32c3d 100644 --- a/general/g.region/g.region.html +++ b/general/g.region/g.region.html @@ -147,6 +147,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -222,6 +223,10 @@

    NOTES

    without actually modifying the current region. ======= >>>>>>> osgeo-main +======= +without actually modifying the current region. +======= +>>>>>>> osgeo-main without actually modifing the current region. >>>>>>> fbc5f37844 (WMS: replace broken URLs with alternative WMS (#1635)) ======= @@ -244,6 +249,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= without actually modifying the current region. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -369,6 +375,11 @@

    NOTES

    without actually modifying the current region. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +without actually modifying the current region. +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Similarly, -o flag forces to update current region file even when e.g., only printing was specified. Flag -o was added in GRASS GIS version 8 to simulate g.region behavior in prior versions when current region file was @@ -722,6 +733,7 @@

    Using g.region in a shell in combination with GDAL

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -797,6 +809,8 @@

    Using g.region in a shell in combination with GDAL

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) diff --git a/general/g.region/main.c b/general/g.region/main.c index 7947a476b39..c496184a5df 100644 --- a/general/g.region/main.c +++ b/general/g.region/main.c @@ -52,6 +52,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -123,6 +124,10 @@ int main(int argc, char *argv[]) ======= int flat_flag; ======= +>>>>>>> osgeo-main +======= + int flat_flag; +======= >>>>>>> osgeo-main int flat_flag; <<<<<<< HEAD @@ -146,6 +151,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int flat_flag; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -264,6 +270,11 @@ int main(int argc, char *argv[]) ======= int flat_flag; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + int flat_flag; +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main double x, xs, ys, zs; int ival; @@ -301,6 +312,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -340,6 +352,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -357,6 +371,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -410,6 +425,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main struct { struct Flag *noupdate, *force, *print, *gprint, *flprint, *lprint, @@ -435,6 +452,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -497,6 +515,9 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main struct { @@ -520,6 +541,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -543,6 +565,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -560,6 +584,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -613,6 +638,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } flag; struct { @@ -957,6 +984,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -994,6 +1022,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_option_exclusive(flag.noupdate, flag.force, NULL); G_option_requires(flag.noupdate, flag.savedefault, flag.print, flag.lprint, @@ -1031,6 +1061,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> osgeo-main @@ -1167,6 +1198,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= G_option_exclusive(flag.noupdate, flag.force, NULL); G_option_requires(flag.noupdate, flag.savedefault, flag.print, flag.lprint, @@ -1183,6 +1216,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -1207,6 +1241,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= G_option_exclusive(flag.noupdate, flag.force, NULL); G_option_requires(flag.noupdate, flag.savedefault, flag.print, flag.lprint, @@ -1222,6 +1258,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 965183f78e (WMS: replace broken URLs with alternative WMS (#1635)) @@ -1250,6 +1287,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (G_parser(argc, argv)) @@ -1349,6 +1388,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1389,6 +1429,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1406,6 +1448,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1465,6 +1508,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; mapset = G_find_file2("windows", name, ""); @@ -1491,6 +1536,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1590,6 +1636,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; mapset = G_find_file2("windows", name, ""); @@ -1612,6 +1663,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -1635,6 +1687,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1652,6 +1706,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1705,6 +1760,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -1736,6 +1793,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1776,6 +1834,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1793,6 +1853,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1852,6 +1913,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; rast_ptr = parm.raster->answers; @@ -1877,6 +1940,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1976,6 +2040,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; rast_ptr = parm.raster->answers; @@ -1997,6 +2066,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -2020,6 +2090,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2037,6 +2109,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2090,6 +2163,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main strcpy(rast_name, *rast_ptr); @@ -2147,6 +2222,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2191,6 +2267,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if ((mapset = G_find_raster3d(name, "")) == NULL) @@ -2216,6 +2294,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2297,6 +2376,10 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if ((mapset = G_find_raster3d(name, "")) == NULL) @@ -2316,6 +2399,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2344,6 +2428,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= update_file = true; if ((mapset = G_find_raster3d(name, "")) == NULL) @@ -2363,6 +2449,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2391,6 +2478,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= update_file = true; if ((mapset = G_find_raster3d(name, "")) == NULL) @@ -2410,6 +2499,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2457,6 +2547,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (Rast3d_read_region_map(name, mapset, &win) < 0) @@ -2494,6 +2586,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2538,6 +2631,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; vect_ptr = parm.vect->answers; @@ -2563,6 +2658,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2644,6 +2740,10 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; vect_ptr = parm.vect->answers; @@ -2663,6 +2763,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2691,6 +2792,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= update_file = true; vect_ptr = parm.vect->answers; @@ -2710,6 +2813,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2738,6 +2842,8 @@ int main(int argc, char *argv[]) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= update_file = true; vect_ptr = parm.vect->answers; @@ -2757,6 +2863,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2804,6 +2911,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int ret; struct Map_info Map; @@ -2911,6 +3020,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2951,6 +3061,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2968,6 +3080,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3027,6 +3140,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "n+", "n-", "s+"))) { @@ -3071,6 +3186,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3170,6 +3286,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "n+", "n-", "s+"))) { @@ -3207,6 +3328,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -3230,6 +3352,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3247,6 +3371,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3300,6 +3425,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -3329,6 +3456,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3369,6 +3497,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3386,6 +3516,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3445,6 +3576,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "s+", "s-", "n-"))) { @@ -3489,6 +3622,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3588,6 +3722,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "s+", "s-", "n-"))) { @@ -3625,6 +3764,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -3648,6 +3788,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3665,6 +3807,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3718,6 +3861,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -3747,6 +3892,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3787,6 +3933,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3804,6 +3952,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3863,6 +4012,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "e+", "e-", "w+"))) { @@ -3907,6 +4058,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4006,6 +4158,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "e+", "e-", "w+"))) { @@ -4043,6 +4200,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -4066,6 +4224,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4083,6 +4243,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4136,6 +4297,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -4165,6 +4328,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4205,6 +4369,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4222,6 +4388,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4281,6 +4448,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "w+", "w-", "e-"))) { @@ -4325,6 +4494,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4424,6 +4594,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "w+", "w-", "e-"))) { @@ -4461,6 +4636,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -4484,6 +4660,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4501,6 +4679,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4554,6 +4733,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -4583,6 +4764,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4623,6 +4805,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4640,6 +4824,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4699,6 +4884,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "t+", "t-", "b+"))) { @@ -4740,6 +4927,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4839,6 +5027,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "t+", "t-", "b+"))) { @@ -4876,6 +5069,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -4899,6 +5093,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4916,6 +5112,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4969,6 +5166,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -4998,6 +5197,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5038,6 +5238,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5055,6 +5257,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5114,6 +5317,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "b+", "b-", "t-"))) { @@ -5155,6 +5360,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5254,6 +5460,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if ((i = nsew(value, "b+", "b-", "t-"))) { @@ -5291,6 +5502,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -5314,6 +5526,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5331,6 +5545,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5384,6 +5599,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -5413,6 +5630,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5453,6 +5671,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5470,6 +5690,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5529,6 +5750,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -5555,6 +5778,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5654,6 +5878,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -5676,6 +5905,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -5699,6 +5929,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5716,6 +5948,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5769,6 +6002,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (flag.res_set->answer) { @@ -5805,6 +6040,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5845,6 +6081,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5862,6 +6100,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5921,6 +6160,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -5948,6 +6189,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6047,6 +6289,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -6070,6 +6317,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -6093,6 +6341,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6110,6 +6360,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6163,6 +6414,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -6192,6 +6445,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6232,6 +6486,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6249,6 +6505,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6308,6 +6565,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -6333,6 +6592,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6432,6 +6692,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -6453,6 +6718,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -6476,6 +6742,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6493,6 +6761,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6546,6 +6815,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (flag.res_set->answer) { @@ -6580,6 +6851,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6620,6 +6892,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6637,6 +6911,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6696,6 +6971,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -6721,6 +6998,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6820,6 +7098,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if (!G_scan_resolution(value, &x, window.proj)) @@ -6841,6 +7124,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -6864,6 +7148,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6881,6 +7167,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6934,6 +7221,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (flag.res_set->answer) { @@ -6968,6 +7257,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7008,6 +7298,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7025,6 +7317,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7084,6 +7377,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if (sscanf(value, "%lf", &x) != 1) @@ -7109,6 +7404,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7208,6 +7504,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if (sscanf(value, "%lf", &x) != 1) @@ -7229,6 +7530,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -7252,6 +7554,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7269,6 +7573,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7322,6 +7627,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (flag.res_set->answer) { @@ -7356,6 +7663,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7396,6 +7704,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7413,6 +7723,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7472,6 +7783,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if (sscanf(value, "%i", &ival) != 1) @@ -7498,6 +7811,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7597,6 +7911,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if (sscanf(value, "%i", &ival) != 1) @@ -7619,6 +7938,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -7642,6 +7962,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7659,6 +7981,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7712,6 +8035,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -7741,6 +8066,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7781,6 +8107,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7798,6 +8126,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7857,6 +8186,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; if (sscanf(value, "%i", &ival) != 1) @@ -7883,6 +8214,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7982,6 +8314,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; if (sscanf(value, "%i", &ival) != 1) @@ -8004,6 +8341,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -8027,6 +8365,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8044,6 +8384,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8097,6 +8438,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -8126,6 +8469,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8166,6 +8510,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8183,6 +8529,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8242,6 +8589,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; mapset = G_find_raster2(name, ""); @@ -8268,6 +8617,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8367,6 +8717,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; mapset = G_find_raster2(name, ""); @@ -8389,6 +8744,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -8412,6 +8768,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8429,6 +8787,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8482,6 +8841,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -8511,6 +8872,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8573,6 +8935,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = true; mapset = G_find_raster2(name, ""); @@ -8595,6 +8959,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8658,6 +9023,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = true; mapset = G_find_raster2(name, ""); @@ -8675,6 +9045,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -8693,6 +9064,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -8718,6 +9091,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= update_file = true; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -8776,6 +9150,11 @@ int main(int argc, char *argv[]) ======= update_file = true; >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + update_file = true; +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main mapset = G_find_raster2(name, ""); if (!mapset) @@ -8792,6 +9171,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8947,6 +9327,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -8963,6 +9345,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -9022,6 +9405,10 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main xs = window.ns_res * pix; if (window.north + xs > window.south - xs) { @@ -9091,6 +9478,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9131,6 +9519,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -9148,6 +9538,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9207,6 +9598,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main update_file = false; temp_window = window; @@ -9233,6 +9626,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9332,6 +9726,11 @@ int main(int argc, char *argv[]) ======= ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) >>>>>>> osgeo-main update_file = false; temp_window = window; @@ -9354,6 +9753,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -9377,6 +9777,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -9394,6 +9796,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9447,6 +9850,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -9476,6 +9881,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9559,6 +9965,11 @@ int main(int argc, char *argv[]) G_fatal_error(_("Unable to update current region")); ======= >>>>>>> osgeo-main +======= + if (G_put_window(&window) < 0) + G_fatal_error(_("Unable to update current region")); +======= +>>>>>>> osgeo-main ======= >>>>>>> 4d944b87c5 (WMS: replace broken URLs with alternative WMS (#1635)) if (G_put_window(&window) < 0) @@ -9586,6 +9997,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9682,6 +10094,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } diff --git a/general/g.region/printwindow.c b/general/g.region/printwindow.c index b30bef379eb..e1c64538b72 100644 --- a/general/g.region/printwindow.c +++ b/general/g.region/printwindow.c @@ -42,7 +42,10 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> osgeo-main ======= >>>>>>> osgeo-main ======= @@ -61,6 +64,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -95,6 +101,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -185,6 +192,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main else x = window->proj; @@ -261,6 +273,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (print_flag & PRINT_SH) { <<<<<<< HEAD @@ -364,6 +377,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main switch (format) { case SHELL: @@ -384,6 +399,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -444,6 +462,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -484,6 +503,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(stdout, "datum=%s%s", datum, sep); else @@ -507,6 +528,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -575,6 +597,10 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fprintf(stdout, "datum=%s\n", datum); else @@ -600,6 +626,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -690,6 +717,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } else @@ -734,6 +766,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (flat_flag) sep = " "; @@ -778,6 +811,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (flat_flag) sep = " "; @@ -796,6 +831,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -834,6 +870,10 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main +======= +>>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main ======= if (flat_flag) sep = " "; @@ -852,6 +892,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -898,6 +939,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> c10636c7fa (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> c10636c7fa (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fprintf(stdout, "n=%s%s", north, sep); fprintf(stdout, "s=%s%s", south, sep); @@ -956,6 +1000,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (flat_flag) fprintf(stdout, "\n"); @@ -1029,6 +1074,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main break; case PLAIN: @@ -1044,6 +1091,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1071,6 +1121,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1112,6 +1163,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } else { @@ -1226,6 +1279,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Can't get projection info of current location")); ======= @@ -1259,6 +1313,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main _("Can't get projection info of current project")); >>>>>>> osgeo-main @@ -1295,6 +1351,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1317,6 +1374,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_free_key_value(in_proj_info); @@ -1358,6 +1417,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1397,6 +1457,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= _("Can't get projection key values of current location")); >>>>>>> osgeo-main +======= + _("Can't get projection key values of current location")); +>>>>>>> osgeo-main ======= _("Can't get projection key values of current location")); >>>>>>> osgeo-main @@ -1538,6 +1601,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1577,6 +1641,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fprintf(stdout, "nw_long=%.8f%snw_lat=%.8f%s", lo1, sep, la1, sep); @@ -1593,6 +1660,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1635,6 +1703,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main break; case PLAIN: @@ -1644,6 +1714,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1673,6 +1746,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1716,6 +1790,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) } else { @@ -1811,6 +1887,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main } else { @@ -2235,6 +2312,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } else { @@ -2296,6 +2375,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2332,6 +2412,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (window->proj != 0) G_message( @@ -2354,6 +2436,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("You are in a simple XY location, projection to Lat/Lon " ======= @@ -2396,6 +2479,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main _("You are in a simple XY project, projection to Lat/Lon " ======= @@ -2415,6 +2500,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= _("You are in a simple XY location, projection to Lat/Lon " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2497,6 +2583,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= _("You are in a simple XY location, projection to Lat/Lon " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + _("You are in a simple XY location, projection to Lat/Lon " +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "is not possible. Use the -p flag instead.")); } @@ -2508,6 +2599,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (print_flag & PRINT_SH) { <<<<<<< HEAD @@ -2567,6 +2659,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main switch (format) { case SHELL: @@ -2586,6 +2680,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2613,6 +2710,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2641,6 +2739,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fprintf(stdout, "ns_extent=%f\n", window->north - window->south); fprintf(stdout, "ew_extent=%f\n", window->east - window->west); @@ -2659,6 +2759,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2700,6 +2801,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } else { @@ -2752,6 +2855,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2792,6 +2896,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD @@ -2800,6 +2906,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2818,6 +2927,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2886,6 +2996,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main break; case PLAIN: @@ -2897,6 +3009,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2927,6 +3042,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3017,6 +3133,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } else { @@ -3098,6 +3219,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fprintf(stdout, "bbox=%s,%s,%s,%s\n", west, south, east, north); ======= @@ -3140,6 +3262,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(stdout, "bbox=%s,%s,%s,%s%s", west, south, east, north, sep); ======= @@ -3159,6 +3283,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= fprintf(stdout, "bbox=%s,%s,%s,%s\n", west, south, east, north); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3187,6 +3312,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ======= +>>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= ======= fprintf(stdout, "bbox=%s,%s,%s,%s\n", west, south, east, north); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3195,6 +3323,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -3251,6 +3380,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> c10636c7fa (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> c10636c7fa (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } @@ -3283,6 +3415,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3357,6 +3490,10 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= convergence = NAN; ======= +>>>>>>> osgeo-main +======= + convergence = NAN; +======= >>>>>>> osgeo-main convergence = 0. / 0.; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3380,6 +3517,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -3408,6 +3546,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= convergence = 0. / 0.; ======= @@ -3428,6 +3568,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3511,6 +3652,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main else if (G_projection() == PROJECTION_LL) convergence = 0.0; @@ -3548,6 +3691,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3588,6 +3732,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main _("Can't get projection info of current project")); @@ -3613,6 +3759,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3681,6 +3828,10 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main _("Can't get projection info of current location")); @@ -3708,6 +3859,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3798,6 +3950,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_free_key_value(in_proj_info); @@ -3841,6 +3998,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (print_flag & PRINT_SH) <<<<<<< HEAD @@ -3967,6 +4125,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main switch (format) { case SHELL: @@ -3988,6 +4148,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4043,6 +4206,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Can't get projection info of current location")); ======= @@ -4085,6 +4249,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main _("Can't get projection info of current project")); ======= @@ -4104,6 +4270,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= _("Can't get projection info of current location")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4186,6 +4353,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= _("Can't get projection info of current location")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + _("Can't get projection info of current location")); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main /* do not wrap to -180, 180, otherwise east can be < west */ /* TODO: for PROJ 6+, the +over switch must be added to the @@ -4211,6 +4383,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD _("Can't get projection units of current location")); @@ -4248,6 +4421,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main _("Can't get projection units of current project")); @@ -4274,6 +4449,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4307,6 +4483,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* output projection to lat/long and wgs84 ellipsoid */ @@ -4328,6 +4506,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4386,6 +4565,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main _("Can't get projection units of current location")); @@ -4412,6 +4593,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4447,6 +4629,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_set_key_value("proj", "ll", out_proj_info); @@ -4472,6 +4656,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "WGS84 output not possible as this location does not " ======= @@ -4514,6 +4699,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "WGS84 output not possible as this project does not " ======= @@ -4533,6 +4720,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "WGS84 output not possible as this location does not " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4615,6 +4803,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= "WGS84 output not possible as this location does not " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "WGS84 output not possible as this location does not " +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "contain " "datum transformation parameters. Try running g.setproj.")); @@ -4765,6 +4958,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4805,6 +4999,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD @@ -4813,6 +5009,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4835,6 +5034,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -4903,6 +5103,8 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main break; case PLAIN: @@ -4914,6 +5116,9 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -4947,6 +5152,7 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -5037,6 +5243,11 @@ void print_window(struct Cell_head *window, int print_flag, int flat_flag, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } else { diff --git a/general/g.region/testsuite/test_g_region.py b/general/g.region/testsuite/test_g_region.py index e68129d7e70..4fb1f41c4a5 100644 --- a/general/g.region/testsuite/test_g_region.py +++ b/general/g.region/testsuite/test_g_region.py @@ -19,6 +19,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD from grass.gunittest.case import TestCase ======= <<<<<<< HEAD @@ -60,6 +61,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main import json >>>>>>> osgeo-main @@ -83,6 +86,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= from grass.gunittest.case import TestCase >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -166,6 +170,11 @@ from grass.gunittest.case import TestCase >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +from grass.gunittest.case import TestCase +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main import grass.script as gs @@ -220,6 +229,7 @@ def test_d_flag(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -260,6 +270,8 @@ def test_d_flag(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_f_flag(self): line = call_module("g.region", flags="fglecn3", capture_stdout=True) @@ -270,6 +282,7 @@ def test_f_flag(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -339,6 +352,8 @@ def test_f_flag(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_format_json(self): """Test json format""" @@ -421,6 +436,9 @@ def test_format_json(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main diff --git a/general/g.setproj/g.setproj.html b/general/g.setproj/g.setproj.html index 8c22b58b822..130d6f10af7 100644 --- a/general/g.setproj/g.setproj.html +++ b/general/g.setproj/g.setproj.html @@ -42,6 +42,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD current location. PROJ_INFO file is used to record the projection information associated with the specified mapset. ======= @@ -85,6 +86,8 @@

    DESCRIPTION

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main current project. PROJ_INFO file is used to record the CRS information associated with the specified project. ======= @@ -105,6 +108,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -134,6 +138,8 @@

    DESCRIPTION

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= current location. PROJ_INFO file is used to record the projection information associated with the specified mapset. >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -151,6 +157,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -193,6 +200,8 @@

    DESCRIPTION

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    NOTES

    @@ -245,6 +254,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -294,6 +304,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main The projections of aea, lcc, merc, leae, leac, and tmerc will generate a request to the user for the prime meridian and standard parallel for the output map. @@ -315,6 +327,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -346,6 +359,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main The projections of aea, lcc, merc, leae, leac, and tmerc will generate a request to the user for the prime meridian and standard parallel for the output map. @@ -368,6 +383,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -396,6 +412,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main The projections of aea, lcc, merc, leae, leac, and tmerc will generate a request to the user for the prime meridian and standard parallel for the output map. @@ -413,6 +431,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -436,6 +455,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main The projections of aea, lcc, merc, leae, leac, and tmerc will generate a request to the user for the prime meridian and standard parallel for the output map. @@ -456,6 +477,7 @@

    NOTES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -564,6 +586,8 @@

    NOTES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    SEE ALSO

    diff --git a/general/g.setproj/main.c b/general/g.setproj/main.c index febf7566a33..1c1cb857862 100644 --- a/general/g.setproj/main.c +++ b/general/g.setproj/main.c @@ -289,6 +289,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * recurively, to allow input of options for ======= @@ -331,6 +332,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * recursively, to allow input of options for ======= @@ -350,6 +353,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * recurively, to allow input of options for >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -432,6 +436,11 @@ int main(int argc, char *argv[]) ======= * recurively, to allow input of options for >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * recurively, to allow input of options for +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * a second projection, MHu991010 */ G_set_key_value("o_proj", "eqc", out_proj_keys); @@ -459,6 +468,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* if legal ellips. exist, ask wether or not to change ======= @@ -501,6 +511,8 @@ int main(int argc, char *argv[]) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* if legal ellips. exist, ask whether or not to change ======= @@ -520,6 +532,7 @@ int main(int argc, char *argv[]) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /* if legal ellips. exist, ask wether or not to change >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -602,6 +615,11 @@ int main(int argc, char *argv[]) ======= /* if legal ellips. exist, ask wether or not to change >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /* if legal ellips. exist, ask wether or not to change +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * it */ G_message(_("The current ellipsoid is %s"), spheroid); diff --git a/general/g.version/g.version.html b/general/g.version/g.version.html index 9c8741140b3..4a1b2d6dd03 100644 --- a/general/g.version/g.version.html +++ b/general/g.version/g.version.html @@ -62,6 +62,7 @@

    Basic info

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main GRASS 8.2.0dev (2022) @@ -121,6 +122,8 @@

    Basic info

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS 8.4.0 (2024) ======= GRASS 8.0.0alpha (2021) @@ -140,6 +143,7 @@

    Basic info

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -163,6 +167,8 @@

    Basic info

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= GRASS 8.0.0alpha (2021) >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -182,6 +188,7 @@

    Basic info

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= GRASS 8.2.0dev (2022) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -286,6 +293,11 @@

    Basic info

    GRASS 8.2.0dev (2022) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +GRASS 8.2.0dev (2022) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main

    GIS Library info

    @@ -317,6 +329,7 @@

    GIS Library info

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main GRASS 8.2.0dev (2022) @@ -378,6 +391,8 @@

    GIS Library info

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main GRASS 8.4.0 (2024) libgis revision: c9e8576cf libgis date: 2024-04-27T09:38:49+00:00 @@ -400,6 +415,7 @@

    GIS Library info

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -429,6 +445,8 @@

    GIS Library info

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= GRASS 8.0.0alpha (2021) libgis revision: 1e0c11f52 libgis date: 2021-05-19T09:38:49+00:00 @@ -447,6 +465,7 @@

    GIS Library info

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -476,6 +495,8 @@

    GIS Library info

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= GRASS 8.2.0dev (2022) libgis revision: c9e8576cf libgis date: 2022-04-27T09:38:49+00:00 @@ -494,6 +515,7 @@

    GIS Library info

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -523,6 +545,8 @@

    GIS Library info

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= GRASS 8.2.0dev (2022) libgis revision: c9e8576cf libgis date: 2022-04-27T09:38:49+00:00 @@ -541,6 +565,7 @@

    GIS Library info

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -595,6 +620,8 @@

    GIS Library info

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    Full info in shell script style

    @@ -625,6 +652,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main version=8.2.0dev @@ -690,6 +718,8 @@

    Full info in shell script style

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main version=8.4.0 date=2024 revision=d57f40906 @@ -719,6 +749,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -748,6 +779,8 @@

    Full info in shell script style

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= version=8.2.0dev date=2022 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -763,6 +796,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -800,6 +834,8 @@

    Full info in shell script style

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main revision=d57f40906 build_date=2021-05-23 build_platform=x86_64-pc-linux-gnu @@ -823,6 +859,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -854,6 +891,8 @@

    Full info in shell script style

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= version=8.0.0alpha date=2021 ======= @@ -872,6 +911,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -918,6 +958,8 @@

    Full info in shell script style

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main revision=d57f40906 build_date=2021-05-23 build_platform=x86_64-pc-linux-gnu @@ -937,6 +979,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -991,6 +1034,9 @@

    Full info in shell script style

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main libgis_revision=1e0c11f52 libgis_date=2021-05-19T09:38:49+00:00 proj=6.3.2 @@ -1013,6 +1059,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -1035,6 +1082,8 @@

    Full info in shell script style

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -1053,6 +1102,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1130,6 +1180,11 @@

    Full info in shell script style

    >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) libgis_revision=c9e8576cf >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +libgis_revision=c9e8576cf +>>>>>>> osgeo-main libgis_date=2022-04-27T09:38:49+00:00 proj=8.2.1 gdal=3.4.3 @@ -1152,6 +1207,7 @@

    Full info in shell script style

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1268,6 +1324,11 @@

    Full info in shell script style

    ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main Note: if revision=exported is reported instead of the git hash then the diff --git a/grasslib.dox b/grasslib.dox index 4e9936268a7..e5271a5ffa0 100644 --- a/grasslib.dox +++ b/grasslib.dox @@ -31,6 +31,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 @@ -103,6 +104,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * updated 8/2005, 2006-2024 ======= @@ -123,6 +126,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -145,6 +149,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= * updated 8/2005, 2006-2008, 2010-2011, 2017, 2018, 2019, 2021 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -166,6 +172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -188,6 +195,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= * updated 8/2005, 2006-2008, 2010-2011, 2017-2022 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -208,6 +217,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -332,6 +342,11 @@ ======= * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> osgeo-main +======= +======= + * updated 8/2005, 2006-2008, 2010-2011, 2017-2023 +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) >>>>>>> osgeo-main --> @@ -378,6 +393,7 @@ pages. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main © 2000-2023 by the GRASS Development Team @@ -437,6 +453,8 @@ pages. >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main © 2000-2024 by the GRASS Development Team ======= © 2000-2022 by the GRASS Development Team @@ -456,6 +474,7 @@ pages. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -479,6 +498,8 @@ pages. ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= © 2000-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -498,6 +519,7 @@ pages. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= © 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -602,6 +624,11 @@ pages. © 2000-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) >>>>>>> osgeo-main +======= +======= +© 2000-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> osgeo-main This manual is published under GNU Free Documentation @@ -639,6 +666,7 @@ href="https://grass.osgeo.org">https://grass.osgeo.org <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -702,6 +730,8 @@ href="https://grass.osgeo.org">https://grass.osgeo.org >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main @@ -778,6 +811,7 @@ href="https://grass.osgeo.org">https://grass.osgeo.org <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -807,6 +841,8 @@ href="https://grass.osgeo.org">https://grass.osgeo.org ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= @@ -826,6 +862,7 @@ href="https://grass.osgeo.org">https://grass.osgeo.org <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -855,6 +892,8 @@ href="https://grass.osgeo.org">https://grass.osgeo.org ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= diff --git a/lib/gis/ilist.c b/lib/gis/ilist.c index c96fe8cbf40..0e394bd387c 100644 --- a/lib/gis/ilist.c +++ b/lib/gis/ilist.c @@ -64,6 +64,7 @@ void G_free_ilist(struct ilist *list) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -139,6 +140,10 @@ struct ilist *G_new_ilist(void) struct ilist *G_new_ilist(void) ======= >>>>>>> osgeo-main +======= +struct ilist *G_new_ilist(void) +======= +>>>>>>> osgeo-main struct ilist *G_new_ilist() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -161,6 +166,7 @@ struct ilist *G_new_ilist(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -190,6 +196,8 @@ struct ilist *G_new_ilist(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= struct ilist *G_new_ilist() ======= struct ilist *G_new_ilist(void) @@ -209,6 +217,7 @@ struct ilist *G_new_ilist(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -293,6 +302,8 @@ struct ilist *G_new_ilist() >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { struct ilist *l = G_malloc(sizeof(struct ilist)); diff --git a/lib/gis/list.c b/lib/gis/list.c index 7acaf0525aa..ff1403f7543 100644 --- a/lib/gis/list.c +++ b/lib/gis/list.c @@ -46,6 +46,7 @@ static int list_element(FILE *, const char *, const char *, const char *, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -120,6 +121,10 @@ static int list_element(FILE *, const char *, const char *, const char *, ======= int (*)(const char *, const char *, char *)); ======= +>>>>>>> osgeo-main +======= + int (*)(const char *, const char *, char *)); +======= >>>>>>> osgeo-main int (*)(const char *, const char *, const char *)); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -143,6 +148,7 @@ static int list_element(FILE *, const char *, const char *, const char *, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -171,6 +177,8 @@ static int list_element(FILE *, const char *, const char *, const char *, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= int (*)(const char *, const char *, const char *)); ======= @@ -191,6 +199,7 @@ static int list_element(FILE *, const char *, const char *, const char *, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -275,6 +284,8 @@ static int list_element(FILE *, const char *, const char *, const char *, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /*! \brief General purpose list function @@ -325,6 +336,7 @@ void G_list_element(const char *element, const char *desc, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -399,6 +411,10 @@ void G_list_element(const char *element, const char *desc, const char *mapset, ======= int (*lister)(const char *, const char *, char *)) ======= +>>>>>>> osgeo-main +======= + int (*lister)(const char *, const char *, char *)) +======= >>>>>>> osgeo-main int (*lister)(const char *, const char *, const char *)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -422,6 +438,7 @@ void G_list_element(const char *element, const char *desc, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -450,6 +467,8 @@ void G_list_element(const char *element, const char *desc, const char *mapset, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= int (*lister)(const char *, const char *, const char *)) ======= @@ -470,6 +489,7 @@ void G_list_element(const char *element, const char *desc, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -554,6 +574,8 @@ void G_list_element(const char *element, const char *desc, const char *mapset, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { struct Popen pager; int n; @@ -622,6 +644,7 @@ static int list_element(FILE *out, const char *element, const char *desc, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -696,6 +719,10 @@ static int list_element(FILE *out, const char *element, const char *desc, ======= int (*lister)(const char *, const char *, char *)) ======= +>>>>>>> osgeo-main +======= + int (*lister)(const char *, const char *, char *)) +======= >>>>>>> osgeo-main int (*lister)(const char *, const char *, const char *)) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -719,6 +746,7 @@ static int list_element(FILE *out, const char *element, const char *desc, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -747,6 +775,8 @@ static int list_element(FILE *out, const char *element, const char *desc, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= int (*lister)(const char *, const char *, const char *)) ======= @@ -767,6 +797,7 @@ static int list_element(FILE *out, const char *element, const char *desc, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -851,6 +882,8 @@ static int list_element(FILE *out, const char *element, const char *desc, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { char path[GPATH_MAX]; int count = 0; diff --git a/lib/gis/locale.c b/lib/gis/locale.c index c91b4ed5a40..e29c7f39725 100644 --- a/lib/gis/locale.c +++ b/lib/gis/locale.c @@ -101,6 +101,7 @@ char *G_gettext(const char *package NO_NLS_UNUSED, const char *msgid) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD char *G_ngettext(const char *package, const char *msgids, const char *msgidp, unsigned long int n) ======= @@ -144,6 +145,8 @@ char *G_ngettext(const char *package, const char *msgids, const char *msgidp, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main char *G_ngettext(const char *package NO_NLS_UNUSED, const char *msgids, const char *msgidp, unsigned long int n) ======= @@ -164,6 +167,7 @@ char *G_ngettext(const char *package, const char *msgids, const char *msgidp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -193,6 +197,8 @@ char *G_ngettext(const char *package, const char *msgids, const char *msgidp, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= char *G_ngettext(const char *package, const char *msgids, const char *msgidp, unsigned long int n) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -210,6 +216,7 @@ char *G_ngettext(const char *package, const char *msgids, const char *msgidp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -252,6 +259,8 @@ char *G_ngettext(const char *package, const char *msgids, const char *msgidp, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { #if defined(HAVE_LIBINTL_H) && defined(USE_NLS) G_init_locale(); diff --git a/lib/gis/ls.c b/lib/gis/ls.c index f741e6afd78..dd9e03c9eb3 100644 --- a/lib/gis/ls.c +++ b/lib/gis/ls.c @@ -207,6 +207,7 @@ void G_ls_format(char **list, int num_items, int perline, FILE *stream) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -281,6 +282,10 @@ void G_ls_format(char **list, int num_items, int perline, FILE *stream) ======= unsigned int max_len = 0; ======= +>>>>>>> osgeo-main +======= + unsigned int max_len = 0; +======= >>>>>>> osgeo-main int max_len = 0; >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -304,6 +309,7 @@ void G_ls_format(char **list, int num_items, int perline, FILE *stream) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -332,6 +338,8 @@ void G_ls_format(char **list, int num_items, int perline, FILE *stream) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= int max_len = 0; ======= @@ -352,6 +360,7 @@ void G_ls_format(char **list, int num_items, int perline, FILE *stream) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -435,6 +444,8 @@ void G_ls_format(char **list, int num_items, int perline, FILE *stream) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (i = 0; i < num_items; i++) { diff --git a/lib/gis/lz4.c b/lib/gis/lz4.c index 538ef86ed0a..df20d218ed2 100644 --- a/lib/gis/lz4.c +++ b/lib/gis/lz4.c @@ -658,6 +658,7 @@ int LZ4_compressBound(int isize) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int LZ4_sizeofState() ======= <<<<<<< HEAD @@ -700,6 +701,8 @@ int LZ4_sizeofState() >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int LZ4_sizeofState(void) ======= int LZ4_sizeofState() @@ -718,6 +721,7 @@ int LZ4_sizeofState() <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int LZ4_sizeofState() >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -801,6 +805,11 @@ int LZ4_sizeofState() int LZ4_sizeofState() >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +int LZ4_sizeofState() +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return LZ4_STREAMSIZE; } @@ -2630,6 +2639,7 @@ int LZ4_uncompress_unknownOutputSize(const char *source, char *dest, int isize, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD int LZ4_sizeofStreamState() ======= <<<<<<< HEAD @@ -2672,6 +2682,8 @@ int LZ4_sizeofStreamState() >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int LZ4_sizeofStreamState(void) ======= int LZ4_sizeofStreamState() @@ -2690,6 +2702,7 @@ int LZ4_sizeofStreamState() <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= int LZ4_sizeofStreamState() >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2773,6 +2786,11 @@ int LZ4_sizeofStreamState() int LZ4_sizeofStreamState() >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +int LZ4_sizeofStreamState() +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { return LZ4_STREAMSIZE; } diff --git a/lib/gis/mapset_msc.c b/lib/gis/mapset_msc.c index e92ed1c59aa..a035dd52fbc 100644 --- a/lib/gis/mapset_msc.c +++ b/lib/gis/mapset_msc.c @@ -71,6 +71,7 @@ int G_make_mapset_element(const char *p_element) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -155,6 +156,10 @@ int G_make_mapset_element(const char *p_element) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \brief Create directory for group of elements of a given type. @@ -192,6 +197,7 @@ int G_make_mapset_element(const char *p_element) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -238,6 +244,9 @@ int G_make_mapset_element(const char *p_element) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main \brief Create directory for group of elements of a given type. ======= @@ -284,6 +293,7 @@ int G_make_mapset_element(const char *p_element) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -424,6 +434,8 @@ int G_make_mapset_element(const char *p_element) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main */ int G_make_mapset_object_group(const char *type) @@ -456,6 +468,7 @@ int G_make_mapset_object_group(const char *type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -540,6 +553,10 @@ int G_make_mapset_object_group(const char *type) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \brief Create directory for an object of a given type. @@ -581,6 +598,7 @@ int G_make_mapset_object_group(const char *type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -627,6 +645,9 @@ int G_make_mapset_object_group(const char *type) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main \brief Create directory for an object of a given type. ======= @@ -676,6 +697,7 @@ int G_make_mapset_object_group(const char *type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -825,6 +847,8 @@ int G_make_mapset_object_group(const char *type) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main */ int G_make_mapset_dir_object(const char *type, const char *name) @@ -880,6 +904,7 @@ int G_make_mapset_element_tmp(const char *p_element) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -964,6 +989,10 @@ int G_make_mapset_element_tmp(const char *p_element) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \brief Create directory for type of objects in the temporary directory. @@ -996,6 +1025,7 @@ int G_make_mapset_object_group_tmp(const char *type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD { char path[GPATH_MAX]; @@ -1134,6 +1164,8 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= \brief Create directory for type of objects in the temporary directory. ======= @@ -1179,6 +1211,7 @@ int G_make_mapset_object_group_tmp(const char *type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f6958f78a7 (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= ======= @@ -1194,6 +1227,8 @@ int G_make_mapset_object_group_tmp(const char *type) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int G_make_mapset_object_group_basedir(const char *type, const char *basedir) { char path[GPATH_MAX]; @@ -1211,6 +1246,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -1224,6 +1260,8 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { char path[GPATH_MAX]; @@ -1239,6 +1277,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /*! \brief Create directory for type of objects in the temporary directory. @@ -1392,6 +1431,8 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int make_mapset_element_impl(const char *p_path, const char *p_element, bool race_ok) >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -1432,6 +1473,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1475,6 +1517,8 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, bool rac >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { char path[GPATH_MAX]; @@ -1549,6 +1593,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1633,6 +1678,10 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (*element == '/' || *element == 0) { *p = 0; @@ -1654,6 +1703,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1710,6 +1760,9 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if (*element == '/' || *element == 0) { *p = 0; @@ -1729,6 +1782,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1757,6 +1811,8 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (*element == '/' || *element == 0) { *p = 0; @@ -1777,6 +1833,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1851,6 +1908,10 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (access(path, 0) != 0) { /* Assuming that directory does not exist. */ @@ -1880,6 +1941,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1964,6 +2026,10 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main /* Directory is not accessible even after attempt to create it. */ @@ -1999,6 +2065,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2054,6 +2121,8 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= /* Directory is not accessible even after attempt to create it. */ ======= @@ -2083,6 +2152,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= <<<<<<< HEAD @@ -2161,6 +2231,8 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (*element == 0) return 1; @@ -2181,6 +2253,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2209,6 +2282,8 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (*element == 0) return 1; @@ -2229,6 +2304,7 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2303,6 +2379,10 @@ int make_mapset_element_impl(const char *p_path, const char *p_element, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } } @@ -2333,6 +2413,7 @@ int make_mapset_element(const char *p_path, const char *p_element) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2413,6 +2494,11 @@ int make_mapset_element_no_fail_on_race(const char *p_path, const char *p_element) ======= >>>>>>> osgeo-main +======= +int make_mapset_element_no_fail_on_race(const char *p_path, + const char *p_element) +======= +>>>>>>> osgeo-main int make_mapset_element_no_fail_on_race(const char *p_path, const char *p_element) >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -2437,6 +2523,7 @@ int make_mapset_element_no_fail_on_race(const char *p_path, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2519,6 +2606,8 @@ int make_mapset_element_no_fail_on_race(const char *p_path, const char *p_elemen >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { return make_mapset_element_impl(p_path, p_element, true); } @@ -2544,6 +2633,7 @@ int make_mapset_element_no_fail_on_race(const char *p_path, const char *p_elemen <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2589,6 +2679,8 @@ int make_mapset_element_no_fail_on_race(const char *p_path, const char *p_elemen ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) ======= @@ -2607,6 +2699,7 @@ int make_mapset_element_no_fail_on_race(const char *p_path, const char *p_elemen <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2690,6 +2783,10 @@ int make_mapset_element_no_fail_on_race(const char *p_path, const char *p_elemen ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main /*! \brief Create misc element in the current mapset. @@ -2722,6 +2819,7 @@ int G__make_mapset_element_misc(const char *dir, const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2787,6 +2885,10 @@ int G__make_mapset_element_misc(const char *dir, const char *name) ======= return G_make_mapset_dir_object(dir, name); ======= +>>>>>>> osgeo-main +======= + return G_make_mapset_dir_object(dir, name); +======= >>>>>>> osgeo-main G_make_mapset_dir_object(dir, name); >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697)) @@ -2810,6 +2912,7 @@ int G__make_mapset_element_misc(const char *dir, const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2888,6 +2991,8 @@ int G__make_mapset_element_misc(const char *dir, const char *name) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main } static int check_owner(const struct stat *info) diff --git a/lib/gis/open.c b/lib/gis/open.c index 7cab97b1bec..ccc91afbd26 100644 --- a/lib/gis/open.c +++ b/lib/gis/open.c @@ -131,6 +131,7 @@ static int G__open(const char *element, const char *name, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -175,6 +176,8 @@ static int G__open(const char *element, const char *name, const char *mapset, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (mode == 1 || access(path, 0) != 0) { @@ -194,6 +197,7 @@ static int G__open(const char *element, const char *name, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -239,6 +243,8 @@ static int G__open(const char *element, const char *name, const char *mapset, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (is_tmp) G_make_mapset_object_group_tmp(element); @@ -259,6 +265,7 @@ static int G__open(const char *element, const char *name, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -286,6 +293,8 @@ static int G__open(const char *element, const char *name, const char *mapset, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main close(open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666)); } @@ -306,6 +315,7 @@ static int G__open(const char *element, const char *name, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -356,6 +366,8 @@ static int G__open(const char *element, const char *name, const char *mapset, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (mode == 1 || access(path, 0) != 0) { @@ -382,6 +394,7 @@ static int G__open(const char *element, const char *name, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -438,6 +451,9 @@ static int G__open(const char *element, const char *name, const char *mapset, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main close(open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666)); } @@ -457,6 +473,7 @@ static int G__open(const char *element, const char *name, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -525,6 +542,10 @@ static int G__open(const char *element, const char *name, const char *mapset, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if ((fd = open(path, mode)) < 0) G_warning(_("G__open(write): Unable to open '%s': %s"), path, diff --git a/lib/gis/parser.c b/lib/gis/parser.c index b5f92ef1cd0..60006e1f651 100644 --- a/lib/gis/parser.c +++ b/lib/gis/parser.c @@ -512,6 +512,7 @@ int G_parser(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* If first arg is "--wps-process-description" then print out * the wps process description of the task */ @@ -608,6 +609,8 @@ int G_parser(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* If first arg is "--md-description" then print out * a Markdown description of the task */ @@ -742,6 +745,7 @@ int G_parser(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -770,6 +774,8 @@ int G_parser(int argc, char **argv) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= /* If first arg is "--wps-process-description" then print out * the wps process description of the task */ @@ -841,6 +847,7 @@ int G_parser(int argc, char **argv) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -882,6 +889,8 @@ int G_parser(int argc, char **argv) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* print nothing, but errors and warnings */ st->module_info.verbose = G_verbose_min(); @@ -1264,6 +1273,7 @@ int G__uses_new_gisprompt(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1304,6 +1314,8 @@ int G__uses_new_gisprompt(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main \param newline TRUE to include newline */ @@ -1324,6 +1336,7 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *), <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1392,6 +1405,10 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *), ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main */ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *)) @@ -1422,6 +1439,7 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (i < st->n_keys - 1) fprintf(fd, ", "); @@ -1465,6 +1483,8 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *)) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (i < st->n_keys - 1) { fprintf(fd, ","); @@ -1491,6 +1511,7 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1519,6 +1540,8 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *)) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (i < st->n_keys - 1) fprintf(fd, ", "); @@ -1537,6 +1560,7 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1578,6 +1602,8 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *)) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -1614,6 +1640,7 @@ void G__print_keywords(FILE *fd, void (*format)(FILE *, const char *)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1684,6 +1711,10 @@ int G_get_overwrite(void) ======= >>>>>>> osgeo-main ======= +int G_get_overwrite(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) int G_get_overwrite() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1710,6 +1741,7 @@ int G_get_overwrite(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1800,6 +1832,8 @@ int G_get_overwrite(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { return st->module_info.overwrite; } @@ -1887,6 +1921,7 @@ void set_flag(int f) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1927,6 +1962,8 @@ void set_flag(int f) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* First, check if key has been renamed */ G_asprintf(&key, "-%c", f); @@ -2005,6 +2042,7 @@ void set_flag(int f) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2073,6 +2111,10 @@ void set_flag(int f) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_asprintf(&err, _("%s: Sorry, <%c> is not a valid flag"), G_program_name(), f); @@ -2247,6 +2289,7 @@ void set_option(const char *string) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2287,6 +2330,8 @@ void set_option(const char *string) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* if renamed to a new flag (option value given but will be lost), * fatal error */ @@ -2322,6 +2367,7 @@ void set_option(const char *string) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2390,6 +2436,10 @@ void set_option(const char *string) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for (at_opt = &st->first_option; at_opt; at_opt = at_opt->next_opt) { diff --git a/lib/gis/parser_dependencies.c b/lib/gis/parser_dependencies.c index 5f5593e7538..a177b8609f8 100644 --- a/lib/gis/parser_dependencies.c +++ b/lib/gis/parser_dependencies.c @@ -224,6 +224,7 @@ static void append_error(const char *msg) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -264,6 +265,8 @@ static void append_error(const char *msg) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main The last item of the list must be NULL. @@ -283,6 +286,7 @@ static void append_error(const char *msg) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -351,6 +355,10 @@ static void append_error(const char *msg) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \param first first given option */ @@ -395,6 +403,7 @@ static void check_exclusive(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -435,6 +444,8 @@ static void check_exclusive(const struct rule *rule) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main The last item of the list must be NULL. @@ -454,6 +465,7 @@ static void check_exclusive(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -522,6 +534,10 @@ static void check_exclusive(const struct rule *rule) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \param first first given option */ @@ -568,6 +584,7 @@ static void check_required(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD If you want all options to be provided use G_option_requires_all() function. @@ -614,6 +631,8 @@ static void check_required(const struct rule *rule) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main The last item of the list must be NULL. @@ -643,6 +662,7 @@ static void check_required(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -671,6 +691,8 @@ static void check_required(const struct rule *rule) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= If you want all options to be provided use G_option_requires_all() function. @@ -692,6 +714,7 @@ static void check_required(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -733,6 +756,8 @@ static void check_required(const struct rule *rule) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main \param first first given option */ @@ -783,6 +808,7 @@ static void check_requires(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD If it is enough if only one option from a set is present, use G_option_requires() function. @@ -829,6 +855,8 @@ static void check_requires(const struct rule *rule) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main The last item of the list must be NULL. @@ -858,6 +886,7 @@ static void check_requires(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -886,6 +915,8 @@ static void check_requires(const struct rule *rule) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= If it is enough if only one option from a set is present, use G_option_requires() function. @@ -907,6 +938,7 @@ static void check_requires(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -948,6 +980,8 @@ static void check_requires(const struct rule *rule) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main \param first first given option */ @@ -995,6 +1029,7 @@ static void check_requires_all(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1035,6 +1070,8 @@ static void check_requires_all(const struct rule *rule) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main The last item of the list must be NULL. @@ -1054,6 +1091,7 @@ static void check_requires_all(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1122,6 +1160,10 @@ static void check_requires_all(const struct rule *rule) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \param first first given option */ @@ -1169,6 +1211,7 @@ static void check_excludes(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1209,6 +1252,8 @@ static void check_excludes(const struct rule *rule) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main The last item of the list must be NULL. @@ -1228,6 +1273,7 @@ static void check_excludes(const struct rule *rule) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1296,6 +1342,10 @@ static void check_excludes(const struct rule *rule) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \param first first given option */ @@ -1456,6 +1506,7 @@ void G__describe_option_rules_xml(FILE *fp) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1518,6 +1569,8 @@ void G__describe_option_rules_xml(FILE *fp) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (rule->count < 0) G_fatal_error(_("Internal error: the number of options is < 0")); @@ -1539,6 +1592,7 @@ void G__describe_option_rules_xml(FILE *fp) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1575,6 +1629,8 @@ void G__describe_option_rules_xml(FILE *fp) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fprintf(fp, "\t\t\n", rule_types[rule->type]); for (j = 0; j < rule->count; j++) { @@ -1593,6 +1649,7 @@ void G__describe_option_rules_xml(FILE *fp) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1621,6 +1678,8 @@ void G__describe_option_rules_xml(FILE *fp) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fprintf(fp, "\t\t\n", rule_types[rule->type]); for (j = 0; j < rule->count; j++) { @@ -1639,6 +1698,7 @@ void G__describe_option_rules_xml(FILE *fp) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= fprintf(fp, "\t\t\n", rule_types[rule->type]); for (j = 0; j < rule->count; j++) { @@ -1677,6 +1737,8 @@ void G__describe_option_rules_xml(FILE *fp) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fprintf(fp, "\t\t\n", rule_types[rule->type]); for (j = 0; j < rule->count; j++) { @@ -1702,6 +1764,7 @@ void G__describe_option_rules_xml(FILE *fp) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1730,6 +1793,8 @@ void G__describe_option_rules_xml(FILE *fp) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -1748,6 +1813,7 @@ void G__describe_option_rules_xml(FILE *fp) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1804,6 +1870,8 @@ void G__describe_option_rules_xml(FILE *fp) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main void *p = rule->opts[j]; diff --git a/lib/gis/parser_help.c b/lib/gis/parser_help.c index 1cc84a4372d..4f5d3e27f36 100644 --- a/lib/gis/parser_help.c +++ b/lib/gis/parser_help.c @@ -117,6 +117,7 @@ static void usage(FILE *fp, int markers) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G__print_keywords(fp, NULL); ======= @@ -159,6 +160,8 @@ static void usage(FILE *fp, int markers) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G__print_keywords(fp, NULL, FALSE); ======= @@ -178,6 +181,7 @@ static void usage(FILE *fp, int markers) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= G__print_keywords(fp, NULL); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -260,6 +264,11 @@ static void usage(FILE *fp, int markers) ======= G__print_keywords(fp, NULL); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + G__print_keywords(fp, NULL); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fprintf(fp, "\n"); } diff --git a/lib/gis/parser_html.c b/lib/gis/parser_html.c index 14792f03590..02fb5534e7e 100644 --- a/lib/gis/parser_html.c +++ b/lib/gis/parser_html.c @@ -27,6 +27,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main (C) 2001-2023 by the GRASS Development Team @@ -85,6 +86,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main (C) 2001-2024 by the GRASS Development Team ======= @@ -105,6 +108,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -127,6 +131,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= (C) 2001-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -147,6 +153,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= (C) 2001-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -250,6 +257,11 @@ ======= (C) 2001-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) +>>>>>>> osgeo-main +======= +======= + (C) 2001-2023 by the GRASS Development Team +>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) >>>>>>> osgeo-main This program is free software under the GNU General Public License @@ -350,6 +362,7 @@ void G__usage_html(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G__print_keywords(stdout, print_escaped_for_html_keywords); ======= @@ -392,6 +405,8 @@ void G__usage_html(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G__print_keywords(stdout, print_escaped_for_html_keywords, FALSE); ======= @@ -411,6 +426,7 @@ void G__usage_html(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= G__print_keywords(stdout, print_escaped_for_html_keywords); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -493,6 +509,11 @@ void G__usage_html(void) ======= G__print_keywords(stdout, print_escaped_for_html_keywords); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + G__print_keywords(stdout, print_escaped_for_html_keywords); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fprintf(stdout, "\n"); } diff --git a/lib/gis/parser_interface.c b/lib/gis/parser_interface.c index b7c7f7a1608..1d0ff9c7c72 100644 --- a/lib/gis/parser_interface.c +++ b/lib/gis/parser_interface.c @@ -109,6 +109,7 @@ static void print_escaped_for_xml(FILE *fp, const char *str) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -157,6 +158,8 @@ static void print_escaped_for_xml(FILE *fp, const char *str) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (enc) { G_freea(enc); @@ -179,6 +182,7 @@ static void print_escaped_for_xml(FILE *fp, const char *str) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -209,6 +213,8 @@ static void print_escaped_for_xml(FILE *fp, const char *str) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (enc) G_freea(enc); @@ -231,6 +237,7 @@ static void print_escaped_for_xml(FILE *fp, const char *str) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -258,6 +265,8 @@ static void print_escaped_for_xml(FILE *fp, const char *str) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (enc) G_freea(enc); @@ -275,6 +284,7 @@ static void print_escaped_for_xml(FILE *fp, const char *str) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -297,6 +307,8 @@ static void print_escaped_for_xml(FILE *fp, const char *str) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (enc) { G_freea(enc); @@ -318,6 +330,7 @@ static void print_escaped_for_xml(FILE *fp, const char *str) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -422,6 +435,8 @@ static void print_escaped_for_xml(FILE *fp, const char *str) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (conv != (iconv_t)-1) @@ -500,6 +515,7 @@ void G__usage_xml(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD G__print_keywords(stdout, print_escaped_for_xml); ======= @@ -542,6 +558,8 @@ void G__usage_xml(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G__print_keywords(stdout, print_escaped_for_xml, FALSE); ======= @@ -561,6 +579,7 @@ void G__usage_xml(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= G__print_keywords(stdout, print_escaped_for_xml); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -643,6 +662,11 @@ void G__usage_xml(void) ======= G__print_keywords(stdout, print_escaped_for_xml); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + G__print_keywords(stdout, print_escaped_for_xml); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fprintf(stdout, "\n\t\n"); } diff --git a/lib/gis/parser_local_proto.h b/lib/gis/parser_local_proto.h index f151c0dba9c..026eba55e63 100644 --- a/lib/gis/parser_local_proto.h +++ b/lib/gis/parser_local_proto.h @@ -76,6 +76,7 @@ int G__uses_new_gisprompt(void); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -111,6 +112,8 @@ int G__uses_new_gisprompt(void); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void G__print_keywords(FILE *, void (*)(FILE *, const char *), int); ======= @@ -130,6 +133,7 @@ void G__print_keywords(FILE *, void (*)(FILE *, const char *), int); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -181,6 +185,8 @@ void G__print_keywords(FILE *, void (*)(FILE *, const char *), int); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main void G__print_keywords(FILE *, void (*)(FILE *, const char *)); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) void G__split_gisprompt(const char *, char *, char *, char *); diff --git a/lib/gis/parser_standard_options.c b/lib/gis/parser_standard_options.c index 529713b7dbf..f1f9884545b 100644 --- a/lib/gis/parser_standard_options.c +++ b/lib/gis/parser_standard_options.c @@ -711,6 +711,7 @@ struct Option *G_define_standard_option(int opt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -751,6 +752,8 @@ struct Option *G_define_standard_option(int opt) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main Opt->key = "project"; Opt->type = TYPE_STRING; @@ -773,6 +776,7 @@ struct Option *G_define_standard_option(int opt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -841,6 +845,10 @@ struct Option *G_define_standard_option(int opt) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main Opt->key = "location"; Opt->type = TYPE_STRING; @@ -865,6 +873,7 @@ struct Option *G_define_standard_option(int opt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -955,6 +964,11 @@ struct Option *G_define_standard_option(int opt) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main Opt->gisprompt = "old,location,location"; Opt->key_desc = "name"; @@ -1040,6 +1054,7 @@ struct Option *G_define_standard_option(int opt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1080,6 +1095,8 @@ struct Option *G_define_standard_option(int opt) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 03a790ad9a (wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget (#1689)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1097,6 +1114,7 @@ struct Option *G_define_standard_option(int opt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1156,6 +1174,8 @@ struct Option *G_define_standard_option(int opt) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* start dynamic answer */ /* check NPROCS in GISRC, set with g.gisenv */ @@ -1179,6 +1199,7 @@ struct Option *G_define_standard_option(int opt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1253,6 +1274,10 @@ struct Option *G_define_standard_option(int opt) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main Opt->description = _("Number of threads for parallel computing"); break; @@ -1274,6 +1299,7 @@ struct Option *G_define_standard_option(int opt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1322,6 +1348,9 @@ struct Option *G_define_standard_option(int opt) ======= >>>>>>> osgeo-main ======= +======= +>>>>>>> osgeo-main +======= >>>>>>> 270077e68a (wxGUI/map display: manage wx.StatusBar widget by AUI (#1646)) ======= >>>>>>> 03a790ad9a (wxGUI: refactoring: build GUI tools' status bars based on wx.StatusBar widget (#1689)) @@ -1350,6 +1379,7 @@ struct Option *G_define_standard_option(int opt) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1442,6 +1472,8 @@ struct Option *G_define_standard_option(int opt) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main case G_OPT_STDS_INPUT: Opt->key = "input"; diff --git a/lib/gis/parser_wps.c b/lib/gis/parser_wps.c index a5509829e4d..c6b55586e02 100644 --- a/lib/gis/parser_wps.c +++ b/lib/gis/parser_wps.c @@ -297,6 +297,7 @@ void G__wps_print_process_description(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -343,6 +344,8 @@ void G__wps_print_process_description(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -359,6 +362,7 @@ void G__wps_print_process_description(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -413,6 +417,8 @@ void G__wps_print_process_description(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (is_input == 1) num_vector_inputs++; @@ -433,6 +439,7 @@ void G__wps_print_process_description(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -504,6 +511,11 @@ void G__wps_print_process_description(void) >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) >>>>>>> osgeo-main ======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +>>>>>>> osgeo-main +======= ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -521,6 +533,7 @@ void G__wps_print_process_description(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -571,6 +584,8 @@ void G__wps_print_process_description(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } /* Modules may have different types of space time datasets @@ -611,6 +626,7 @@ void G__wps_print_process_description(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -657,6 +673,8 @@ void G__wps_print_process_description(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -673,6 +691,7 @@ void G__wps_print_process_description(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -727,6 +746,8 @@ void G__wps_print_process_description(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (is_input == 1) num_stvds_inputs++; @@ -747,6 +768,7 @@ void G__wps_print_process_description(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) @@ -818,6 +840,11 @@ void G__wps_print_process_description(void) >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) >>>>>>> osgeo-main ======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 498a331298 (Fix missing function prototypes (#2727)) +>>>>>>> osgeo-main +======= ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -835,6 +862,7 @@ void G__wps_print_process_description(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -885,6 +913,8 @@ void G__wps_print_process_description(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } if (strcmp(token, "file") == 0) { @@ -1231,6 +1261,7 @@ static void wps_print_process_description_begin( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1270,6 +1301,8 @@ static void wps_print_process_description_begin( ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1287,6 +1320,7 @@ static void wps_print_process_description_begin( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1340,6 +1374,8 @@ static void wps_print_process_description_begin( ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (abstract) { fprintf(stdout, "\t\t"); @@ -1365,6 +1401,7 @@ static void wps_print_process_description_begin( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1427,6 +1464,9 @@ static void wps_print_process_description_begin( >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if(abstract) @@ -1449,6 +1489,7 @@ static void wps_print_process_description_begin( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -1471,6 +1512,8 @@ static void wps_print_process_description_begin( >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -1490,6 +1533,7 @@ static void wps_print_process_description_begin( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1582,6 +1626,10 @@ static void wps_print_process_description_begin( ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fprintf(stdout, "\n"); } diff --git a/lib/gis/proj3.c b/lib/gis/proj3.c index 6472e8aacea..3d35c1ffabe 100644 --- a/lib/gis/proj3.c +++ b/lib/gis/proj3.c @@ -87,6 +87,7 @@ const char *G_database_unit_name(int plural) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -157,6 +158,10 @@ int G_database_unit(void) ======= >>>>>>> osgeo-main ======= +int G_database_unit(void) +======= +>>>>>>> osgeo-main +======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) int G_database_unit() >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -183,6 +188,7 @@ int G_database_unit(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -273,6 +279,8 @@ int G_database_unit(void) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { int units; const char *name; diff --git a/lib/gis/rd_cellhd.c b/lib/gis/rd_cellhd.c index a9ffb6cce00..dff8607b6e0 100644 --- a/lib/gis/rd_cellhd.c +++ b/lib/gis/rd_cellhd.c @@ -68,6 +68,7 @@ static double scan_double(const char *, double *); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD \param is_cellhd ? (unused) */ @@ -112,6 +113,8 @@ void G__read_Cell_head(FILE *fd, struct Cell_head *cellhd, int is_cellhd) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main */ void G__read_Cell_head(FILE *fd, struct Cell_head *cellhd) @@ -134,6 +137,7 @@ void G__read_Cell_head(FILE *fd, struct Cell_head *cellhd, int is_cellhd) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -162,6 +166,8 @@ void G__read_Cell_head(FILE *fd, struct Cell_head *cellhd, int is_cellhd) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= \param is_cellhd ? (unused) */ @@ -181,6 +187,7 @@ void G__read_Cell_head(FILE *fd, struct Cell_head *cellhd, int is_cellhd) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -223,6 +230,8 @@ void G__read_Cell_head(FILE *fd, struct Cell_head *cellhd, int is_cellhd) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { int count; char **array; @@ -278,6 +287,7 @@ void G__read_Cell_head(FILE *fd, struct Cell_head *cellhd, int is_cellhd) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -312,6 +322,8 @@ void G__read_Cell_head(FILE *fd, struct Cell_head *cellhd, int is_cellhd) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main */ void G__read_Cell_head_array(char **array, struct Cell_head *cellhd) @@ -332,6 +344,7 @@ void G__read_Cell_head_array(char **array, struct Cell_head *cellhd) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -382,6 +395,8 @@ void G__read_Cell_head_array(char **array, struct Cell_head *cellhd) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main \param is_cellhd ? (unused) */ @@ -404,6 +419,7 @@ void G__read_Cell_head_array(char **array, struct Cell_head *cellhd, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -495,6 +511,11 @@ void G__read_Cell_head_array(char **array, struct Cell_head *cellhd, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { char *buf; char label[200]; diff --git a/lib/gis/snprintf.c b/lib/gis/snprintf.c index 91a4b0871d7..02ecf22dce9 100644 --- a/lib/gis/snprintf.c +++ b/lib/gis/snprintf.c @@ -72,6 +72,7 @@ int G_snprintf(char *str, size_t size, const char *fmt, ...) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -143,6 +144,10 @@ int G_snprintf(char *str, size_t size, const char *fmt, ...) ======= if (count >= 0 && (unsigned int)count == size) ======= +>>>>>>> osgeo-main +======= + if (count >= 0 && (unsigned int)count == size) +======= >>>>>>> osgeo-main if (count == size) <<<<<<< HEAD @@ -166,6 +171,7 @@ int G_snprintf(char *str, size_t size, const char *fmt, ...) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -194,6 +200,8 @@ int G_snprintf(char *str, size_t size, const char *fmt, ...) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (count == size) ======= @@ -214,6 +222,7 @@ int G_snprintf(char *str, size_t size, const char *fmt, ...) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -291,6 +300,8 @@ int G_snprintf(char *str, size_t size, const char *fmt, ...) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main str[--count] = '\0'; diff --git a/lib/gis/spawn.c b/lib/gis/spawn.c index 9406e8de1ac..57eff0ee265 100644 --- a/lib/gis/spawn.c +++ b/lib/gis/spawn.c @@ -949,6 +949,7 @@ int G_spawn(const char *command, ...) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1023,6 +1024,10 @@ int G_spawn(const char *command, ...) ======= for (;;) { ======= +>>>>>>> osgeo-main +======= + for (;;) { +======= >>>>>>> osgeo-main for (i = 0;; i++) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1046,6 +1051,7 @@ int G_spawn(const char *command, ...) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1074,6 +1080,8 @@ int G_spawn(const char *command, ...) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for (i = 0;; i++) { ======= @@ -1094,6 +1102,7 @@ int G_spawn(const char *command, ...) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1177,6 +1186,8 @@ int G_spawn(const char *command, ...) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main const char *arg = va_arg(va, const char *); diff --git a/lib/gis/tempfile.c b/lib/gis/tempfile.c index a99b5b3a742..444d624cd69 100644 --- a/lib/gis/tempfile.c +++ b/lib/gis/tempfile.c @@ -192,6 +192,7 @@ void G__temp_element(char *element, int tmp) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -256,6 +257,10 @@ void G__temp_element(char *element, int tmp) >>>>>>> osgeo-main ======= +======= +>>>>>>> osgeo-main +======= + ======= >>>>>>> osgeo-main @@ -280,6 +285,7 @@ void G__temp_element(char *element, int tmp) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -357,6 +363,8 @@ void G__temp_element(char *element, int tmp) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_debug(2, "G__temp_element(): %s (tmp=%d)", element, tmp); } diff --git a/lib/gis/user_config.c b/lib/gis/user_config.c index df340a44f41..74bc6c2eec9 100644 --- a/lib/gis/user_config.c +++ b/lib/gis/user_config.c @@ -184,6 +184,7 @@ static int _elem_count_split(char *elems) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -255,6 +256,10 @@ static int _elem_count_split(char *elems) ======= for (i = 0; begin != NULL && (ptrdiff_t)len > begin - elems; i++) { ======= +>>>>>>> osgeo-main +======= + for (i = 0; begin != NULL && (ptrdiff_t)len > begin - elems; i++) { +======= >>>>>>> osgeo-main for (i = 0; begin != NULL && len > begin - elems; i++) { <<<<<<< HEAD @@ -278,6 +283,7 @@ static int _elem_count_split(char *elems) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -306,6 +312,8 @@ static int _elem_count_split(char *elems) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for (i = 0; begin != NULL && len > begin - elems; i++) { ======= @@ -326,6 +334,7 @@ static int _elem_count_split(char *elems) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -403,6 +412,8 @@ static int _elem_count_split(char *elems) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* check '.' condition */ if (*begin == '.') diff --git a/lib/gis/view.c b/lib/gis/view.c index 7ba3ef66b25..17d2ae58df9 100644 --- a/lib/gis/view.c +++ b/lib/gis/view.c @@ -183,6 +183,7 @@ int G_put_3dview(const char *fname, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -274,6 +275,11 @@ int G_put_3dview(const char *fname, const char *mapset, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main { FILE *fp; diff --git a/lib/gmath/blas_level_1.c b/lib/gmath/blas_level_1.c index 239e8981e35..e54b0df6a05 100644 --- a/lib/gmath/blas_level_1.c +++ b/lib/gmath/blas_level_1.c @@ -355,6 +355,7 @@ void G_math_f_asum_norm(float *x, float *value, int rows) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -412,6 +413,8 @@ void G_math_f_asum_norm(float *x, float *value, int rows) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main #pragma omp parallel for schedule(static) private(i) reduction(+ : s) for (i = 0; i < rows; i++) { s += fabs(x[i]); @@ -436,6 +439,7 @@ void G_math_f_asum_norm(float *x, float *value, int rows) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #pragma omp parallel for schedule(static) private(i) reduction(+ : s) for (i = 0; i < rows; i++) { s += fabs(x[i]); @@ -502,6 +506,10 @@ void G_math_f_asum_norm(float *x, float *value, int rows) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main +======= +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main #pragma omp parallel for schedule(static) private(i) reduction(+ : s, count) for (i = 0; i < rows; i++) { s += fabs(x[i]); @@ -521,6 +529,7 @@ void G_math_f_asum_norm(float *x, float *value, int rows) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -617,6 +626,10 @@ void G_math_f_asum_norm(float *x, float *value, int rows) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> osgeo-main #pragma omp parallel for schedule(static) private(i) reduction(+ : s, count) for (i = 0; i < rows; i++) { s += fabs(x[i]); @@ -629,6 +642,7 @@ void G_math_f_asum_norm(float *x, float *value, int rows) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -705,6 +719,8 @@ void G_math_f_asum_norm(float *x, float *value, int rows) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= #pragma omp parallel for schedule(static) private(i) reduction(+ : s) @@ -719,6 +735,7 @@ void G_math_f_asum_norm(float *x, float *value, int rows) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727)) ======= ======= @@ -759,6 +776,11 @@ void G_math_f_asum_norm(float *x, float *value, int rows) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main } #pragma omp single diff --git a/lib/gmath/brent.c b/lib/gmath/brent.c index 614a53be5e6..b2c4ebecdec 100644 --- a/lib/gmath/brent.c +++ b/lib/gmath/brent.c @@ -68,6 +68,7 @@ typedef struct { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -143,6 +144,10 @@ static int brent(void *vstate, double (*f)(double), double *x_minimum, static int brent(void *vstate, double (*f)(double), double *x_minimum, ======= >>>>>>> osgeo-main +======= +static int brent(void *vstate, double (*f)(double), double *x_minimum, +======= +>>>>>>> osgeo-main static int brent(void *vstate, double (*f)(), double *x_minimum, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -165,6 +170,7 @@ static int brent(void *vstate, double (*f)(double), double *x_minimum, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -194,6 +200,8 @@ static int brent(void *vstate, double (*f)(double), double *x_minimum, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= static int brent(void *vstate, double (*f)(), double *x_minimum, ======= static int brent(void *vstate, double (*f)(double), double *x_minimum, @@ -213,6 +221,7 @@ static int brent(void *vstate, double (*f)(double), double *x_minimum, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -296,6 +305,8 @@ static int brent(void *vstate, double (*f)(), double *x_minimum, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main double *f_minimum, double *x_lower, double *f_lower, double *x_upper, double *f_upper) @@ -446,6 +457,7 @@ static int brent(void *vstate, double (*f)(), double *x_minimum, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -535,6 +547,11 @@ double brent_iterate(double (*f)(double), double x_lower, double x_upper, int maxiter) ======= >>>>>>> osgeo-main +======= +double brent_iterate(double (*f)(double), double x_lower, double x_upper, + int maxiter) +======= +>>>>>>> osgeo-main double brent_iterate(double (*f)(), double x_lower, double x_upper, int maxiter) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -558,6 +575,7 @@ double brent_iterate(double (*f)(double), double x_lower, double x_upper, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -587,6 +605,8 @@ double brent_iterate(double (*f)(double), double x_lower, double x_upper, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= double brent_iterate(double (*f)(), double x_lower, double x_upper, int maxiter) ======= double brent_iterate(double (*f)(double), double x_lower, double x_upper, @@ -607,6 +627,7 @@ double brent_iterate(double (*f)(double), double x_lower, double x_upper, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -694,6 +715,8 @@ double brent_iterate(double (*f)(), double x_lower, double x_upper, int maxiter) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { int i; double x_minimum = (x_upper + x_lower) / 2.; diff --git a/lib/gmath/la.c b/lib/gmath/la.c index dc5771b6934..764dd79754d 100644 --- a/lib/gmath/la.c +++ b/lib/gmath/la.c @@ -867,6 +867,7 @@ int G_matvect_extract_vector(mat_struct *mt, vtype vt, int indx) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -901,6 +902,8 @@ int G_matvect_extract_vector(mat_struct *mt, vtype vt, int indx) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main break; ======= @@ -921,6 +924,7 @@ int G_matvect_extract_vector(mat_struct *mt, vtype vt, int indx) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -971,6 +975,8 @@ int G_matvect_extract_vector(mat_struct *mt, vtype vt, int indx) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -994,6 +1000,7 @@ int G_matvect_extract_vector(mat_struct *mt, vtype vt, int indx) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1028,6 +1035,8 @@ int G_matvect_extract_vector(mat_struct *mt, vtype vt, int indx) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main break; ======= @@ -1048,6 +1057,7 @@ int G_matvect_extract_vector(mat_struct *mt, vtype vt, int indx) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1098,6 +1108,8 @@ int G_matvect_extract_vector(mat_struct *mt, vtype vt, int indx) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -1541,6 +1553,7 @@ double G_vector_norm1(vec_struct *vc) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1615,6 +1628,10 @@ double G_vector_norm1(vec_struct *vc) ======= return NAN; ======= +>>>>>>> osgeo-main +======= + return NAN; +======= >>>>>>> osgeo-main return 0.0 / 0.0; /* NaN */ >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1638,6 +1655,7 @@ double G_vector_norm1(vec_struct *vc) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1666,6 +1684,8 @@ double G_vector_norm1(vec_struct *vc) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= return 0.0 / 0.0; /* NaN */ ======= @@ -1686,6 +1706,7 @@ double G_vector_norm1(vec_struct *vc) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1769,6 +1790,8 @@ double G_vector_norm1(vec_struct *vc) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } diff --git a/lib/gmath/solvers_classic_iter.c b/lib/gmath/solvers_classic_iter.c index 0ea2e348c52..b55358bffca 100644 --- a/lib/gmath/solvers_classic_iter.c +++ b/lib/gmath/solvers_classic_iter.c @@ -88,6 +88,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -150,6 +151,8 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (j = 0; j < (unsigned int)rows; j++) { Enew[j] = x[j]; @@ -171,6 +174,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -203,6 +207,8 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -219,6 +225,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -267,6 +274,8 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (j = 0; j < rows; j++) { Enew[j] = x[j]; @@ -293,6 +302,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -323,6 +333,8 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -341,6 +353,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= ======= @@ -402,6 +415,10 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= >>>>>>> osgeo-main for (j = 0; j < (unsigned int)rows; j++) { Enew[j] = x[j]; @@ -423,6 +440,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -451,6 +469,8 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -469,6 +489,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -537,6 +558,8 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main E = 0; center = 0; @@ -571,6 +594,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -645,6 +669,10 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, ======= for (j = 0; j < (unsigned int)rows; j++) { ======= +>>>>>>> osgeo-main +======= + for (j = 0; j < (unsigned int)rows; j++) { +======= >>>>>>> osgeo-main for (j = 0; j < rows; j++) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -668,6 +696,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -696,6 +725,8 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for (j = 0; j < rows; j++) { ======= @@ -716,6 +747,7 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -799,6 +831,8 @@ int G_math_solver_sparse_jacobi(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main err += (x[j] - Enew[j]) * (x[j] - Enew[j]); @@ -885,6 +919,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -947,6 +982,8 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (j = 0; j < (unsigned int)rows; j++) { Enew[j] = x[j]; @@ -968,6 +1005,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1000,6 +1038,8 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1016,6 +1056,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1064,6 +1105,8 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (j = 0; j < rows; j++) { Enew[j] = x[j]; @@ -1090,6 +1133,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1120,6 +1164,8 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1138,6 +1184,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= ======= @@ -1199,6 +1246,10 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= >>>>>>> osgeo-main for (j = 0; j < (unsigned int)rows; j++) { Enew[j] = x[j]; @@ -1220,6 +1271,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1248,6 +1300,8 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -1266,6 +1320,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1334,6 +1389,8 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main E = 0; center = 0; @@ -1368,6 +1425,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1442,6 +1500,10 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, ======= for (j = 0; j < (unsigned int)rows; j++) { ======= +>>>>>>> osgeo-main +======= + for (j = 0; j < (unsigned int)rows; j++) { +======= >>>>>>> osgeo-main for (j = 0; j < rows; j++) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1465,6 +1527,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1493,6 +1556,8 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for (j = 0; j < rows; j++) { ======= @@ -1513,6 +1578,7 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1596,6 +1662,8 @@ int G_math_solver_sparse_gs(G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main err += (x[j] - Enew[j]) * (x[j] - Enew[j]); diff --git a/lib/gmath/solvers_krylov.c b/lib/gmath/solvers_krylov.c index c7d6dfe0c12..24fa246ab8d 100644 --- a/lib/gmath/solvers_krylov.c +++ b/lib/gmath/solvers_krylov.c @@ -198,6 +198,7 @@ int solver_pcg(double **A, G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*performe the preconditioning */ ======= @@ -240,6 +241,8 @@ int solver_pcg(double **A, G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /*perform the preconditioning */ ======= @@ -259,6 +262,7 @@ int solver_pcg(double **A, G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /*performe the preconditioning */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -341,6 +345,11 @@ int solver_pcg(double **A, G_math_spvector **Asp, double *x, double *b, ======= /*performe the preconditioning */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /*performe the preconditioning */ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_math_Ax_sparse(M, r, p, rows); @@ -413,6 +422,7 @@ int solver_pcg(double **A, G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*performe the preconditioning */ ======= @@ -455,6 +465,8 @@ int solver_pcg(double **A, G_math_spvector **Asp, double *x, double *b, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /*perform the preconditioning */ ======= @@ -474,6 +486,7 @@ int solver_pcg(double **A, G_math_spvector **Asp, double *x, double *b, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /*performe the preconditioning */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -556,6 +569,11 @@ int solver_pcg(double **A, G_math_spvector **Asp, double *x, double *b, ======= /*performe the preconditioning */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /*performe the preconditioning */ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_math_Ax_sparse(M, r, z, rows); @@ -1101,6 +1119,7 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1175,6 +1194,10 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, ======= for (i = 0; i < (unsigned int)rows; i++) { ======= +>>>>>>> osgeo-main +======= + for (i = 0; i < (unsigned int)rows; i++) { +======= >>>>>>> osgeo-main for (i = 0; i < rows; i++) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1198,6 +1221,7 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1226,6 +1250,8 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for (i = 0; i < rows; i++) { ======= @@ -1246,6 +1272,7 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1329,6 +1356,8 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_math_spvector *spvect = G_math_alloc_spvector(1); @@ -1384,6 +1413,7 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1458,6 +1488,10 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, ======= for (i = 0; i < (unsigned int)rows; i++) { ======= +>>>>>>> osgeo-main +======= + for (i = 0; i < (unsigned int)rows; i++) { +======= >>>>>>> osgeo-main for (i = 0; i < rows; i++) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1481,6 +1515,7 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1509,6 +1544,8 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for (i = 0; i < rows; i++) { ======= @@ -1529,6 +1566,7 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1612,6 +1650,8 @@ G_math_spvector **create_diag_precond_matrix(double **A, G_math_spvector **Asp, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_math_spvector *spvect = G_math_alloc_spvector(1); diff --git a/lib/gmath/sparse_matrix.c b/lib/gmath/sparse_matrix.c index 28d4992daec..c9090195f67 100644 --- a/lib/gmath/sparse_matrix.c +++ b/lib/gmath/sparse_matrix.c @@ -55,6 +55,7 @@ int G_math_add_spvector(G_math_spvector **Asp, G_math_spvector *spvector, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD spvector, row); ======= @@ -97,6 +98,8 @@ int G_math_add_spvector(G_math_spvector **Asp, G_math_spvector *spvector, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main (void *)spvector, row); ======= @@ -116,6 +119,7 @@ int G_math_add_spvector(G_math_spvector **Asp, G_math_spvector *spvector, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= spvector, row); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -198,6 +202,11 @@ int G_math_add_spvector(G_math_spvector **Asp, G_math_spvector *spvector, ======= spvector, row); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + spvector, row); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main Asp[row] = spvector; } @@ -336,6 +345,7 @@ void G_math_print_spmatrix(G_math_spvector **Asp, int rows) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -410,6 +420,10 @@ void G_math_print_spmatrix(G_math_spvector **Asp, int rows) ======= if (Asp[i]->index[k] == (unsigned int)j) { ======= +>>>>>>> osgeo-main +======= + if (Asp[i]->index[k] == (unsigned int)j) { +======= >>>>>>> osgeo-main if (Asp[i]->index[k] == j) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -433,6 +447,7 @@ void G_math_print_spmatrix(G_math_spvector **Asp, int rows) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -461,6 +476,8 @@ void G_math_print_spmatrix(G_math_spvector **Asp, int rows) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (Asp[i]->index[k] == j) { ======= @@ -481,6 +498,7 @@ void G_math_print_spmatrix(G_math_spvector **Asp, int rows) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -564,6 +582,8 @@ void G_math_print_spmatrix(G_math_spvector **Asp, int rows) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(stdout, "%4.5f ", Asp[i]->values[k]); out = 1; @@ -664,6 +684,7 @@ double **G_math_Asp_to_sband_matrix(G_math_spvector **Asp, int rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -735,6 +756,10 @@ double **G_math_Asp_to_sband_matrix(G_math_spvector **Asp, int rows, ======= for (i = 0; i < (unsigned int)rows; i++) { ======= +>>>>>>> osgeo-main +======= + for (i = 0; i < (unsigned int)rows; i++) { +======= >>>>>>> osgeo-main for (i = 0; i < rows; i++) { <<<<<<< HEAD @@ -758,6 +783,7 @@ double **G_math_Asp_to_sband_matrix(G_math_spvector **Asp, int rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -786,6 +812,8 @@ double **G_math_Asp_to_sband_matrix(G_math_spvector **Asp, int rows, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for (i = 0; i < rows; i++) { ======= @@ -806,6 +834,7 @@ double **G_math_Asp_to_sband_matrix(G_math_spvector **Asp, int rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -883,6 +912,8 @@ double **G_math_Asp_to_sband_matrix(G_math_spvector **Asp, int rows, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (j = 0; j < Asp[i]->cols; j++) { if (Asp[i]->index[j] == i) { diff --git a/lib/gmath/test/bench_solver_direct.c b/lib/gmath/test/bench_solver_direct.c index e458c6893e4..bf4384abb6e 100644 --- a/lib/gmath/test/bench_solver_direct.c +++ b/lib/gmath/test/bench_solver_direct.c @@ -42,6 +42,7 @@ static int bench_solvers(int rows); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -83,6 +84,8 @@ static int bench_solvers(int rows); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* ************************************************************************* */ /* Perform the solver unit tests ****************************************** */ @@ -104,6 +107,7 @@ static int bench_solvers(int rows); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -140,6 +144,8 @@ static int bench_solvers(int rows); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* ************************************************************************* */ /* Performe the solver unit tests ****************************************** */ @@ -161,6 +167,7 @@ static int bench_solvers(int rows); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -252,6 +259,11 @@ static int bench_solvers(int rows); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main int bench_solvers_direct(int rows) { G_message(_("\n++ Running direct solver benchmark ++")); diff --git a/lib/gmath/test/bench_solver_krylov.c b/lib/gmath/test/bench_solver_krylov.c index 7450397695d..473d8bafa26 100644 --- a/lib/gmath/test/bench_solver_krylov.c +++ b/lib/gmath/test/bench_solver_krylov.c @@ -42,6 +42,7 @@ static int bench_solvers(int rows); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -83,6 +84,8 @@ static int bench_solvers(int rows); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* ************************************************************************* */ /* Perform the solver unit tests ****************************************** */ @@ -104,6 +107,7 @@ static int bench_solvers(int rows); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -140,6 +144,8 @@ static int bench_solvers(int rows); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main /* ************************************************************************* */ /* Performe the solver unit tests ****************************************** */ @@ -161,6 +167,7 @@ static int bench_solvers(int rows); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -252,6 +259,11 @@ static int bench_solvers(int rows); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main int bench_solvers_krylov(int rows) { G_message(_("\n++ Running krylov solver benchmark ++")); diff --git a/lib/gpde/N_pde.h b/lib/gpde/N_pde.h index d37d0845d3a..b736c2b308b 100644 --- a/lib/gpde/N_pde.h +++ b/lib/gpde/N_pde.h @@ -331,6 +331,7 @@ typedef struct { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -405,6 +406,10 @@ typedef struct { ======= N_data_star *(*callback)(void *, N_geom_data *, int, int, int); ======= +>>>>>>> osgeo-main +======= + N_data_star *(*callback)(void *, N_geom_data *, int, int, int); +======= >>>>>>> osgeo-main N_data_star *(*callback)(); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -428,6 +433,7 @@ typedef struct { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -456,6 +462,8 @@ typedef struct { >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= N_data_star *(*callback)(); ======= @@ -476,6 +484,7 @@ typedef struct { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -560,6 +569,8 @@ typedef struct { >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main } N_les_callback_3d; /*! @@ -590,6 +601,7 @@ typedef struct { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -652,6 +664,8 @@ typedef struct { ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main N_data_star *(*callback)(void *, N_geom_data *, int, int); } N_les_callback_2d; @@ -677,6 +691,7 @@ extern void N_set_les_callback_2d_func( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -706,6 +721,8 @@ extern void N_set_les_callback_2d_func( ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) N_data_star *(*callback)(); @@ -722,6 +739,7 @@ extern void N_set_les_callback_2d_func( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= @@ -755,6 +773,8 @@ extern void N_set_les_callback_2d_func( ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main N_data_star *(*callback)(); } N_les_callback_2d; @@ -770,6 +790,7 @@ extern void N_set_les_callback_2d_func( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -826,6 +847,8 @@ extern void N_set_les_callback_2d_func( >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main extern void N_set_les_callback_3d_func(N_les_callback_3d *data, N_data_star *(*callback_func_3d)()); extern void N_set_les_callback_2d_func(N_les_callback_2d *data, @@ -850,6 +873,7 @@ extern void N_set_les_callback_2d_func(N_les_callback_2d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -880,6 +904,8 @@ extern void N_set_les_callback_2d_func(N_les_callback_2d *data, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -898,6 +924,7 @@ extern void N_set_les_callback_2d_func(N_les_callback_2d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= ======= @@ -959,6 +986,10 @@ extern void N_set_les_callback_2d_func(N_les_callback_2d *data, ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= >>>>>>> osgeo-main N_data_star *(*callback)(void *, N_geom_data *, int, int); } N_les_callback_2d; @@ -984,6 +1015,7 @@ extern void N_set_les_callback_2d_func( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -1012,6 +1044,8 @@ extern void N_set_les_callback_2d_func( >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -1030,6 +1064,7 @@ extern void N_set_les_callback_2d_func( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1099,6 +1134,8 @@ extern void N_set_les_callback_2d_func( >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main extern N_les_callback_3d *N_alloc_les_callback_3d(void); extern N_les_callback_2d *N_alloc_les_callback_2d(void); extern N_data_star *N_alloc_5star(void); diff --git a/lib/gpde/gpdelib.dox b/lib/gpde/gpdelib.dox index 59fee5d0fc9..f6853b3af83 100644 --- a/lib/gpde/gpdelib.dox +++ b/lib/gpde/gpdelib.dox @@ -247,6 +247,7 @@ void #N_write_array_2d_to_rast (N_array_2d * array, char *name); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -322,6 +323,10 @@ The GRASS module r.gwflow ======= >>>>>>> osgeo-main +======= +The GRASS module r.gwflow +======= +>>>>>>> osgeo-main The GRASS module r.gwflow >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -344,6 +349,7 @@ The GRASS module r.gwflow >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -469,6 +475,11 @@ The GRASS module r.gwflow >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +The GRASS module r.gwflow +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main implements numerical calculation program for transient, confined and unconfined groundwater flow in two dimensions. @@ -563,6 +574,7 @@ void #N_write_array_3d_to_rast3d (N_array_3d * array, char *name, int mask); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -638,6 +650,10 @@ The GRASS module r3.gwflow ======= >>>>>>> osgeo-main +======= +The GRASS module r3.gwflow +======= +>>>>>>> osgeo-main The GRASS module r3.gwflow >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -660,6 +676,7 @@ The GRASS module r3.gwflow >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -785,6 +802,11 @@ The GRASS module r3.gwflow >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +The GRASS module r3.gwflow +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main implements numerical calculation program for transient, confined groundwater flow in three dimensions. @@ -1111,6 +1133,7 @@ The two dimensional gradient consits of 4 values between the neighbour cells <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) @@ -1201,6 +1224,11 @@ The two dimensional gradient consits of 4 values between the neighbour cells >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main ______________ | | | | diff --git a/lib/gpde/n_arrays.c b/lib/gpde/n_arrays.c index e6a2b1b9b39..1c72ca8cadc 100644 --- a/lib/gpde/n_arrays.c +++ b/lib/gpde/n_arrays.c @@ -635,6 +635,7 @@ void N_print_array_2d_info(N_array_2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -725,6 +726,11 @@ void N_print_array_2d_info(N_array_2d *data) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main return; diff --git a/lib/gpde/n_arrays_calc.c b/lib/gpde/n_arrays_calc.c index 2dc252fd26d..aca9f817cf3 100644 --- a/lib/gpde/n_arrays_calc.c +++ b/lib/gpde/n_arrays_calc.c @@ -469,6 +469,7 @@ int N_convert_array_2d_null_to_zero(N_array_2d *a) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "N_convert_array_2d_null_to_zero: %i valuess of type " ======= @@ -505,6 +506,8 @@ int N_convert_array_2d_null_to_zero(N_array_2d *a) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "N_convert_array_2d_null_to_zero: %i values of type " ======= @@ -522,6 +525,7 @@ int N_convert_array_2d_null_to_zero(N_array_2d *a) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -592,6 +596,11 @@ int N_convert_array_2d_null_to_zero(N_array_2d *a) ======= "N_convert_array_2d_null_to_zero: %i valuess of type " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "N_convert_array_2d_null_to_zero: %i valuess of type " +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "FCELL_TYPE are converted", count); @@ -605,6 +614,7 @@ int N_convert_array_2d_null_to_zero(N_array_2d *a) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -660,6 +670,8 @@ int N_convert_array_2d_null_to_zero(N_array_2d *a) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main "N_convert_array_2d_null_to_zero: %i values of type " ======= @@ -679,6 +691,7 @@ int N_convert_array_2d_null_to_zero(N_array_2d *a) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= "N_convert_array_2d_null_to_zero: %i valuess of type " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -774,6 +787,11 @@ int N_convert_array_2d_null_to_zero(N_array_2d *a) ======= "N_convert_array_2d_null_to_zero: %i valuess of type " >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + "N_convert_array_2d_null_to_zero: %i valuess of type " +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "DCELL_TYPE are converted", count); diff --git a/lib/gpde/n_arrays_io.c b/lib/gpde/n_arrays_io.c index b76aa10c0d1..9c93ec3c4f1 100644 --- a/lib/gpde/n_arrays_io.c +++ b/lib/gpde/n_arrays_io.c @@ -258,6 +258,7 @@ void N_write_array_2d_to_rast(N_array_2d *array, char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \param mask int - 0 = false, 1 = ture : if a mask is presenent, use it with ======= @@ -300,6 +301,8 @@ void N_write_array_2d_to_rast(N_array_2d *array, char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \param mask int - 0 = false, 1 = true : if a mask is presenent, use it with ======= @@ -319,6 +322,7 @@ void N_write_array_2d_to_rast(N_array_2d *array, char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \param mask int - 0 = false, 1 = ture : if a mask is presenent, use it with >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -401,6 +405,11 @@ void N_write_array_2d_to_rast(N_array_2d *array, char *name) ======= * \param mask int - 0 = false, 1 = ture : if a mask is presenent, use it with >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \param mask int - 0 = false, 1 = ture : if a mask is presenent, use it with +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * the input volume map \return N_array_3d * - the existing or new allocated * array @@ -528,6 +537,7 @@ N_array_3d *N_read_rast3d_to_array_3d(char *name, N_array_3d *array, int mask) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file")); ======= @@ -570,6 +580,8 @@ N_array_3d *N_read_rast3d_to_array_3d(char *name, N_array_3d *array, int mask) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main Rast3d_fatal_error(_("Error closing g3d file <%s>"), name); ======= @@ -589,6 +601,7 @@ N_array_3d *N_read_rast3d_to_array_3d(char *name, N_array_3d *array, int mask) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -671,6 +684,11 @@ N_array_3d *N_read_rast3d_to_array_3d(char *name, N_array_3d *array, int mask) ======= Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file")); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main return data; @@ -788,6 +806,7 @@ void N_write_array_3d_to_rast3d(N_array_3d *array, char *name, int mask) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file")); ======= @@ -830,6 +849,8 @@ void N_write_array_3d_to_rast3d(N_array_3d *array, char *name, int mask) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main Rast3d_fatal_error(_("Error closing g3d file <%s>"), name); ======= @@ -849,6 +870,7 @@ void N_write_array_3d_to_rast3d(N_array_3d *array, char *name, int mask) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -931,6 +953,11 @@ void N_write_array_3d_to_rast3d(N_array_3d *array, char *name, int mask) ======= Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file")); >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + Rast3d_fatal_error(map, NULL, 0, _("Error closing g3d file")); +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main return; diff --git a/lib/gpde/n_gradient.c b/lib/gpde/n_gradient.c index ef76d5c2854..0da1ca0d5e5 100644 --- a/lib/gpde/n_gradient.c +++ b/lib/gpde/n_gradient.c @@ -116,6 +116,7 @@ int N_copy_gradient_2d(N_gradient_2d *source, N_gradient_2d *target) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * input gradient field. Returend is a new structure of type N_gradient_2d. ======= @@ -158,6 +159,8 @@ int N_copy_gradient_2d(N_gradient_2d *source, N_gradient_2d *target) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * input gradient field. Returned is a new structure of type N_gradient_2d. ======= @@ -177,6 +180,7 @@ int N_copy_gradient_2d(N_gradient_2d *source, N_gradient_2d *target) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * input gradient field. Returend is a new structure of type N_gradient_2d. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -259,6 +263,11 @@ int N_copy_gradient_2d(N_gradient_2d *source, N_gradient_2d *target) ======= * input gradient field. Returend is a new structure of type N_gradient_2d. >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * input gradient field. Returend is a new structure of type N_gradient_2d. +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * * \param field N_gradient_field_2d * - A two dimensional gradient field diff --git a/lib/gpde/n_gwflow.c b/lib/gpde/n_gwflow.c index 30f07533361..eb8a47751b7 100644 --- a/lib/gpde/n_gwflow.c +++ b/lib/gpde/n_gwflow.c @@ -37,6 +37,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \brief Alllocate memory for the groundwater calculation data structure in 3 ======= @@ -79,6 +80,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \brief Allocate memory for the groundwater calculation data structure in 3 ======= @@ -98,6 +101,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \brief Alllocate memory for the groundwater calculation data structure in 3 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -180,6 +184,11 @@ ======= * \brief Alllocate memory for the groundwater calculation data structure in 3 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \brief Alllocate memory for the groundwater calculation data structure in 3 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * dimensions * @@ -307,6 +316,7 @@ void N_free_gwflow_data3d(N_gwflow_data3d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \brief Alllocate memory for the groundwater calculation data structure in 2 ======= @@ -349,6 +359,8 @@ void N_free_gwflow_data3d(N_gwflow_data3d *data) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \brief Allocate memory for the groundwater calculation data structure in 2 ======= @@ -368,6 +380,7 @@ void N_free_gwflow_data3d(N_gwflow_data3d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \brief Alllocate memory for the groundwater calculation data structure in 2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -450,6 +463,11 @@ void N_free_gwflow_data3d(N_gwflow_data3d *data) ======= * \brief Alllocate memory for the groundwater calculation data structure in 2 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \brief Alllocate memory for the groundwater calculation data structure in 2 +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * dimensions * @@ -861,6 +879,7 @@ N_data_star *N_callback_gwflow_2d(void *gwdata, N_geom_data *geom, int col, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* If the aquifer is unconfied use an explicite scheme to solve ======= @@ -903,6 +922,8 @@ N_data_star *N_callback_gwflow_2d(void *gwdata, N_geom_data *geom, int col, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* If the aquifer is unconfied use an explicit scheme to solve ======= @@ -922,6 +943,7 @@ N_data_star *N_callback_gwflow_2d(void *gwdata, N_geom_data *geom, int col, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /* If the aquifer is unconfied use an explicite scheme to solve >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1004,6 +1026,11 @@ N_data_star *N_callback_gwflow_2d(void *gwdata, N_geom_data *geom, int col, ======= /* If the aquifer is unconfied use an explicite scheme to solve >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /* If the aquifer is unconfied use an explicite scheme to solve +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * the nonlinear equation. We use the phead from the first iteration */ z = N_get_array_2d_d_value(data->phead, col, row) - diff --git a/lib/gpde/n_les.c b/lib/gpde/n_les.c index 7136d29583b..4fb8f1c8be5 100644 --- a/lib/gpde/n_les.c +++ b/lib/gpde/n_les.c @@ -286,6 +286,7 @@ void N_print_les(N_les *les) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -374,6 +375,11 @@ void N_print_les(N_les *les) for (k = 0; (unsigned int)k < les->Asp[i]->cols; k++) { if (les->Asp[i]->index[k] == (unsigned int)j) { ======= +>>>>>>> osgeo-main +======= + for (k = 0; (unsigned int)k < les->Asp[i]->cols; k++) { + if (les->Asp[i]->index[k] == (unsigned int)j) { +======= >>>>>>> osgeo-main for (k = 0; k < les->Asp[i]->cols; k++) { if (les->Asp[i]->index[k] == j) { @@ -400,6 +406,7 @@ void N_print_les(N_les *les) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -428,6 +435,8 @@ void N_print_les(N_les *les) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for (k = 0; k < les->Asp[i]->cols; k++) { if (les->Asp[i]->index[k] == j) { @@ -450,6 +459,7 @@ void N_print_les(N_les *les) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -540,6 +550,8 @@ void N_print_les(N_les *les) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(stdout, "%4.5f ", les->Asp[i]->values[k]); out = 1; diff --git a/lib/gpde/n_les_assemble.c b/lib/gpde/n_les_assemble.c index 5990007d39c..df0911562f1 100644 --- a/lib/gpde/n_les_assemble.c +++ b/lib/gpde/n_les_assemble.c @@ -363,6 +363,7 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -419,6 +420,8 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main N_data_star *(*callback_func_3d)(void *, N_geom_data *, @@ -442,6 +445,7 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -472,6 +476,8 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main N_data_star *(*callback_func_3d)()) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -492,6 +498,7 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= N_data_star *(*callback_func_3d)()) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -527,6 +534,8 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= N_data_star *(*callback_func_3d)()) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -549,6 +558,7 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -577,6 +587,8 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -595,6 +607,7 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -658,6 +671,8 @@ void N_set_les_callback_3d_func(N_les_callback_3d *data, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { data->callback = callback_func_3d; } @@ -698,6 +713,7 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -754,6 +770,8 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main N_data_star *(*callback_func_2d)(void *, N_geom_data *, @@ -777,6 +795,7 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -807,6 +826,8 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main N_data_star *(*callback_func_2d)()) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -827,6 +848,7 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= N_data_star *(*callback_func_2d)()) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -862,6 +884,8 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= N_data_star *(*callback_func_2d)()) >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -884,6 +908,7 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -912,6 +937,8 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 498a331298 (Fix missing function prototypes (#2727)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -930,6 +957,7 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -993,6 +1021,8 @@ void N_set_les_callback_2d_func(N_les_callback_2d *data, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { data->callback = callback_func_2d; } @@ -1073,6 +1103,7 @@ N_les_callback_2d *N_alloc_les_callback_2d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD N_data_star *N_callback_template_3d(void *data, N_geom_data *geom, int col, int row, int depth) ======= @@ -1116,6 +1147,8 @@ N_data_star *N_callback_template_3d(void *data, N_geom_data *geom, int col, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main N_data_star *N_callback_template_3d(void *data UNUSED, N_geom_data *geom, int col UNUSED, int row UNUSED, int depth UNUSED) @@ -1137,6 +1170,7 @@ N_data_star *N_callback_template_3d(void *data, N_geom_data *geom, int col, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1166,6 +1200,8 @@ N_data_star *N_callback_template_3d(void *data, N_geom_data *geom, int col, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= N_data_star *N_callback_template_3d(void *data, N_geom_data *geom, int col, int row, int depth) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1183,6 +1219,7 @@ N_data_star *N_callback_template_3d(void *data, N_geom_data *geom, int col, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1225,6 +1262,8 @@ N_data_star *N_callback_template_3d(void *data, N_geom_data *geom, int col, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { N_data_star *star = N_alloc_7star(); @@ -1277,6 +1316,7 @@ N_data_star *N_callback_template_3d(void *data, N_geom_data *geom, int col, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD N_data_star *N_callback_template_2d(void *data, N_geom_data *geom, int col, int row) ======= @@ -1320,6 +1360,8 @@ N_data_star *N_callback_template_2d(void *data, N_geom_data *geom, int col, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main N_data_star *N_callback_template_2d(void *data UNUSED, N_geom_data *geom, int col UNUSED, int row UNUSED) ======= @@ -1340,6 +1382,7 @@ N_data_star *N_callback_template_2d(void *data, N_geom_data *geom, int col, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1369,6 +1412,8 @@ N_data_star *N_callback_template_2d(void *data, N_geom_data *geom, int col, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= N_data_star *N_callback_template_2d(void *data, N_geom_data *geom, int col, int row) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1386,6 +1431,7 @@ N_data_star *N_callback_template_2d(void *data, N_geom_data *geom, int col, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1428,6 +1474,8 @@ N_data_star *N_callback_template_2d(void *data, N_geom_data *geom, int col, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { N_data_star *star = N_alloc_9star(); @@ -1834,6 +1882,7 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1896,6 +1945,8 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (i = 0; (unsigned int)i < les->Asp[count]->cols; i++) les->Asp[count]->values[i] = 0.0; @@ -1918,6 +1969,7 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1950,6 +2002,8 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1966,6 +2020,7 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2014,6 +2069,8 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (i = 0; i < les->Asp[count]->cols; i++) les->Asp[count]->values[i] = 0.0; @@ -2041,6 +2098,7 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2071,6 +2129,8 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2089,6 +2149,7 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= ======= @@ -2150,6 +2211,10 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= >>>>>>> osgeo-main for (i = 0; (unsigned int)i < les->Asp[count]->cols; i++) les->Asp[count]->values[i] = 0.0; @@ -2172,6 +2237,7 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -2200,6 +2266,8 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -2218,6 +2286,7 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2286,6 +2355,8 @@ int N_les_integrate_dirichlet_2d(N_les *les, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main les->Asp[i]->values[j] = 0.0; } @@ -2766,6 +2837,7 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2828,6 +2900,8 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (i = 0; (unsigned int)i < les->Asp[count]->cols; i++) @@ -2853,6 +2927,7 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2885,6 +2960,8 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2901,6 +2978,7 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2949,6 +3027,8 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (i = 0; i < les->Asp[count]->cols; i++) les->Asp[count]->values[i] = 0.0; @@ -2976,6 +3056,7 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3006,6 +3087,8 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3024,6 +3107,7 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= ======= @@ -3085,6 +3169,10 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, ======= >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) ======= +>>>>>>> osgeo-main +======= +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +======= >>>>>>> osgeo-main for (i = 0; (unsigned int)i < les->Asp[count]->cols; i++) @@ -3110,6 +3198,7 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -3138,6 +3227,8 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) ======= >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794)) @@ -3156,6 +3247,7 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3224,6 +3316,8 @@ int N_les_integrate_dirichlet_3d(N_les *les, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main les->Asp[i]->values[j] = 0.0; } diff --git a/lib/gpde/n_solute_transport.c b/lib/gpde/n_solute_transport.c index 392cecdbbac..11494c1789d 100644 --- a/lib/gpde/n_solute_transport.c +++ b/lib/gpde/n_solute_transport.c @@ -386,6 +386,7 @@ N_data_star *N_callback_solute_transport_2d(void *solutedata, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \brief Alllocate memory for the solute transport data structure in three ======= @@ -428,6 +429,8 @@ N_data_star *N_callback_solute_transport_2d(void *solutedata, N_geom_data *geom, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \brief Allocate memory for the solute transport data structure in three ======= @@ -447,6 +450,7 @@ N_data_star *N_callback_solute_transport_2d(void *solutedata, N_geom_data *geom, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \brief Alllocate memory for the solute transport data structure in three >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -529,6 +533,11 @@ N_data_star *N_callback_solute_transport_2d(void *solutedata, N_geom_data *geom, ======= * \brief Alllocate memory for the solute transport data structure in three >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \brief Alllocate memory for the solute transport data structure in three +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * dimensions * @@ -599,6 +608,7 @@ N_solute_transport_data3d *N_alloc_solute_transport_data3d(int cols, int rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \brief Alllocate memory for the solute transport data structure in two ======= @@ -641,6 +651,8 @@ N_solute_transport_data3d *N_alloc_solute_transport_data3d(int cols, int rows, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \brief Allocate memory for the solute transport data structure in two ======= @@ -660,6 +672,7 @@ N_solute_transport_data3d *N_alloc_solute_transport_data3d(int cols, int rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \brief Alllocate memory for the solute transport data structure in two >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -742,6 +755,11 @@ N_solute_transport_data3d *N_alloc_solute_transport_data3d(int cols, int rows, ======= * \brief Alllocate memory for the solute transport data structure in two >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \brief Alllocate memory for the solute transport data structure in two +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * dimensions * @@ -958,6 +976,7 @@ void N_calc_solute_transport_transmission_2d(N_solute_transport_data2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * To compute the dispersivity tensor, the dispersivity lentghs and the gradient ======= @@ -1000,6 +1019,8 @@ void N_calc_solute_transport_transmission_2d(N_solute_transport_data2d *data) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * To compute the dispersivity tensor, the dispersivity lengths and the gradient ======= @@ -1019,6 +1040,7 @@ void N_calc_solute_transport_transmission_2d(N_solute_transport_data2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * To compute the dispersivity tensor, the dispersivity lentghs and the gradient >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1101,6 +1123,11 @@ void N_calc_solute_transport_transmission_2d(N_solute_transport_data2d *data) ======= * To compute the dispersivity tensor, the dispersivity lentghs and the gradient >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * To compute the dispersivity tensor, the dispersivity lentghs and the gradient +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * field must be present. * @@ -1122,6 +1149,7 @@ void N_calc_solute_transport_transmission_2d(N_solute_transport_data2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \todo Change the tensor calculation to a mor realistic algorithm ======= @@ -1164,6 +1192,8 @@ void N_calc_solute_transport_transmission_2d(N_solute_transport_data2d *data) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \todo Change the tensor calculation to a more realistic algorithm ======= @@ -1183,6 +1213,7 @@ void N_calc_solute_transport_transmission_2d(N_solute_transport_data2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \todo Change the tensor calculation to a mor realistic algorithm >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1265,6 +1296,11 @@ void N_calc_solute_transport_transmission_2d(N_solute_transport_data2d *data) ======= * \todo Change the tensor calculation to a mor realistic algorithm >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \todo Change the tensor calculation to a mor realistic algorithm +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * * \param data N_solute_transport_data2d * @@ -1337,6 +1373,7 @@ void N_calc_solute_transport_disptensor_2d(N_solute_transport_data2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * To compute the dispersivity tensor, the dispersivity lentghs and the gradient ======= @@ -1379,6 +1416,8 @@ void N_calc_solute_transport_disptensor_2d(N_solute_transport_data2d *data) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * To compute the dispersivity tensor, the dispersivity lengths and the gradient ======= @@ -1398,6 +1437,7 @@ void N_calc_solute_transport_disptensor_2d(N_solute_transport_data2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * To compute the dispersivity tensor, the dispersivity lentghs and the gradient >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1480,6 +1520,11 @@ void N_calc_solute_transport_disptensor_2d(N_solute_transport_data2d *data) ======= * To compute the dispersivity tensor, the dispersivity lentghs and the gradient >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * To compute the dispersivity tensor, the dispersivity lentghs and the gradient +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * field must be present. * @@ -1501,6 +1546,7 @@ void N_calc_solute_transport_disptensor_2d(N_solute_transport_data2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \todo Change the tensor calculation to a mor realistic algorithm ======= @@ -1543,6 +1589,8 @@ void N_calc_solute_transport_disptensor_2d(N_solute_transport_data2d *data) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \todo Change the tensor calculation to a more realistic algorithm ======= @@ -1562,6 +1610,7 @@ void N_calc_solute_transport_disptensor_2d(N_solute_transport_data2d *data) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \todo Change the tensor calculation to a mor realistic algorithm >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1644,6 +1693,11 @@ void N_calc_solute_transport_disptensor_2d(N_solute_transport_data2d *data) ======= * \todo Change the tensor calculation to a mor realistic algorithm >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \todo Change the tensor calculation to a mor realistic algorithm +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * * \param data N_solute_transport_data3d * diff --git a/lib/gpde/n_upwind.c b/lib/gpde/n_upwind.c index 7ae4a045863..705a2a5a241 100644 --- a/lib/gpde/n_upwind.c +++ b/lib/gpde/n_upwind.c @@ -38,6 +38,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \param sprod double -- the scalar produkt between the velocity vector and the ======= @@ -80,6 +81,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \param sprod double -- the scalar product between the velocity vector and the ======= @@ -99,6 +102,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \param sprod double -- the scalar produkt between the velocity vector and the >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -181,6 +185,11 @@ ======= * \param sprod double -- the scalar produkt between the velocity vector and the >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \param sprod double -- the scalar produkt between the velocity vector and the +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * normal vector between two points \param distance double -- distance between * two points \param D double -- diffusion/dispersion tensor part between two @@ -228,6 +237,7 @@ double N_full_upwinding(double sprod, double distance, double D) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD * \param sprod double -- the scalar produkt between the velocity vector and the ======= @@ -270,6 +280,8 @@ double N_full_upwinding(double sprod, double distance, double D) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * \param sprod double -- the scalar product between the velocity vector and the ======= @@ -289,6 +301,7 @@ double N_full_upwinding(double sprod, double distance, double D) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= * \param sprod double -- the scalar produkt between the velocity vector and the >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -371,6 +384,11 @@ double N_full_upwinding(double sprod, double distance, double D) ======= * \param sprod double -- the scalar produkt between the velocity vector and the >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + * \param sprod double -- the scalar produkt between the velocity vector and the +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * normal vector between two points \param distance double -- distance between * two points \param D double -- diffusion/dispersion tensor part between two diff --git a/lib/gpde/test/test_gwflow.c b/lib/gpde/test/test_gwflow.c index 6d98922a4b9..ae55f17f1df 100644 --- a/lib/gpde/test/test_gwflow.c +++ b/lib/gpde/test/test_gwflow.c @@ -295,6 +295,7 @@ int test_gwflow_3d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*GUASS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, ======= @@ -337,6 +338,8 @@ int test_gwflow_3d(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /*GAUSS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, ======= @@ -356,6 +359,7 @@ int test_gwflow_3d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /*GUASS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -438,6 +442,11 @@ int test_gwflow_3d(void) ======= /*GUASS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /*GUASS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main data->phead_start, (void *)data, call); G_math_solver_gauss(les->A, les->x, les->b, les->rows); @@ -466,6 +475,7 @@ int test_gwflow_3d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*GUASS*/ les = ======= @@ -508,6 +518,8 @@ int test_gwflow_3d(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /*GAUSS*/ les = ======= @@ -527,6 +539,7 @@ int test_gwflow_3d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /*GUASS*/ les = >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -609,6 +622,11 @@ int test_gwflow_3d(void) ======= /*GUASS*/ les = >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /*GUASS*/ les = +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main N_assemble_les_3d_dirichlet(N_NORMAL_LES, geom, data->status, data->phead_start, (void *)data, call); @@ -801,6 +819,7 @@ int test_gwflow_2d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*GUASS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, ======= @@ -843,6 +862,8 @@ int test_gwflow_2d(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /*GAUSS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, ======= @@ -862,6 +883,7 @@ int test_gwflow_2d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /*GUASS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -944,6 +966,11 @@ int test_gwflow_2d(void) ======= /*GUASS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /*GUASS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main data->phead_start, (void *)data, call); G_math_solver_gauss(les->A, les->x, les->b, les->rows); @@ -972,6 +999,7 @@ int test_gwflow_2d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*GUASS*/ les = ======= @@ -1014,6 +1042,8 @@ int test_gwflow_2d(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /*GAUSS*/ les = ======= @@ -1033,6 +1063,7 @@ int test_gwflow_2d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /*GUASS*/ les = >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1115,6 +1146,11 @@ int test_gwflow_2d(void) ======= /*GUASS*/ les = >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /*GUASS*/ les = +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main N_assemble_les_2d_dirichlet(N_NORMAL_LES, geom, data->status, data->phead_start, (void *)data, call); diff --git a/lib/gpde/test/test_solute_transport.c b/lib/gpde/test/test_solute_transport.c index 145693ea9e8..15ded1081f6 100644 --- a/lib/gpde/test/test_solute_transport.c +++ b/lib/gpde/test/test_solute_transport.c @@ -205,6 +205,7 @@ int test_solute_transport_3d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*GUASS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, ======= @@ -247,6 +248,8 @@ int test_solute_transport_3d(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /*GAUSS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, ======= @@ -266,6 +269,7 @@ int test_solute_transport_3d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /*GUASS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -348,6 +352,11 @@ int test_solute_transport_3d(void) ======= /*GUASS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /*GUASS*/ les = N_assemble_les_3d(N_NORMAL_LES, geom, data->status, +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main data->c_start, (void *)data, call); G_math_solver_gauss(les->A, les->x, les->b, les->rows); @@ -450,6 +459,7 @@ int test_solute_transport_2d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /*GUASS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, ======= @@ -492,6 +502,8 @@ int test_solute_transport_2d(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /*GAUSS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, ======= @@ -511,6 +523,7 @@ int test_solute_transport_2d(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /*GUASS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -593,6 +606,11 @@ int test_solute_transport_2d(void) ======= /*GUASS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /*GUASS*/ les = N_assemble_les_2d(N_NORMAL_LES, geom, data->status, +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main data->c_start, (void *)data, call); G_math_solver_gauss(les->A, les->x, les->b, les->rows); diff --git a/lib/htmldriver/README b/lib/htmldriver/README index a85107c36f7..a077eb2c77d 100644 --- a/lib/htmldriver/README +++ b/lib/htmldriver/README @@ -91,6 +91,7 @@ that exists in a vector file will have the same HREF tag. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD specifies the maxiumum number of vertices that a polygon can ======= @@ -133,6 +134,8 @@ that exists in a vector file will have the same HREF tag. ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main specifies the maximum number of vertices that a polygon can ======= @@ -152,6 +155,7 @@ that exists in a vector file will have the same HREF tag. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= specifies the maxiumum number of vertices that a polygon can >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) @@ -234,6 +238,11 @@ that exists in a vector file will have the same HREF tag. ======= specifies the maxiumum number of vertices that a polygon can >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) +>>>>>>> osgeo-main +======= +======= + specifies the maxiumum number of vertices that a polygon can +>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794)) >>>>>>> osgeo-main have. The default is 99. Some browser can only handle image map polygons of less that 100 vertices. diff --git a/lib/htmldriver/graph_clse.c b/lib/htmldriver/graph_clse.c index b56b32a9ed9..b184fe80c50 100644 --- a/lib/htmldriver/graph_clse.c +++ b/lib/htmldriver/graph_clse.c @@ -50,6 +50,7 @@ void HTML_Graph_close(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -84,6 +85,8 @@ void HTML_Graph_close(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * examine the list of polygons, if a polygon wholly exists inside of ======= @@ -103,6 +106,7 @@ void HTML_Graph_close(void) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -150,6 +154,8 @@ void HTML_Graph_close(void) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * exmaine the list of polygons, if a polygon wholly exists inside of >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) diff --git a/lib/imagery/find.c b/lib/imagery/find.c index e5d19144c9d..82d76516d4b 100644 --- a/lib/imagery/find.c +++ b/lib/imagery/find.c @@ -222,6 +222,7 @@ int I_find_subgroup_file2(const char *group, const char *subgroup, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -261,6 +262,8 @@ int I_find_subgroup_file2(const char *group, const char *subgroup, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -278,6 +281,7 @@ int I_find_subgroup_file2(const char *group, const char *subgroup, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -332,6 +336,8 @@ int I_find_subgroup_file2(const char *group, const char *subgroup, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main const char *I_find_signature(I_SIGFILE_TYPE type, char *name, const char *mapset) { @@ -352,6 +358,7 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -426,6 +433,10 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_debug(1, "I_find_signature(): type=%d name=%s mapset=%s", type, name, @@ -452,6 +463,7 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -499,6 +511,9 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main const char *I_find_signature(I_SIGFILE_TYPE type, char *name, const char *mapset) { char selem[GNAME_MAX]; /* 'signatures/type\0' */ ======= @@ -533,6 +548,7 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, const char *mapset <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -641,6 +657,8 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, const char *mapset >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main } /*! @@ -685,6 +703,7 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, const char *mapset <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -724,6 +743,8 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, const char *mapset ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -741,6 +762,7 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, const char *mapset <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -795,6 +817,8 @@ const char *I_find_signature(I_SIGFILE_TYPE type, char *name, const char *mapset >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main const char *I_find_signature2(I_SIGFILE_TYPE type, const char *name, const char *mapset) { @@ -815,6 +839,7 @@ const char *I_find_signature2(I_SIGFILE_TYPE type, const char *name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -889,6 +914,10 @@ const char *I_find_signature2(I_SIGFILE_TYPE type, const char *name, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_debug(1, "I_find_signature2(): type=%d name=%s mapset=%s", type, name, @@ -913,6 +942,7 @@ const char *I_find_signature2(I_SIGFILE_TYPE type, const char *name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -960,6 +990,9 @@ const char *I_find_signature2(I_SIGFILE_TYPE type, const char *name, ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main const char *I_find_signature2(I_SIGFILE_TYPE type, const char *name, const char *mapset) { char selem[GNAME_MAX]; /* 'signatures/type\0' */ ======= @@ -992,6 +1025,7 @@ const char *I_find_signature2(I_SIGFILE_TYPE type, const char *name, const char <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1094,4 +1128,6 @@ const char *I_find_signature2(I_SIGFILE_TYPE type, const char *name, const char >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main } diff --git a/lib/imagery/group.c b/lib/imagery/group.c index 54d5b80be3d..04371cf627b 100644 --- a/lib/imagery/group.c +++ b/lib/imagery/group.c @@ -62,6 +62,7 @@ int I_get_group(char *group) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -96,6 +97,8 @@ int I_get_group(char *group) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main stat = (fscanf(fd, "%255s", group) == 1); ======= @@ -115,6 +118,7 @@ int I_get_group(char *group) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -162,6 +166,8 @@ int I_get_group(char *group) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main stat = (fscanf(fd, "%s", group) == 1); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -213,6 +219,7 @@ int I_get_subgroup(const char *group, char *subgroup) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -247,6 +254,8 @@ int I_get_subgroup(const char *group, char *subgroup) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main stat = (fscanf(fd, "%255s", subgroup) == 1); ======= @@ -266,6 +275,7 @@ int I_get_subgroup(const char *group, char *subgroup) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -313,6 +323,8 @@ int I_get_subgroup(const char *group, char *subgroup) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main stat = (fscanf(fd, "%s", subgroup) == 1); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -453,6 +465,7 @@ static int get_ref(const char *group, const char *subgroup, const char *gmapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD n = sscanf(buf, "%255s %255s %15s", name, mapset, color); /* better use INAME_LEN */ @@ -496,6 +509,8 @@ static int get_ref(const char *group, const char *subgroup, const char *gmapset, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int n = sscanf(buf, "%255s %255s %15s", name, mapset, color); /* better use INAME_LEN */ @@ -517,6 +532,7 @@ static int get_ref(const char *group, const char *subgroup, const char *gmapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -545,6 +561,8 @@ static int get_ref(const char *group, const char *subgroup, const char *gmapset, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= n = sscanf(buf, "%255s %255s %15s", name, mapset, color); /* better use INAME_LEN */ @@ -563,6 +581,7 @@ static int get_ref(const char *group, const char *subgroup, const char *gmapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -604,6 +623,8 @@ static int get_ref(const char *group, const char *subgroup, const char *gmapset, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (n == 2 || n == 3) { I_add_file_to_group_ref(name, mapset, ref); @@ -681,6 +702,7 @@ int I_init_ref_color_nums(struct Ref *ref) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ref->blu.n >= 0) ======= @@ -723,6 +745,8 @@ int I_init_ref_color_nums(struct Ref *ref) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ref->grn.n >= 0) ======= @@ -742,6 +766,7 @@ int I_init_ref_color_nums(struct Ref *ref) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ref->blu.n >= 0) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -824,6 +849,11 @@ int I_init_ref_color_nums(struct Ref *ref) ======= ref->blu.n >= 0) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + ref->blu.n >= 0) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main return 1; switch (ref->nfiles) { diff --git a/lib/imagery/iclass_perimeter.c b/lib/imagery/iclass_perimeter.c index eecade6c761..1e182aa14bd 100644 --- a/lib/imagery/iclass_perimeter.c +++ b/lib/imagery/iclass_perimeter.c @@ -233,6 +233,7 @@ int make_perimeter(struct line_pnts *points, IClass_perimeter *perimeter, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD i = first; /* stmt not necssary */ ======= @@ -275,6 +276,8 @@ int make_perimeter(struct line_pnts *points, IClass_perimeter *perimeter, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main i = first; /* stmt not necessary */ ======= @@ -294,6 +297,7 @@ int make_perimeter(struct line_pnts *points, IClass_perimeter *perimeter, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= i = first; /* stmt not necssary */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -376,6 +380,11 @@ int make_perimeter(struct line_pnts *points, IClass_perimeter *perimeter, ======= i = first; /* stmt not necssary */ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + i = first; /* stmt not necssary */ +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main do { diff --git a/lib/imagery/iclass_signatures.c b/lib/imagery/iclass_signatures.c index 2779e5a6e2f..1a86fecf321 100644 --- a/lib/imagery/iclass_signatures.c +++ b/lib/imagery/iclass_signatures.c @@ -69,6 +69,7 @@ int I_iclass_init_signatures(struct Signature *sigs, struct Ref *refer) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -168,6 +169,11 @@ int I_iclass_init_signatures(struct Signature *sigs, struct Ref *refer) sigs->semantic_labels[i] = Rast_get_semantic_label_or_name( refer->file[i].name, refer->file[i].mapset); ======= +>>>>>>> osgeo-main +======= + sigs->semantic_labels[i] = Rast_get_semantic_label_or_name( + refer->file[i].name, refer->file[i].mapset); +======= >>>>>>> osgeo-main sigs->bandrefs[i] = Rast_read_bandref(refer->file[i].name, refer->file[i].mapset); if (!sigs->bandrefs[i]) { @@ -190,6 +196,7 @@ int I_iclass_init_signatures(struct Signature *sigs, struct Ref *refer) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -218,6 +225,8 @@ int I_iclass_init_signatures(struct Signature *sigs, struct Ref *refer) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= sigs->semantic_labels[i] = Rast_get_semantic_label_or_name( refer->file[i].name, refer->file[i].mapset); @@ -236,6 +245,7 @@ int I_iclass_init_signatures(struct Signature *sigs, struct Ref *refer) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -264,6 +274,8 @@ int I_iclass_init_signatures(struct Signature *sigs, struct Ref *refer) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= sigs->semantic_labels[i] = Rast_get_semantic_label_or_name( refer->file[i].name, refer->file[i].mapset); @@ -282,6 +294,7 @@ int I_iclass_init_signatures(struct Signature *sigs, struct Ref *refer) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -329,6 +342,8 @@ int I_iclass_init_signatures(struct Signature *sigs, struct Ref *refer) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -412,6 +427,7 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -460,6 +476,8 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (!(outsig_fd = I_fopen_signature_file_new(file_name))) { G_warning(_("Unable to open output signature file '%s'"), file_name); @@ -482,6 +500,7 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -520,6 +539,8 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (! (outsig_fd = @@ -541,6 +562,7 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -569,6 +591,8 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (!(outsig_fd = I_fopen_signature_file_new(file_name))) { G_warning(_("Unable to open output signature file '%s'"), file_name); @@ -588,6 +612,7 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -616,6 +641,8 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (!(outsig_fd = I_fopen_signature_file_new(file_name))) { G_warning(_("Unable to open output signature file '%s'"), file_name); @@ -635,6 +662,7 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -682,6 +710,8 @@ int I_iclass_write_signatures(struct Signature *sigs, const char *file_name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } diff --git a/lib/imagery/iscatt_core.c b/lib/imagery/iscatt_core.c index e375342b547..abe8b45d7af 100644 --- a/lib/imagery/iscatt_core.c +++ b/lib/imagery/iscatt_core.c @@ -542,6 +542,7 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -616,6 +617,10 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, ======= if (n_pixs != (row_size) / (int)sizeof(unsigned char)) { ======= +>>>>>>> osgeo-main +======= + if (n_pixs != (row_size) / (int)sizeof(unsigned char)) { +======= >>>>>>> osgeo-main if (n_pixs != (row_size) / sizeof(unsigned char)) { >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -639,6 +644,7 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= @@ -667,6 +673,8 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (n_pixs != (row_size) / sizeof(unsigned char)) { ======= @@ -687,6 +695,7 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -770,6 +779,8 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_free(rast_pixs); G_free(belongs_pix); @@ -838,6 +849,7 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /* pixels meets condtion defined in scatter plot -> ======= @@ -880,6 +892,8 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* pixels meets condition defined in scatter plot -> ======= @@ -899,6 +913,7 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /* pixels meets condtion defined in scatter plot -> >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -981,6 +996,11 @@ static int compute_scatts_from_chunk_row(struct scCats *scatt_conds, ======= /* pixels meets condtion defined in scatter plot -> >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + /* pixels meets condtion defined in scatter plot -> +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main belongs to scatter plot category */ if (i_scatt_conds[array_idx]) @@ -1056,6 +1076,7 @@ static void free_compute_scatts_data(int *fd_bands, struct rast_row *bands_rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1096,6 +1117,8 @@ static void free_compute_scatts_data(int *fd_bands, struct rast_row *bands_rows, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main int *b_needed_bands, int *fd_cats_rasts, FILE **f_cats_rasts_conds, int n_a_cats) @@ -1117,6 +1140,7 @@ static void free_compute_scatts_data(int *fd_bands, struct rast_row *bands_rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1185,6 +1209,10 @@ static void free_compute_scatts_data(int *fd_bands, struct rast_row *bands_rows, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main int *fd_cats_rasts, FILE **f_cats_rasts_conds, int n_a_cats) @@ -1210,6 +1238,7 @@ static void free_compute_scatts_data(int *fd_bands, struct rast_row *bands_rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1300,6 +1329,11 @@ static void free_compute_scatts_data(int *fd_bands, struct rast_row *bands_rows, >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (band_id >= 0) { Rast_close(fd_bands[i]); @@ -1350,6 +1384,7 @@ static void free_compute_scatts_data(int *fd_bands, struct rast_row *bands_rows, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -1441,6 +1476,11 @@ static void free_compute_scatts_data(int *fd_bands, struct rast_row *bands_rows, ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main } /*! @@ -1520,6 +1560,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1560,6 +1601,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (i_cat = 0; i_cat < scatts->n_a_cats; i_cat++) fd_cats_rasts[i_cat] = -1; @@ -1580,6 +1623,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1648,6 +1692,10 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_zero(b_needed_bands, (size_t)n_bands * sizeof(int)); @@ -1679,6 +1727,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD free_compute_scatts_data(fd_bands, bands_rows, n_a_bands, bands_ids, NULL, NULL, @@ -1717,6 +1766,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main free_compute_scatts_data( fd_bands, bands_rows, n_a_bands, bands_ids, b_needed_bands, @@ -1738,6 +1789,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1761,6 +1813,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= free_compute_scatts_data(fd_bands, bands_rows, n_a_bands, bands_ids, NULL, NULL, @@ -1778,6 +1832,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1810,6 +1865,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_warning(_("Unable to find raster <%s>"), bands[band_id]); return -1; @@ -1825,6 +1882,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1882,6 +1940,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main free_compute_scatts_data( fd_bands, bands_rows, n_a_bands, bands_ids, b_needed_bands, @@ -1904,6 +1964,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1974,6 +2035,9 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main free_compute_scatts_data(fd_bands, bands_rows, n_a_bands, bands_ids, NULL, NULL, @@ -1989,6 +2053,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> osgeo-main @@ -2045,6 +2110,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_warning(_("Unable to open raster <%s>"), bands[band_id]); return -1; @@ -2078,6 +2145,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD free_compute_scatts_data(fd_bands, bands_rows, n_a_bands, bands_ids, NULL, NULL, @@ -2122,6 +2190,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main free_compute_scatts_data( fd_bands, bands_rows, n_a_bands, bands_ids, b_needed_bands, @@ -2145,6 +2215,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2173,6 +2244,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= free_compute_scatts_data(fd_bands, bands_rows, n_a_bands, bands_ids, NULL, NULL, @@ -2192,6 +2265,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2233,6 +2307,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_warning(_("Unable to read range of raster <%s>"), bands[band_id]); @@ -2266,6 +2342,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD else fd_cats_rasts[i_cat] = -1; @@ -2310,6 +2387,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= else fd_cats_rasts[i_cat] = -1; @@ -2328,6 +2407,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2356,6 +2436,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= else fd_cats_rasts[i_cat] = -1; @@ -2374,6 +2456,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2415,6 +2498,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (cats_rasts_conds[id_cat]) { @@ -2437,6 +2522,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fd_bands, bands_rows, n_a_bands, bands_ids, fd_cats_rasts, f_cats_rasts_conds, scatt_conds->n_a_cats); @@ -2480,6 +2566,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fd_bands, bands_rows, n_a_bands, bands_ids, b_needed_bands, fd_cats_rasts, f_cats_rasts_conds, scatt_conds->n_a_cats); @@ -2501,6 +2589,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2529,6 +2618,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fd_bands, bands_rows, n_a_bands, bands_ids, fd_cats_rasts, f_cats_rasts_conds, scatt_conds->n_a_cats); @@ -2547,6 +2638,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2588,6 +2680,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_warning( _("Unable to open category raster condition file <%s>"), @@ -2638,6 +2732,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fd_cats_rasts, f_cats_rasts_conds, scatt_conds->n_a_cats); @@ -2681,6 +2776,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main b_needed_bands, fd_cats_rasts, f_cats_rasts_conds, scatt_conds->n_a_cats); @@ -2702,6 +2799,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2730,6 +2828,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fd_cats_rasts, f_cats_rasts_conds, scatt_conds->n_a_cats); @@ -2748,6 +2848,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2789,6 +2890,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return -1; } @@ -2810,6 +2913,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD fd_cats_rasts, f_cats_rasts_conds, ======= @@ -2852,6 +2956,8 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main b_needed_bands, fd_cats_rasts, f_cats_rasts_conds, ======= @@ -2871,6 +2977,7 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= fd_cats_rasts, f_cats_rasts_conds, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2953,6 +3060,11 @@ int I_compute_scatts(struct Cell_head *region, struct scCats *scatt_conds, ======= fd_cats_rasts, f_cats_rasts_conds, >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + fd_cats_rasts, f_cats_rasts_conds, +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main scatt_conds->n_a_cats); return 0; diff --git a/lib/imagery/manage_signatures.c b/lib/imagery/manage_signatures.c index 7fbdbc65ddb..5eaefe29af2 100644 --- a/lib/imagery/manage_signatures.c +++ b/lib/imagery/manage_signatures.c @@ -40,6 +40,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -124,6 +125,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \brief Get signature directory @@ -155,6 +160,7 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -191,6 +197,8 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main else if (type == I_SIGFILE_TYPE_LIBSVM) { sprintf(dir, "signatures%clibsvm", HOST_DIRSEP); @@ -211,6 +219,7 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -233,6 +242,8 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= \brief Get signature directory >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -256,6 +267,7 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -320,6 +332,8 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } else if (type == I_SIGFILE_TYPE_SIGSET) { @@ -333,6 +347,7 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4d7f752c19 (ci: Ignore paths in CodeQL (#1778)) ======= ======= @@ -397,6 +412,8 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= sprintf(dir, "signatures%csigset", HOST_DIRSEP); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -417,6 +434,7 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -452,6 +470,8 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main else { G_fatal_error("Programming error: unknown signature file type"); @@ -480,6 +500,7 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -564,6 +585,10 @@ void I_get_signatures_dir(char *dir, I_SIGFILE_TYPE type) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main \brief Make signature dir @@ -595,6 +620,7 @@ void I_make_signatures_dir(I_SIGFILE_TYPE type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -641,6 +667,9 @@ void I_make_signatures_dir(I_SIGFILE_TYPE type) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main \brief Make signature element (internal use only) ======= @@ -681,6 +710,7 @@ void I_make_signatures_dir(I_SIGFILE_TYPE type) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -804,6 +834,8 @@ void I_make_signatures_dir(I_SIGFILE_TYPE type) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main } static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); @@ -831,6 +863,7 @@ static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -915,6 +948,10 @@ static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * * If removal fails, prints a warning and returns 1. @@ -936,6 +973,7 @@ static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -992,6 +1030,9 @@ static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main * * If removal fails, prints a warning and returns 1. @@ -1012,6 +1053,7 @@ static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1040,6 +1082,8 @@ static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= * * If removal fails, prints a warning and returns 1. @@ -1060,6 +1104,7 @@ static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1134,6 +1179,10 @@ static int list_by_type(I_SIGFILE_TYPE, const char *, int, char ***); ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * \param type I_SIGFILE_TYPE signature type * \param name of signature to remove @@ -1164,6 +1213,7 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1229,6 +1279,10 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) ======= char dir[GNAME_MAX]; ======= +>>>>>>> osgeo-main +======= + char dir[GNAME_MAX]; +======= >>>>>>> osgeo-main char element[GNAME_MAX]; int ret = 0; @@ -1253,6 +1307,7 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1333,6 +1388,8 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_debug(1, "I_signatures_remove(%d, %s);", type, name); @@ -1361,6 +1418,7 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1445,6 +1503,10 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_warning(_("%s is not in the current mapset (%s)"), name, G_mapset()); return 1; @@ -1468,6 +1530,7 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1524,6 +1587,9 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main G_warning(_("%s is not in the current mapset (%s)"), name, G_mapset()); @@ -1547,6 +1613,7 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1575,6 +1642,8 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= G_warning(_("%s is not in the current mapset (%s)"), name, G_mapset()); return 1; @@ -1597,6 +1666,7 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1671,6 +1741,10 @@ int I_signatures_remove(I_SIGFILE_TYPE type, const char *name) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main G_verbose_message(_("%s removed"), name); return 0; @@ -1721,6 +1795,7 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1805,6 +1880,10 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main char dir[GNAME_MAX]; const char *smapset; @@ -1828,6 +1907,7 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1884,6 +1964,9 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main char element[GNAME_MAX]; const char *smapset; @@ -1906,6 +1989,7 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1934,6 +2018,8 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= char dir[GNAME_MAX]; const char *smapset; @@ -1956,6 +2042,7 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2030,6 +2117,10 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main /* Copy only if mapset of new name is the current mapset */ @@ -2071,6 +2162,7 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2155,6 +2247,10 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main I_make_signatures_dir(type); @@ -2181,6 +2277,7 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2227,6 +2324,9 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main I__make_signatures_element(type); ======= @@ -2261,6 +2361,7 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2365,6 +2466,8 @@ int I_signatures_copy(I_SIGFILE_TYPE type, const char *old_name, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_warning(_("Unable to copy <%s> to current mapset as <%s>"), G_fully_qualified_name(old_name, smapset), tname); @@ -2410,6 +2513,7 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2475,6 +2579,10 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, ======= char dir[GNAME_MAX]; ======= +>>>>>>> osgeo-main +======= + char dir[GNAME_MAX]; +======= >>>>>>> osgeo-main char element[GNAME_MAX]; >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -2498,6 +2606,7 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2575,6 +2684,8 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main const char *smapset; char old_path[GPATH_MAX], new_path[GPATH_MAX]; @@ -2628,6 +2739,7 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2667,6 +2779,8 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2684,6 +2798,7 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2737,6 +2852,8 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_get_signatures_dir(dir, type); /* Note – we need whole directory not just an element in it thus @@ -2763,6 +2880,7 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2825,6 +2943,9 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main I__get_signatures_element(element, type); G_file_name(old_path, element, sname, tmapset); @@ -2845,6 +2966,7 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -2868,6 +2990,8 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2885,6 +3009,7 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2938,6 +3063,8 @@ int I_signatures_rename(I_SIGFILE_TYPE type, const char *old_name, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (G_rename_file(old_path, new_path) != 0) { @@ -3006,6 +3133,7 @@ int I_signatures_list_by_type(I_SIGFILE_TYPE type, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main * Sets pointer to NULL to prevent accidental use after free. @@ -3066,6 +3194,10 @@ int I_signatures_list_by_type(I_SIGFILE_TYPE type, const char *mapset, * Sets pointer to NULL to prevent accidental use after free. ======= >>>>>>> osgeo-main +======= + * Sets pointer to NULL to prevent accidental use after free. +======= +>>>>>>> osgeo-main >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= * Sets pointer to NULL to prevent accidental use after free. @@ -3085,6 +3217,7 @@ int I_signatures_list_by_type(I_SIGFILE_TYPE type, const char *mapset, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3174,6 +3307,8 @@ int I_signatures_list_by_type(I_SIGFILE_TYPE type, const char *mapset, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * * \param int Return value of I_signatures_list_by_type() @@ -3206,6 +3341,7 @@ void I_free_signatures_list(int count, char ***list) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main *list = NULL; @@ -3266,6 +3402,10 @@ void I_free_signatures_list(int count, char ***list) *list = NULL; ======= >>>>>>> osgeo-main +======= + *list = NULL; +======= +>>>>>>> osgeo-main >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= *list = NULL; @@ -3285,6 +3425,7 @@ void I_free_signatures_list(int count, char ***list) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3375,6 +3516,8 @@ void I_free_signatures_list(int count, char ***list) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main } static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, @@ -3403,6 +3546,7 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3487,6 +3631,10 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main char dir[GNAME_MAX]; char **dirlist; @@ -3509,6 +3657,7 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3565,6 +3714,9 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main char element[GNAME_MAX]; char **dirlist; @@ -3586,6 +3738,7 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3614,6 +3767,8 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= char dir[GNAME_MAX]; char **dirlist; @@ -3635,6 +3790,7 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3709,6 +3865,10 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (access(path, 0) != 0) { @@ -3743,6 +3903,7 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3827,6 +3988,10 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main *out_list = (char **)G_realloc(*out_list, (base + count) * sizeof(char *)); for (int i = 0; i < count; i++) { @@ -3848,6 +4013,7 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3885,6 +4051,8 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_free(dirlist[i]); } @@ -3907,6 +4075,7 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -3929,6 +4098,8 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= *out_list = (char **)G_realloc(*out_list, (base + count) * sizeof(char *)); >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -3955,6 +4126,7 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4029,6 +4201,8 @@ static int list_by_type(I_SIGFILE_TYPE type, const char *mapset, int base, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return count; diff --git a/lib/imagery/sig.c b/lib/imagery/sig.c index 02adcc57f1c..44308378992 100644 --- a/lib/imagery/sig.c +++ b/lib/imagery/sig.c @@ -35,6 +35,7 @@ int I_init_signatures(struct Signature *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -83,6 +84,8 @@ int I_init_signatures(struct Signature *S, int nbands) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S->semantic_labels = (char **)G_malloc(nbands * sizeof(char **)); for (int i = 0; i < nbands; i++) @@ -105,6 +108,7 @@ int I_init_signatures(struct Signature *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -143,6 +147,8 @@ int I_init_signatures(struct Signature *S, int nbands) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S->bandrefs = (char **)G_malloc(nbands * sizeof(char **)); for (int i = 0; i < nbands; i++) @@ -162,6 +168,7 @@ int I_init_signatures(struct Signature *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -190,6 +197,8 @@ int I_init_signatures(struct Signature *S, int nbands) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S->semantic_labels = (char **)G_malloc(nbands * sizeof(char **)); for (int i = 0; i < nbands; i++) @@ -209,6 +218,7 @@ int I_init_signatures(struct Signature *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -237,6 +247,8 @@ int I_init_signatures(struct Signature *S, int nbands) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S->semantic_labels = (char **)G_malloc(nbands * sizeof(char **)); for (int i = 0; i < nbands; i++) @@ -256,6 +268,7 @@ int I_init_signatures(struct Signature *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -303,6 +316,8 @@ int I_init_signatures(struct Signature *S, int nbands) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S->nsigs = 0; S->have_oclass = 0; @@ -378,6 +393,7 @@ int I_free_signatures(struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -462,6 +478,10 @@ int I_free_signatures(struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main free(S->semantic_labels[n]); free(S->semantic_labels); @@ -484,6 +504,7 @@ int I_free_signatures(struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -540,6 +561,9 @@ int I_free_signatures(struct Signature *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main free(S->bandrefs[n]); free(S->bandrefs); @@ -561,6 +585,7 @@ int I_free_signatures(struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -589,6 +614,8 @@ int I_free_signatures(struct Signature *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= free(S->semantic_labels[n]); free(S->semantic_labels); @@ -610,6 +637,7 @@ int I_free_signatures(struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -684,6 +712,10 @@ int I_free_signatures(struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S->nbands = 0; S->nsigs = 0; @@ -775,6 +807,7 @@ int I_read_one_signature(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -824,6 +857,8 @@ int I_read_one_signature(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int I_read_signatures(FILE *fd, struct Signature *S) { int ver, n, pos; @@ -847,6 +882,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -888,6 +924,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main int I_read_signatures(FILE * fd, struct Signature *S) { int ver, n, pos; @@ -908,6 +946,7 @@ int I_read_signatures(FILE * fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -937,6 +976,8 @@ int I_read_signatures(FILE * fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int I_read_signatures(FILE *fd, struct Signature *S) { int ver, n, pos; @@ -957,6 +998,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -986,6 +1028,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= int I_read_signatures(FILE *fd, struct Signature *S) { int ver, n, pos; @@ -1006,6 +1050,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1053,6 +1098,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_init_signatures(S, 0); @@ -1083,6 +1130,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1162,6 +1210,11 @@ int I_read_signatures(FILE *fd, struct Signature *S) /* Current version number is 2 */ if (!(ver == 1 || ver == 2)) { ======= +>>>>>>> osgeo-main +======= + /* Current version number is 2 */ + if (!(ver == 1 || ver == 2)) { +======= >>>>>>> osgeo-main /* Current version number is 1 */ if (ver != 1) { @@ -1188,6 +1241,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1272,6 +1326,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_warning(_("Invalid signature file version")); return -1; @@ -1305,6 +1361,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1389,6 +1446,10 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main /* Read semantic labels and count them to set nbands */ n = 0; @@ -1416,6 +1477,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1462,6 +1524,9 @@ int I_read_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main /* Read band references and count them to set nbands */ ======= @@ -1498,6 +1563,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1608,6 +1674,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main n++; } @@ -1636,6 +1704,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1720,6 +1789,10 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main semantic_label[pos] = '\0'; S->semantic_labels[n] = G_store(semantic_label); @@ -1743,6 +1816,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1799,6 +1873,9 @@ int I_read_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref[pos] = '\0'; S->bandrefs[n] = G_store(bandref); @@ -1820,6 +1897,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1848,6 +1926,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= semantic_label[pos] = '\0'; S->semantic_labels[n] = G_store(semantic_label); @@ -1870,6 +1950,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1944,6 +2025,10 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main pos = 0; prev = c; @@ -1970,6 +2055,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2054,6 +2140,10 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main /* Semantic labels are limited to GNAME_MAX - 1 + \0 in length; * n is 0-based */ @@ -2079,6 +2169,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2125,6 +2216,9 @@ int I_read_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main /* Band references are limited to GNAME_MAX - 1 + \0 in length; ======= @@ -2158,6 +2252,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2259,6 +2354,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main pos++; prev = c; @@ -2290,6 +2387,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2329,6 +2427,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2346,6 +2446,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2399,6 +2500,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main /* Read marker of original class value presence */ if (ver >= 2 && fscanf(fd, "%d", &S->have_oclass) != 1) { @@ -2429,6 +2532,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2469,6 +2573,9 @@ int I_read_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main while ((n = I_read_one_signature(fd, S)) == 1) ; >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -2488,6 +2595,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2571,6 +2679,8 @@ int I_read_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (n < 0) @@ -2613,6 +2723,7 @@ int I_read_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2679,6 +2790,10 @@ int I_write_signatures(FILE *fd, struct Signature *S) int I_write_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main +======= +int I_write_signatures(FILE *fd, struct Signature *S) +======= +>>>>>>> osgeo-main int I_write_signatures(FILE * fd, struct Signature *S) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= @@ -2701,6 +2816,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2779,6 +2895,8 @@ int I_write_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { int k; int n; @@ -2809,6 +2927,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2893,6 +3012,10 @@ int I_write_signatures(FILE *fd, struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main fprintf(fd, "2\n"); /* Title of signatures */ @@ -2943,6 +3066,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2996,6 +3120,8 @@ int I_write_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fprintf(fd, "1\n"); ======= @@ -3023,6 +3149,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -3097,6 +3224,8 @@ int I_write_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main s = &S->sig[k]; if (s->status != 1) @@ -3131,6 +3260,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3159,6 +3289,8 @@ int I_write_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= s = &S->sig[k]; if (s->status != 1) @@ -3196,6 +3328,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3270,6 +3403,10 @@ int I_write_signatures(FILE *fd, struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } return 1; @@ -3299,6 +3436,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3383,6 +3521,10 @@ int I_write_signatures(FILE *fd, struct Signature *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * The function will check for semantic label match between signature struct * and imagery group. @@ -3420,6 +3562,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3466,6 +3609,9 @@ int I_write_signatures(FILE *fd, struct Signature *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main * The function will check for band reference match between signature struct ======= @@ -3511,6 +3657,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3648,6 +3795,8 @@ int I_write_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * * \param *Signature existing signatures to check & sort @@ -3677,6 +3826,7 @@ int I_write_signatures(FILE *fd, struct Signature *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3762,6 +3912,10 @@ int I_write_signatures(FILE *fd, struct Signature *S) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main char **I_sort_signatures_by_semantic_label(struct Signature *S, const struct Ref *R) { @@ -3785,6 +3939,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3842,6 +3997,9 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main char **I_sort_signatures_by_bandref(struct Signature *S, const struct Ref *R) { unsigned int total, complete; unsigned int *match1, *match2, mc1, mc2, *new_order; @@ -3862,6 +4020,7 @@ char **I_sort_signatures_by_bandref(struct Signature *S, const struct Ref *R) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3891,6 +4050,8 @@ char **I_sort_signatures_by_bandref(struct Signature *S, const struct Ref *R) { ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= char **I_sort_signatures_by_semantic_label(struct Signature *S, const struct Ref *R) { @@ -3913,6 +4074,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3987,6 +4149,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main /* Safety measure. Untranslated as this should not happen in production! */ @@ -4013,6 +4179,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4097,6 +4264,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "I_sort_signatures_by_semantic_label(%d, %d);", S->nbands, R->nfiles); @@ -4122,6 +4293,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4168,6 +4340,9 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main "I_sort_signatures_by_bandref(%d, %d);", S->nbands, R->nfiles); ======= @@ -4201,6 +4376,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4302,6 +4478,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -4335,6 +4513,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4400,6 +4579,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= new_semantic_labels = (char **)G_malloc(S->nbands * sizeof(char *)); ======= +>>>>>>> osgeo-main +======= + new_semantic_labels = (char **)G_malloc(S->nbands * sizeof(char *)); +======= >>>>>>> osgeo-main new_bandrefs = (char **)G_malloc(S->nbands * sizeof(char *)); >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -4423,6 +4606,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4500,6 +4684,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main new_means = (double **)G_malloc(S->nsigs * sizeof(double *)); // new_vars[S.sig[x]][band1][band1] @@ -4535,6 +4721,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4574,6 +4761,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4591,6 +4780,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4644,6 +4834,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (S->semantic_labels[i] && group_semantic_labels[j] && !strcmp(S->semantic_labels[i], group_semantic_labels[j])) { @@ -4676,6 +4868,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4738,6 +4931,9 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if (S->bandrefs[i] && group_bandrefs[j] && !strcmp(S->bandrefs[i], group_bandrefs[j])) { @@ -4766,6 +4962,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -4789,6 +4986,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4806,6 +5005,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4859,6 +5059,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } } @@ -4885,6 +5087,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4950,6 +5153,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= /* Check for semantic label mismatch */ ======= +>>>>>>> osgeo-main +======= + /* Check for semantic label mismatch */ +======= >>>>>>> osgeo-main /* Check for band reference mismatch */ >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -4973,6 +5180,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5050,6 +5258,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main mc1 = mc2 = 0; mismatches = (char **)G_malloc(2 * sizeof(char **)); @@ -5080,6 +5290,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5209,6 +5420,12 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) for (unsigned int i = 0; i < (unsigned int)S->nbands; i++) { ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) + for (unsigned int i = 0; i < (unsigned int)S->nbands; i++) { +======= >>>>>>> osgeo-main for (unsigned int i = 0; i < S->nbands; i++) { ======= @@ -5229,6 +5446,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5264,6 +5482,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (!match1[i]) { if (S->semantic_labels[i]) @@ -5287,6 +5507,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5316,6 +5537,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) for (unsigned int i = 0; i < S->nbands; i++) { @@ -5348,6 +5571,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -5461,6 +5685,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (mc1) strcat(mismatches[0], ","); @@ -5487,6 +5713,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5571,6 +5798,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (S->semantic_labels[i]) strcat(mismatches[0], S->semantic_labels[i]); @@ -5592,6 +5823,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5648,6 +5880,9 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if (S->bandrefs[i]) strcat(mismatches[0], S->bandrefs[i]); @@ -5668,6 +5903,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5696,6 +5932,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (S->semantic_labels[i]) strcat(mismatches[0], S->semantic_labels[i]); @@ -5716,6 +5954,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5790,6 +6029,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main mc1++; total = total + 1; @@ -5820,6 +6063,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5949,6 +6193,12 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) for (unsigned int j = 0; j < (unsigned int)R->nfiles; j++) { ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) + for (unsigned int j = 0; j < (unsigned int)R->nfiles; j++) { +======= >>>>>>> osgeo-main for (unsigned int j = 0; j < R->nfiles; j++) { ======= @@ -5969,6 +6219,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6004,6 +6255,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (!match2[j]) { if (group_semantic_labels[j]) @@ -6027,6 +6280,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6056,6 +6310,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) for (unsigned int j = 0; j < R->nfiles; j++) { @@ -6088,6 +6344,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6201,6 +6458,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (mc2) strcat(mismatches[1], ","); @@ -6227,6 +6486,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6311,6 +6571,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (group_semantic_labels[j]) strcat(mismatches[1], group_semantic_labels[j]); @@ -6332,6 +6596,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6388,6 +6653,9 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if (group_bandrefs[j]) strcat(mismatches[1], group_bandrefs[j]); @@ -6408,6 +6676,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6436,6 +6705,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (group_semantic_labels[j]) strcat(mismatches[1], group_semantic_labels[j]); @@ -6456,6 +6727,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -6530,6 +6802,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main mc2++; total = total + 1; @@ -6563,6 +6839,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6692,6 +6969,12 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) for (unsigned int b1 = 0; b1 < (unsigned int)S->nbands; b1++) { ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) + for (unsigned int b1 = 0; b1 < (unsigned int)S->nbands; b1++) { +======= >>>>>>> osgeo-main for (unsigned int b1 = 0; b1 < S->nbands; b1++) { ======= @@ -6712,6 +6995,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6747,6 +7031,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main new_means[c][new_order[b1]] = S->sig[c].mean[b1]; for (unsigned int b2 = 0; b2 <= b1; b2++) { @@ -6772,6 +7058,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6854,6 +7141,11 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for (unsigned int b1 = 0; b1 < S->nbands; b1++) { new_means[c][new_order[b1]] = S->sig[c].mean[b1]; @@ -6874,6 +7166,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -6895,6 +7188,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main new_vars[c][new_order[b1]][new_order[b2]] = S->sig[c].var[b1][b2]; @@ -6926,6 +7221,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7018,6 +7314,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } } @@ -7046,6 +7344,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7130,6 +7429,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main memcpy(S->semantic_labels, new_semantic_labels, S->nbands * sizeof(char **)); @@ -7154,6 +7457,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7210,6 +7514,9 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main memcpy(S->bandrefs, new_bandrefs, S->nbands * sizeof(char **)); for (unsigned int c = S->nsigs; c--;) { @@ -7231,6 +7538,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7259,6 +7567,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= memcpy(S->semantic_labels, new_semantic_labels, S->nbands * sizeof(char **)); @@ -7282,6 +7592,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7356,6 +7667,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } } @@ -7383,6 +7698,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7467,6 +7783,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main free(group_semantic_labels[j]); free(group_semantic_labels); @@ -7490,6 +7810,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7546,6 +7867,9 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main free(group_bandrefs[j]); free(group_bandrefs); @@ -7568,6 +7892,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7596,6 +7921,8 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= free(group_semantic_labels[j]); free(group_semantic_labels); @@ -7618,6 +7945,7 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7692,6 +8020,10 @@ char **I_sort_signatures_by_semantic_label(struct Signature *S, ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for (unsigned int c = S->nsigs; c--;) { free(new_means[c]); diff --git a/lib/imagery/sigfile.c b/lib/imagery/sigfile.c index ec92f7036ae..ee3f66f932b 100644 --- a/lib/imagery/sigfile.c +++ b/lib/imagery/sigfile.c @@ -38,6 +38,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -86,6 +87,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main Returns a pointer to FILE for writing signature file. Use fclose on the pointer to close after use. @@ -108,6 +111,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -139,6 +143,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= Returns a pointer to FILE for writing signature file. @@ -159,6 +165,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -187,6 +194,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= Returns a pointer to FILE for writing signature file. Use fclose on the pointer to close after use. @@ -206,6 +215,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -256,6 +266,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main \param name signature filename @@ -285,6 +297,7 @@ FILE *I_fopen_signature_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -369,6 +382,10 @@ FILE *I_fopen_signature_file_new(const char *name) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main char dir[GNAME_MAX]; FILE *fd; @@ -393,6 +410,7 @@ FILE *I_fopen_signature_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -428,6 +446,9 @@ FILE *I_fopen_signature_file_new(const char *name) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main char element[GNAME_MAX]; ======= @@ -454,6 +475,7 @@ FILE *I_fopen_signature_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -551,6 +573,8 @@ FILE *I_fopen_signature_file_new(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return fd; } @@ -579,6 +603,7 @@ FILE *I_fopen_signature_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -618,6 +643,8 @@ FILE *I_fopen_signature_file_new(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -635,6 +662,7 @@ FILE *I_fopen_signature_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -688,6 +716,8 @@ FILE *I_fopen_signature_file_new(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main Use fully qualified names for signatures from other mapsets. @@ -713,6 +743,7 @@ FILE *I_fopen_signature_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -753,6 +784,9 @@ FILE *I_fopen_signature_file_new(const char *name) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main Use fully qualified names for signatures from other mapsets >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -772,6 +806,7 @@ FILE *I_fopen_signature_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -855,6 +890,8 @@ FILE *I_fopen_signature_file_new(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main \param name signature filename @@ -886,6 +923,7 @@ FILE *I_fopen_signature_file_old(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -951,6 +989,10 @@ FILE *I_fopen_signature_file_old(const char *name) ======= char dir[GNAME_MAX]; ======= +>>>>>>> osgeo-main +======= + char dir[GNAME_MAX]; +======= >>>>>>> osgeo-main char element[GNAME_MAX]; >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -974,6 +1016,7 @@ FILE *I_fopen_signature_file_old(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1051,6 +1094,8 @@ FILE *I_fopen_signature_file_old(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main FILE *fd; @@ -1078,6 +1123,7 @@ FILE *I_fopen_signature_file_old(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1157,6 +1203,11 @@ FILE *I_fopen_signature_file_old(const char *name) I_get_signatures_dir(dir, I_SIGFILE_TYPE_SIG); fd = G_fopen_old_misc(dir, "sig", sig_name, sig_mapset); ======= +>>>>>>> osgeo-main +======= + I_get_signatures_dir(dir, I_SIGFILE_TYPE_SIG); + fd = G_fopen_old_misc(dir, "sig", sig_name, sig_mapset); +======= >>>>>>> osgeo-main I__get_signatures_element(element, I_SIGFILE_TYPE_SIG); fd = G_fopen_old(element, sig_name, sig_mapset); @@ -1183,6 +1234,7 @@ FILE *I_fopen_signature_file_old(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1267,6 +1319,8 @@ FILE *I_fopen_signature_file_old(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return fd; diff --git a/lib/imagery/sigset.c b/lib/imagery/sigset.c index 5471f650edf..9eef1647cae 100644 --- a/lib/imagery/sigset.c +++ b/lib/imagery/sigset.c @@ -23,6 +23,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -108,6 +109,10 @@ ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main #include static int gettag(FILE *, char *); @@ -128,6 +133,7 @@ static int get_semantic_labels(FILE *, struct SigSet *); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -185,6 +191,9 @@ static int get_semantic_labels(FILE *, struct SigSet *); ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main static int gettag(FILE *, char *); static int get_bandrefs(FILE *, struct SigSet *); @@ -203,6 +212,7 @@ static int get_bandrefs(FILE *, struct SigSet *); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -232,6 +242,8 @@ static int get_bandrefs(FILE *, struct SigSet *); ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= #include static int gettag(FILE *, char *); @@ -251,6 +263,7 @@ static int get_semantic_labels(FILE *, struct SigSet *); <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -326,6 +339,10 @@ static int get_semantic_labels(FILE *, struct SigSet *); ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main static int get_title(FILE *, struct SigSet *); static int get_class(FILE *, struct SigSet *); static int get_classnum(FILE *, struct ClassSig *); @@ -405,6 +422,7 @@ int I_InitSigSet(struct SigSet *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -453,6 +471,8 @@ int I_InitSigSet(struct SigSet *S, int nbands) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S->semantic_labels = (char **)G_malloc(nbands * sizeof(char **)); for (int i = 0; i < nbands; i++) @@ -475,6 +495,7 @@ int I_InitSigSet(struct SigSet *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -513,6 +534,8 @@ int I_InitSigSet(struct SigSet *S, int nbands) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S->bandrefs = (char **)G_malloc(nbands * sizeof(char **)); for (int i = 0; i < nbands; i++) @@ -532,6 +555,7 @@ int I_InitSigSet(struct SigSet *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -560,6 +584,8 @@ int I_InitSigSet(struct SigSet *S, int nbands) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S->semantic_labels = (char **)G_malloc(nbands * sizeof(char **)); for (int i = 0; i < nbands; i++) @@ -579,6 +605,7 @@ int I_InitSigSet(struct SigSet *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -607,6 +634,8 @@ int I_InitSigSet(struct SigSet *S, int nbands) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S->semantic_labels = (char **)G_malloc(nbands * sizeof(char **)); for (int i = 0; i < nbands; i++) @@ -626,6 +655,7 @@ int I_InitSigSet(struct SigSet *S, int nbands) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -673,6 +703,8 @@ int I_InitSigSet(struct SigSet *S, int nbands) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S->nclasses = 0; S->ClassSig = NULL; @@ -766,6 +798,7 @@ struct SubSig *I_NewSubSig(struct SigSet *S, struct ClassSig *C) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -832,6 +865,10 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) int I_ReadSigSet(FILE *fd, struct SigSet *S) ======= >>>>>>> osgeo-main +======= +int I_ReadSigSet(FILE *fd, struct SigSet *S) +======= +>>>>>>> osgeo-main int I_ReadSigSet(FILE * fd, struct SigSet *S) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= @@ -854,6 +891,7 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -932,6 +970,8 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main { char tag[256]; unsigned int version; @@ -956,6 +996,7 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1012,6 +1053,9 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main } if (version != 1) { @@ -1036,6 +1080,7 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= @@ -1069,6 +1114,8 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (eq(tag, "title:")) if (get_title(fd, S) != 0) @@ -1094,6 +1141,7 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1162,6 +1210,10 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main } if (version != 1) { @@ -1197,6 +1249,7 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1253,6 +1306,9 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if (eq(tag, "title:")) if (get_title(fd, S) != 0) @@ -1279,6 +1335,7 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1347,6 +1404,10 @@ int I_ReadSigSet(FILE *fd, struct SigSet *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main return 1; /* for now assume success */ } @@ -1375,6 +1436,7 @@ static int gettag(FILE *fd, char *tag) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1440,6 +1502,10 @@ static int gettag(FILE *fd, char *tag) ======= return 0; ======= +>>>>>>> osgeo-main +======= + return 0; +======= >>>>>>> osgeo-main return 0; >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -1463,6 +1529,7 @@ static int gettag(FILE *fd, char *tag) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1540,6 +1607,8 @@ static int gettag(FILE *fd, char *tag) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main G_strip(tag); return 1; @@ -1566,6 +1635,7 @@ static int gettag(FILE *fd, char *tag) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1651,6 +1721,10 @@ static int gettag(FILE *fd, char *tag) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main static int get_semantic_labels(FILE *fd, struct SigSet *S) { int n, pos; @@ -1717,6 +1791,7 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -1806,6 +1881,8 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= static int get_bandrefs(FILE * fd, struct SigSet *S) ======= static int get_semantic_labels(FILE *fd, struct SigSet *S) @@ -1867,6 +1944,7 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= static int get_bandrefs(FILE * fd, struct SigSet *S) @@ -2013,6 +2091,8 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (!(S->nbands > 0)) { G_warning(_("Signature file does not contain bands")); @@ -2033,6 +2113,7 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= @@ -2066,6 +2147,8 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S->bandrefs = (char **)G_realloc(S->bandrefs, S->nbands * sizeof(char **)); for (unsigned int i = S->nbands; i--;) { @@ -2092,6 +2175,7 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -2115,6 +2199,8 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2132,6 +2218,7 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2185,6 +2272,8 @@ static int get_semantic_labels(FILE *fd, struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return 0; @@ -2216,6 +2305,7 @@ static int get_title(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2281,6 +2371,10 @@ static int get_title(FILE *fd, struct SigSet *S) ======= if (fscanf(fd, "%1023[^\n]", title) != 1) ======= +>>>>>>> osgeo-main +======= + if (fscanf(fd, "%1023[^\n]", title) != 1) +======= >>>>>>> osgeo-main if (fscanf(fd, "%1024[^\n]", title) != 1) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -2304,6 +2398,7 @@ static int get_title(FILE *fd, struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2381,6 +2476,8 @@ static int get_title(FILE *fd, struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return -1; G_strip(title); @@ -2457,6 +2554,7 @@ static int get_classtitle(FILE *fd, struct ClassSig *C) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2522,6 +2620,10 @@ static int get_classtitle(FILE *fd, struct ClassSig *C) ======= if (fscanf(fd, "%1023[^\n]", title) != 1) ======= +>>>>>>> osgeo-main +======= + if (fscanf(fd, "%1023[^\n]", title) != 1) +======= >>>>>>> osgeo-main if (fscanf(fd, "%1024[^\n]", title) != 1) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -2545,6 +2647,7 @@ static int get_classtitle(FILE *fd, struct ClassSig *C) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2622,6 +2725,8 @@ static int get_classtitle(FILE *fd, struct ClassSig *C) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return -1; G_strip(title); @@ -2753,6 +2858,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2801,6 +2907,8 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(fd, "semantic_labels: "); for (i = 0; i < S->nbands; i++) { @@ -2823,6 +2931,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2861,6 +2970,8 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main fprintf(fd, "bandrefs: "); for (i = 0; i < S->nbands; i++) { @@ -2880,6 +2991,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2908,6 +3020,8 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fprintf(fd, "semantic_labels: "); for (i = 0; i < S->nbands; i++) { @@ -2927,6 +3041,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2955,6 +3070,8 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= fprintf(fd, "semantic_labels: "); for (i = 0; i < S->nbands; i++) { @@ -2974,6 +3091,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3021,6 +3139,8 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } fprintf(fd, "\n"); @@ -3082,6 +3202,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3166,6 +3287,10 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * The function will check for semantic label match between sigset struct * and imagery group. @@ -3187,6 +3312,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3243,6 +3369,9 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main * The function will check for band reference match between sigset struct * and imagery group. @@ -3263,6 +3392,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3291,6 +3421,8 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= * The function will check for semantic label match between sigset struct * and imagery group. @@ -3311,6 +3443,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3385,6 +3518,10 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * struct SigSet are reordered to match the order of imagery group items. * This reordering is done only for items present in the sigset file. @@ -3411,6 +3548,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3495,6 +3633,10 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main * If all semantic labels are not identical (in * arbitrary order), function will return two dimensional array with @@ -3526,6 +3668,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3572,6 +3715,9 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main * If all band references are not identical (in ======= @@ -3611,6 +3757,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3730,6 +3877,8 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main * * \param *SigSet existing signatures to check & sort @@ -3759,6 +3908,7 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3844,6 +3994,10 @@ int I_WriteSigSet(FILE *fd, const struct SigSet *S) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) { unsigned int total, complete; @@ -3866,6 +4020,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3923,6 +4078,9 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main char **I_SortSigSetByBandref(struct SigSet *S, const struct Ref *R) { unsigned int total, complete; unsigned int *match1, *match2, mc1, mc2, *new_order; @@ -3943,6 +4101,7 @@ char **I_SortSigSetByBandref(struct SigSet *S, const struct Ref *R) { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3972,6 +4131,8 @@ char **I_SortSigSetByBandref(struct SigSet *S, const struct Ref *R) { ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) { unsigned int total, complete; @@ -3993,6 +4154,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -4067,6 +4229,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main /* Safety measure. Untranslated as this should not happen in production! */ @@ -4093,6 +4259,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4177,6 +4344,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main "I_sort_signatures_by_semantic_label(%d, %d);", S->nbands, R->nfiles); @@ -4202,6 +4373,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4248,6 +4420,9 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main "I_sort_signatures_by_bandref(%d, %d);", S->nbands, R->nfiles); ======= @@ -4281,6 +4456,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4382,6 +4558,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } @@ -4415,6 +4593,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4480,6 +4659,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= new_semantic_labels = (char **)G_malloc(S->nbands * sizeof(char *)); ======= +>>>>>>> osgeo-main +======= + new_semantic_labels = (char **)G_malloc(S->nbands * sizeof(char *)); +======= >>>>>>> osgeo-main new_bandrefs = (char **)G_malloc(S->nbands * sizeof(char *)); >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -4503,6 +4686,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4580,6 +4764,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main new_means = (double ***)G_malloc(S->nclasses * sizeof(double **)); // new_vars[S.ClassSig[x]][.SubSig[y]][R[band1]][R[band1]] @@ -4606,6 +4792,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4645,6 +4832,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4662,6 +4851,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4715,6 +4905,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main new_means[c] = (double **)G_malloc(S->ClassSig[c].nsubclasses * sizeof(double *)); @@ -4740,6 +4932,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4786,6 +4979,9 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main new_means[c] = (double **)G_malloc(S->ClassSig[c].nsubclasses * sizeof(double *)); new_vars[c] = (double ***)G_malloc(S->ClassSig[c].nsubclasses * sizeof(double **)); @@ -4808,6 +5004,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4880,6 +5077,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (unsigned int s = S->ClassSig[c].nsubclasses; s--;) { new_means[c][s] = (double *)G_malloc(S->nbands * sizeof(double)); @@ -4906,6 +5105,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4985,6 +5185,11 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) new_vars[c][s][i] = (double *)G_malloc(S->nbands * sizeof(double)); ======= +>>>>>>> osgeo-main +======= + new_vars[c][s][i] = + (double *)G_malloc(S->nbands * sizeof(double)); +======= >>>>>>> osgeo-main new_vars[c][s][i] = (double *)G_malloc(S->nbands * sizeof(double)); >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -5010,6 +5215,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5091,6 +5297,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } } @@ -5119,6 +5327,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5158,6 +5367,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5175,6 +5386,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5228,6 +5440,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (S->semantic_labels[i] && group_semantic_labels[j] && !strcmp(S->semantic_labels[i], group_semantic_labels[j])) { @@ -5260,6 +5474,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5322,6 +5537,9 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if (S->bandrefs[i] && group_bandrefs[j] && !strcmp(S->bandrefs[i], group_bandrefs[j])) { @@ -5350,6 +5568,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -5373,6 +5592,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5390,6 +5611,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5443,6 +5665,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } } @@ -5469,6 +5693,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5534,6 +5759,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= /* Check for semantic label mismatch */ ======= +>>>>>>> osgeo-main +======= + /* Check for semantic label mismatch */ +======= >>>>>>> osgeo-main /* Check for band reference mismatch */ >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -5557,6 +5786,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5634,6 +5864,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main mc1 = mc2 = 0; mismatches = (char **)G_malloc(2 * sizeof(char **)); @@ -5664,6 +5896,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5793,6 +6026,12 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) for (unsigned int i = 0; i < (unsigned int)S->nbands; i++) { ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) + for (unsigned int i = 0; i < (unsigned int)S->nbands; i++) { +======= >>>>>>> osgeo-main for (unsigned int i = 0; i < S->nbands; i++) { ======= @@ -5813,6 +6052,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5848,6 +6088,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (!match1[i]) { if (S->semantic_labels[i]) @@ -5871,6 +6113,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5900,6 +6143,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) for (unsigned int i = 0; i < S->nbands; i++) { @@ -5932,6 +6177,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6045,6 +6291,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (mc1) strcat(mismatches[0], ","); @@ -6071,6 +6319,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6155,6 +6404,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (S->semantic_labels[i]) strcat(mismatches[0], S->semantic_labels[i]); @@ -6176,6 +6429,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6232,6 +6486,9 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if (S->bandrefs[i]) strcat(mismatches[0], S->bandrefs[i]); @@ -6252,6 +6509,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6280,6 +6538,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (S->semantic_labels[i]) strcat(mismatches[0], S->semantic_labels[i]); @@ -6300,6 +6560,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -6374,6 +6635,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main mc1++; total = total + 1; @@ -6404,6 +6669,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6533,6 +6799,12 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) for (unsigned int j = 0; j < (unsigned int)R->nfiles; j++) { ======= +>>>>>>> osgeo-main +======= +======= +>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794)) + for (unsigned int j = 0; j < (unsigned int)R->nfiles; j++) { +======= >>>>>>> osgeo-main for (unsigned int j = 0; j < R->nfiles; j++) { ======= @@ -6553,6 +6825,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6588,6 +6861,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (!match2[j]) { if (group_semantic_labels[j]) @@ -6611,6 +6886,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6640,6 +6916,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) for (unsigned int j = 0; j < R->nfiles; j++) { @@ -6672,6 +6950,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6785,6 +7064,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main if (mc2) strcat(mismatches[1], ","); @@ -6811,6 +7092,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6895,6 +7177,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main if (group_semantic_labels[j]) strcat(mismatches[1], group_semantic_labels[j]); @@ -6916,6 +7202,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6972,6 +7259,9 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main if (group_bandrefs[j]) strcat(mismatches[1], group_bandrefs[j]); @@ -6992,6 +7282,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7020,6 +7311,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= if (group_semantic_labels[j]) strcat(mismatches[1], group_semantic_labels[j]); @@ -7040,6 +7333,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7114,6 +7408,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main mc2++; total = total + 1; @@ -7148,6 +7446,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7210,6 +7509,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for (unsigned int b1 = 0; b1 < (unsigned int)S->nbands; b1++) { new_means[c][s][new_order[b1]] = @@ -7233,6 +7534,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7262,6 +7564,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7308,6 +7612,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -7463,6 +7768,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } } @@ -7491,6 +7798,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7575,6 +7883,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main memcpy(S->semantic_labels, new_semantic_labels, S->nbands * sizeof(char **)); @@ -7601,6 +7913,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7647,6 +7960,9 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main memcpy(S->bandrefs, new_bandrefs, S->nbands * sizeof(char **)); ======= @@ -7681,6 +7997,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7785,6 +8102,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main } } @@ -7813,6 +8132,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7897,6 +8217,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main free(group_semantic_labels[j]); free(group_semantic_labels); @@ -7920,6 +8244,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7976,6 +8301,9 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main free(group_bandrefs[j]); free(group_bandrefs); @@ -7998,6 +8326,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8026,6 +8355,8 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= free(group_semantic_labels[j]); free(group_semantic_labels); @@ -8048,6 +8379,7 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -8122,6 +8454,10 @@ char **I_SortSigSetBySemanticLabel(struct SigSet *S, const struct Ref *R) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main for (unsigned int c = S->nclasses; c--;) { for (unsigned int s = S->ClassSig[c].nsubclasses; s--;) { diff --git a/lib/imagery/sigsetfile.c b/lib/imagery/sigsetfile.c index 5f9411664c0..9d0cc432f6e 100644 --- a/lib/imagery/sigsetfile.c +++ b/lib/imagery/sigsetfile.c @@ -48,6 +48,7 @@ FILE *I_fopen_sigset_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -132,6 +133,10 @@ FILE *I_fopen_sigset_file_new(const char *name) ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main char dir[GNAME_MAX]; FILE *fd; @@ -158,6 +163,7 @@ FILE *I_fopen_sigset_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) @@ -199,6 +205,8 @@ FILE *I_fopen_sigset_file_new(const char *name) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= char element[GNAME_MAX]; ======= @@ -220,6 +228,7 @@ FILE *I_fopen_sigset_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 4d7f752c19 (ci: Ignore paths in CodeQL (#1778)) ======= ======= @@ -318,6 +327,8 @@ FILE *I_fopen_sigset_file_new(const char *name) >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= I_get_signatures_dir(dir, I_SIGFILE_TYPE_SIGSET); fd = G_fopen_new_misc(dir, "sig", name); @@ -340,6 +351,7 @@ FILE *I_fopen_sigset_file_new(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -375,6 +387,8 @@ FILE *I_fopen_sigset_file_new(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return fd; } @@ -411,6 +425,7 @@ FILE *I_fopen_sigset_file_old(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -476,6 +491,10 @@ FILE *I_fopen_sigset_file_old(const char *name) ======= char dir[GNAME_MAX]; ======= +>>>>>>> osgeo-main +======= + char dir[GNAME_MAX]; +======= >>>>>>> osgeo-main char element[GNAME_MAX]; >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -499,6 +518,7 @@ FILE *I_fopen_sigset_file_old(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -576,6 +596,8 @@ FILE *I_fopen_sigset_file_old(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main FILE *fd; @@ -603,6 +625,7 @@ FILE *I_fopen_sigset_file_old(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -682,6 +705,11 @@ FILE *I_fopen_sigset_file_old(const char *name) I_get_signatures_dir(dir, I_SIGFILE_TYPE_SIGSET); fd = G_fopen_old_misc(dir, "sig", sig_name, sig_mapset); ======= +>>>>>>> osgeo-main +======= + I_get_signatures_dir(dir, I_SIGFILE_TYPE_SIGSET); + fd = G_fopen_old_misc(dir, "sig", sig_name, sig_mapset); +======= >>>>>>> osgeo-main I__get_signatures_element(element, I_SIGFILE_TYPE_SIGSET); fd = G_fopen_old(element, sig_name, sig_mapset); @@ -708,6 +736,7 @@ FILE *I_fopen_sigset_file_old(const char *name) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -792,6 +821,8 @@ FILE *I_fopen_sigset_file_old(const char *name) ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main return fd; diff --git a/lib/imagery/testsuite/test_imagery_find.py b/lib/imagery/testsuite/test_imagery_find.py index 69d4f241818..e15bfcc0c01 100644 --- a/lib/imagery/testsuite/test_imagery_find.py +++ b/lib/imagery/testsuite/test_imagery_find.py @@ -25,6 +25,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import os import shutil ======= @@ -62,6 +63,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main import os import shutil @@ -89,6 +92,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -167,6 +171,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main from grass.gunittest.case import TestCase from grass.gunittest.main import test @@ -196,6 +202,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -230,6 +237,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_SIGFILE_TYPE_LIBSVM, ======= @@ -250,6 +259,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -300,6 +310,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_find_signature, I_find_signature2, @@ -332,6 +344,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main cls.sigdirs = [] @@ -392,6 +405,10 @@ def setUpClass(cls): cls.sigdirs = [] ======= >>>>>>> osgeo-main +======= + cls.sigdirs = [] +======= +>>>>>>> osgeo-main >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= cls.sigdirs = [] @@ -411,6 +428,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -500,6 +518,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # As signatures are created directly not via signature creation # tools, we must ensure signature directories exist @@ -522,6 +542,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -562,6 +583,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main os.makedirs(f"{cls.mpath}/signatures/libsvm/", exist_ok=True) cls.sig_name1 = tempname(10) @@ -599,6 +622,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -659,6 +683,10 @@ def tearDownClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main cls.sig_name1 = tempname(10) cls.sig_dir1 = f"{cls.mpath}/signatures/sigset/{cls.sig_name1}" @@ -688,6 +716,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -784,6 +813,8 @@ def tearDownClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main try: os.remove(cls.sigfile_name1) @@ -805,6 +836,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -833,6 +865,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) @@ -851,6 +885,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -879,6 +914,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) @@ -897,6 +934,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -944,6 +982,8 @@ def tearDownClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_find_sig(self): @@ -1011,6 +1051,7 @@ def test_find_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1051,6 +1092,8 @@ def test_find_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_find_libsvm(self): # Non existing without a mapset @@ -1092,6 +1135,7 @@ def test_find_libsvm(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1160,6 +1204,10 @@ def test_find_libsvm(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_find2_sig(self): # Non existing without a mapset @@ -1226,6 +1274,7 @@ def test_find2_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1266,6 +1315,8 @@ def test_find2_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_find2_libsvm(self): # Non existing without a mapset @@ -1307,6 +1358,7 @@ def test_find2_libsvm(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1376,6 +1428,10 @@ def test_find2_libsvm(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main if __name__ == "__main__": test() diff --git a/lib/imagery/testsuite/test_imagery_sigfile.py b/lib/imagery/testsuite/test_imagery_sigfile.py index f6ef9f1b6a4..3027953968e 100644 --- a/lib/imagery/testsuite/test_imagery_sigfile.py +++ b/lib/imagery/testsuite/test_imagery_sigfile.py @@ -25,6 +25,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -106,12 +107,18 @@ ======= +>>>>>>> osgeo-main +======= + >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -140,6 +147,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -200,6 +208,8 @@ ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main from pathlib import Path ======= ======= @@ -208,6 +218,9 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -230,6 +243,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -317,6 +331,8 @@ ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> af0cda6849 (ci: Ignore paths in CodeQL (#1778)) ======= ======= @@ -328,6 +344,9 @@ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -361,6 +380,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -427,6 +447,10 @@ from grass.lib.raster import Rast_write_semantic_label ======= >>>>>>> osgeo-main +======= +from grass.lib.raster import Rast_write_semantic_label +======= +>>>>>>> osgeo-main from grass.lib.raster import Rast_write_bandref >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= @@ -449,6 +473,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -527,6 +552,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main from grass.lib.imagery import ( Signature, Ref, @@ -557,6 +584,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -622,6 +650,10 @@ ======= I_sort_signatures_by_semantic_label, ======= +>>>>>>> osgeo-main +======= + I_sort_signatures_by_semantic_label, +======= >>>>>>> osgeo-main I_sort_signatures_by_bandref, >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -645,6 +677,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -722,6 +755,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures, I_init_group_ref, @@ -758,6 +793,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -842,6 +878,10 @@ def setUpClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main cls.sig_dir = f"{cls.mpath}/signatures/sig/{cls.sig_name}" @@ -864,6 +904,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -920,6 +961,9 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main cls.sigfile_name = f"{cls.mpath}/signatures/sig/{cls.sig_name}" @@ -944,6 +988,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -972,6 +1017,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cls.sig_dir = f"{cls.mpath}/signatures/sig/{cls.sig_name}" @@ -993,6 +1040,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1067,6 +1115,10 @@ def tearDownClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_I_fopen_signature_file_old_fail(self): @@ -1094,6 +1146,7 @@ def test_I_fopen_signature_file_old_fail(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main def test_roundtrip_signature_v1_norgb_one_label(self): @@ -1146,6 +1199,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_roundtrip_signature_v1_norgb_one_label(self): """Test writing and reading back signature file (v1) @@ -1169,6 +1224,7 @@ def test_roundtrip_signature_v1_norgb_one_band(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1197,6 +1253,8 @@ def test_roundtrip_signature_v1_norgb_one_band(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= def test_roundtrip_signature_v1_norgb_one_label(self): """Test writing and reading back signature file (v1) @@ -1216,6 +1274,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1244,6 +1303,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= def test_roundtrip_signature_v1_norgb_one_label(self): """Test writing and reading back signature file (v1) @@ -1263,6 +1324,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1310,6 +1372,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Create signature struct @@ -1342,6 +1406,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1407,6 +1472,10 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= So.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") ======= +>>>>>>> osgeo-main +======= + So.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") +======= >>>>>>> osgeo-main So.bandrefs[0] = ctypes.create_string_buffer(b"The_Doors") >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -1430,6 +1499,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1507,6 +1577,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main So.sig[0].status = 1 So.sig[0].have_color = 0 @@ -1538,6 +1610,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1692,6 +1765,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_stat = Path(self.sig_dir, "sig").stat() ======= @@ -1718,6 +1793,9 @@ def test_roundtrip_signature_v1_norgb_one_label(self): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1754,6 +1832,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1793,6 +1872,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -1810,6 +1891,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1863,6 +1945,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(Sn.have_oclass, 0) semantic_label = utils.decode( @@ -1889,6 +1973,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1935,6 +2020,9 @@ def test_roundtrip_signature_v1_norgb_one_label(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref = utils.decode(ctypes.cast(Sn.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref, "The_Doors") @@ -1957,6 +2045,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2029,6 +2118,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(Sn.sig[0].status, 1) self.assertEqual(Sn.sig[0].have_color, 0) @@ -2059,6 +2150,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2124,6 +2216,10 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= So.semantic_labels[0] = None ======= +>>>>>>> osgeo-main +======= + So.semantic_labels[0] = None +======= >>>>>>> osgeo-main So.bandrefs[0] = None >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -2147,6 +2243,7 @@ def test_roundtrip_signature_v1_norgb_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2224,6 +2321,8 @@ def test_roundtrip_signature_v1_norgb_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(So)) I_free_signatures(ctypes.byref(Sn)) @@ -2253,6 +2352,7 @@ def test_broken_signature_v1_norgb(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2318,6 +2418,10 @@ def test_broken_signature_v1_norgb(self): ======= single semantic label exceeding maximum length""" ======= +>>>>>>> osgeo-main +======= + single semantic label exceeding maximum length""" +======= >>>>>>> osgeo-main single band reference exceeding maximum length""" >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -2341,6 +2445,7 @@ def test_broken_signature_v1_norgb(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2418,6 +2523,8 @@ def test_broken_signature_v1_norgb(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Create signature struct @@ -2451,6 +2558,7 @@ def test_broken_signature_v1_norgb(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2516,6 +2624,10 @@ def test_broken_signature_v1_norgb(self): ======= So.semantic_labels[0] = ctypes.create_string_buffer(tempname(251).encode()) ======= +>>>>>>> osgeo-main +======= + So.semantic_labels[0] = ctypes.create_string_buffer(tempname(251).encode()) +======= >>>>>>> osgeo-main So.bandrefs[0] = ctypes.create_string_buffer(tempname(251).encode()) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -2539,6 +2651,7 @@ def test_broken_signature_v1_norgb(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2616,6 +2729,8 @@ def test_broken_signature_v1_norgb(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main So.sig[0].status = 1 So.sig[0].have_color = 0 @@ -2647,6 +2762,7 @@ def test_broken_signature_v1_norgb(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2801,6 +2917,8 @@ def test_broken_signature_v1_norgb(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_stat = Path(self.sig_dir, "sig").stat() ======= @@ -2827,6 +2945,9 @@ def test_broken_signature_v1_norgb(self): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2861,6 +2982,7 @@ def test_broken_signature_v1_norgb(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2945,6 +3067,10 @@ def test_broken_signature_v1_norgb(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main So.semantic_labels[0] = None I_free_signatures(ctypes.byref(So)) @@ -2968,6 +3094,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3024,6 +3151,9 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main So.bandrefs[0] = None I_free_signatures(ctypes.byref(So)) @@ -3046,6 +3176,7 @@ def test_roundtrip_signature_v1_norgb_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3074,6 +3205,8 @@ def test_roundtrip_signature_v1_norgb_two_bands(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= So.semantic_labels[0] = None I_free_signatures(ctypes.byref(So)) @@ -3096,6 +3229,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3170,6 +3304,10 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # Create signature struct @@ -3204,6 +3342,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3283,6 +3422,11 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): So.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") So.semantic_labels[1] = ctypes.create_string_buffer(b"The_Who") ======= +>>>>>>> osgeo-main +======= + So.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") + So.semantic_labels[1] = ctypes.create_string_buffer(b"The_Who") +======= >>>>>>> osgeo-main So.bandrefs[0] = ctypes.create_string_buffer(b"The_Doors") So.bandrefs[1] = ctypes.create_string_buffer(b"The_Who") @@ -3309,6 +3453,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3393,6 +3538,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main So.sig[0].status = 1 So.sig[0].have_color = 0 @@ -3436,6 +3583,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3590,6 +3738,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_stat = Path(self.sig_dir, "sig").stat() ======= @@ -3616,6 +3766,9 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3651,6 +3804,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3690,6 +3844,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3707,6 +3863,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3760,6 +3917,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(Sn.have_oclass, 0) semantic_label = utils.decode( @@ -3786,6 +3945,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3832,6 +3992,9 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref = utils.decode(ctypes.cast(Sn.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref, "The_Doors") @@ -3854,6 +4017,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3926,6 +4090,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(Sn.sig[0].status, 1) self.assertEqual(Sn.sig[0].have_color, 0) @@ -3957,6 +4123,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3996,6 +4163,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4013,6 +4182,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4066,6 +4236,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main semantic_label = utils.decode( ctypes.cast(Sn.semantic_labels[1], ctypes.c_char_p).value @@ -4091,6 +4263,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4137,6 +4310,9 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref = utils.decode(ctypes.cast(Sn.bandrefs[1], ctypes.c_char_p).value) self.assertEqual(bandref, "The_Who") @@ -4159,6 +4335,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4231,6 +4408,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(Sn.sig[1].status, 1) self.assertEqual(Sn.sig[1].have_color, 0) @@ -4264,6 +4443,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4303,6 +4483,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4320,6 +4502,7 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4373,6 +4556,8 @@ def test_roundtrip_signature_v1_norgb_two_labelss(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main So.semantic_labels[0] = None So.semantic_labels[1] = None @@ -4487,6 +4672,7 @@ def test_roundtrip_signature_v2_norgb_two_labels_oclass(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4533,6 +4719,9 @@ def test_roundtrip_signature_v2_norgb_two_labels_oclass(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main So.bandrefs[0] = None So.bandrefs[1] = None @@ -4555,6 +4744,7 @@ def test_roundtrip_signature_v2_norgb_two_labels_oclass(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4627,6 +4817,8 @@ def test_roundtrip_signature_v2_norgb_two_labels_oclass(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(So)) I_free_signatures(ctypes.byref(Sn)) @@ -4655,6 +4847,7 @@ def test_roundtrip_signature_v2_norgb_two_labels_oclass(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4721,6 +4914,10 @@ class SortSignaturesBysemantic_labelTest(TestCase): class SortSignaturesBysemantic_labelTest(TestCase): ======= >>>>>>> osgeo-main +======= +class SortSignaturesBysemantic_labelTest(TestCase): +======= +>>>>>>> osgeo-main class SortSignaturesByBandrefTest(TestCase): >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= @@ -4743,6 +4940,7 @@ class SortSignaturesBysemantic_labelTest(TestCase): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4820,6 +5018,8 @@ class SortSignaturesBysemantic_labelTest(TestCase): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @classmethod def setUpClass(cls): @@ -4847,6 +5047,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4895,6 +5096,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.semantic_label1 = "The_Doors" cls.map2 = tempname(10) @@ -4917,6 +5120,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4955,6 +5159,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.bandref1 = "The_Doors" cls.map2 = tempname(10) @@ -4974,6 +5180,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5002,6 +5209,8 @@ def setUpClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cls.semantic_label1 = "The_Doors" cls.map2 = tempname(10) @@ -5021,6 +5230,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5049,6 +5259,8 @@ def setUpClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cls.semantic_label1 = "The_Doors" cls.map2 = tempname(10) @@ -5068,6 +5280,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5115,6 +5328,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.map3 = tempname(10) cls.use_temp_region() @@ -5143,6 +5358,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5222,6 +5438,11 @@ def setUpClass(cls): Rast_write_semantic_label(cls.map1, cls.semantic_label1) Rast_write_semantic_label(cls.map2, cls.semantic_label2) ======= +>>>>>>> osgeo-main +======= + Rast_write_semantic_label(cls.map1, cls.semantic_label1) + Rast_write_semantic_label(cls.map2, cls.semantic_label2) +======= >>>>>>> osgeo-main Rast_write_bandref(cls.map1, cls.bandref1) Rast_write_bandref(cls.map2, cls.bandref2) @@ -5248,6 +5469,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5332,6 +5554,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @classmethod @@ -5378,6 +5602,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5443,6 +5668,10 @@ def test_symmetric_complete_difference(self): ======= S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Troggs") ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Troggs") +======= >>>>>>> osgeo-main S.bandrefs[0] = ctypes.create_string_buffer(b"The_Troggs") >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -5466,6 +5695,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5543,6 +5773,8 @@ def test_symmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S.title = b"Signature title" S.sig[0].status = 1 @@ -5574,6 +5806,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5639,6 +5872,10 @@ def test_symmetric_complete_difference(self): ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) ======= +>>>>>>> osgeo-main +======= + ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_bandref(ctypes.byref(S), ctypes.byref(R)) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -5662,6 +5899,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5739,6 +5977,8 @@ def test_symmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue(bool(ret)) sig_err = utils.decode(ctypes.cast(ret[0], ctypes.c_char_p).value) @@ -5768,6 +6008,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main S.semantic_labels[ @@ -5820,6 +6061,8 @@ def test_symmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S.semantic_labels[0] = ( None # C should not call free() on memory allocated by python @@ -5841,6 +6084,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5869,6 +6113,8 @@ def test_symmetric_complete_difference(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S.semantic_labels[ 0 @@ -5888,6 +6134,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5916,6 +6163,8 @@ def test_symmetric_complete_difference(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S.semantic_labels[ 0 @@ -5935,6 +6184,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5982,6 +6232,8 @@ def test_symmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(S)) I_free_group_ref(ctypes.byref(R)) @@ -6029,6 +6281,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6094,6 +6347,10 @@ def test_asymmetric_complete_difference(self): ======= S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Troggs") ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Troggs") +======= >>>>>>> osgeo-main S.bandrefs[0] = ctypes.create_string_buffer(b"The_Troggs") >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6117,6 +6374,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6194,6 +6452,8 @@ def test_asymmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S.sig[0].status = 1 S.sig[0].have_color = 0 @@ -6224,6 +6484,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6289,6 +6550,10 @@ def test_asymmetric_complete_difference(self): ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) ======= +>>>>>>> osgeo-main +======= + ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_bandref(ctypes.byref(S), ctypes.byref(R)) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6312,6 +6577,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6389,6 +6655,8 @@ def test_asymmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue(bool(ret)) sig_err = utils.decode(ctypes.cast(ret[0], ctypes.c_char_p).value) @@ -6418,6 +6686,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6483,6 +6752,10 @@ def test_asymmetric_complete_difference(self): ======= S.semantic_labels[0] = None ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = None +======= >>>>>>> osgeo-main S.bandrefs[0] = None >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6506,6 +6779,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6583,6 +6857,8 @@ def test_asymmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(S)) I_free_group_ref(ctypes.byref(R)) @@ -6614,6 +6890,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6679,6 +6956,10 @@ def test_missing_semantic_label(self): ======= def test_missing_semantic_label(self): ======= +>>>>>>> osgeo-main +======= + def test_missing_semantic_label(self): +======= >>>>>>> osgeo-main def test_missing_bandref(self): >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6702,6 +6983,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6779,6 +7061,8 @@ def test_missing_semantic_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Prepare imagery group reference struct R = Ref() @@ -6818,6 +7102,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6883,6 +7168,10 @@ def test_missing_semantic_label(self): ======= S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") +======= >>>>>>> osgeo-main S.bandrefs[0] = ctypes.create_string_buffer(b"The_Who") >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6906,6 +7195,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6983,6 +7273,8 @@ def test_missing_semantic_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S.sig[0].status = 1 S.sig[0].have_color = 0 @@ -7013,6 +7305,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7078,6 +7371,10 @@ def test_missing_semantic_label(self): ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) ======= +>>>>>>> osgeo-main +======= + ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_bandref(ctypes.byref(S), ctypes.byref(R)) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -7101,6 +7398,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7178,6 +7476,8 @@ def test_missing_semantic_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue(bool(ret)) sig_err = utils.decode(ctypes.cast(ret[0], ctypes.c_char_p).value) @@ -7205,6 +7505,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7244,6 +7545,8 @@ def test_missing_semantic_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -7261,6 +7564,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7314,6 +7618,8 @@ def test_missing_semantic_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ",," + ",," @@ -7336,6 +7642,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7410,6 +7717,10 @@ def test_missing_semantic_label(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ) self.assertEqual(ref_err, f"The_Doors,{self.map3}") @@ -7432,6 +7743,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7488,6 +7800,9 @@ def test_missing_semantic_label(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main ",," + ",," @@ -7509,6 +7824,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -7532,6 +7848,8 @@ def test_missing_semantic_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ) self.assertEqual(ref_err, f"The_Doors,{self.map3}") @@ -7559,6 +7877,7 @@ def test_missing_semantic_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7651,6 +7970,8 @@ def test_missing_semantic_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(S)) I_free_group_ref(ctypes.byref(R)) @@ -7696,6 +8017,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7761,6 +8083,10 @@ def test_single_complete_match(self): ======= S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") +======= >>>>>>> osgeo-main S.bandrefs[0] = ctypes.create_string_buffer(b"The_Doors") >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -7784,6 +8110,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7861,6 +8188,8 @@ def test_single_complete_match(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S.sig[0].status = 1 S.sig[0].have_color = 0 @@ -7891,6 +8220,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7975,6 +8305,10 @@ def test_single_complete_match(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -7998,6 +8332,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8054,6 +8389,9 @@ def test_single_complete_match(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_bandref(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -8074,6 +8412,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8102,6 +8441,8 @@ def test_single_complete_match(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -8124,6 +8465,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -8198,6 +8540,10 @@ def test_single_complete_match(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertEqual(S.sig[0].mean[0], 2.5) self.assertEqual(S.sig[0].var[0][0], 0.7) @@ -8224,6 +8570,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8289,6 +8636,10 @@ def test_single_complete_match(self): ======= S.semantic_labels[0] = None ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = None +======= >>>>>>> osgeo-main S.bandrefs[0] = None >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -8312,6 +8663,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8389,6 +8741,8 @@ def test_single_complete_match(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(S)) I_free_group_ref(ctypes.byref(R)) @@ -8438,6 +8792,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8517,6 +8872,11 @@ def test_double_complete_match_reorder(self): S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") S.semantic_labels[1] = ctypes.create_string_buffer(b"The_Doors") ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") + S.semantic_labels[1] = ctypes.create_string_buffer(b"The_Doors") +======= >>>>>>> osgeo-main S.bandrefs[0] = ctypes.create_string_buffer(b"The_Who") S.bandrefs[1] = ctypes.create_string_buffer(b"The_Doors") @@ -8543,6 +8903,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8627,6 +8988,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S.sig[0].status = 1 S.sig[0].have_color = 0 @@ -8669,6 +9032,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8717,6 +9081,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -8739,6 +9105,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8777,6 +9144,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_bandref(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -8796,6 +9165,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8824,6 +9194,8 @@ def test_double_complete_match_reorder(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -8843,6 +9215,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8871,6 +9244,8 @@ def test_double_complete_match_reorder(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -8890,6 +9265,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8937,6 +9313,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Static items self.assertEqual(S.sig[0].npoints, 69) @@ -8963,6 +9341,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9002,6 +9381,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -9019,6 +9400,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9072,6 +9454,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main semantic_label1 = utils.decode( ctypes.cast(S.semantic_labels[0], ctypes.c_char_p).value @@ -9101,6 +9485,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9163,6 +9548,9 @@ def test_double_complete_match_reorder(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref1 = utils.decode(ctypes.cast(S.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref1, "The_Doors") @@ -9184,6 +9572,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -9207,6 +9596,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -9224,6 +9615,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9277,6 +9669,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(S.sig[0].mean[0], 6.6) self.assertEqual(S.sig[0].mean[1], 3.3) @@ -9311,6 +9705,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9390,6 +9785,11 @@ def test_double_complete_match_reorder(self): S.semantic_labels[0] = None S.semantic_labels[1] = None ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = None + S.semantic_labels[1] = None +======= >>>>>>> osgeo-main S.bandrefs[0] = None S.bandrefs[1] = None @@ -9416,6 +9816,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9500,6 +9901,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(S)) I_free_group_ref(ctypes.byref(R)) @@ -9549,6 +9952,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9628,6 +10032,11 @@ def test_double_complete_match_same_order(self): S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") S.semantic_labels[1] = ctypes.create_string_buffer(b"The_Doors") ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") + S.semantic_labels[1] = ctypes.create_string_buffer(b"The_Doors") +======= >>>>>>> osgeo-main S.bandrefs[0] = ctypes.create_string_buffer(b"The_Who") S.bandrefs[1] = ctypes.create_string_buffer(b"The_Doors") @@ -9654,6 +10063,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9738,6 +10148,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S.sig[0].status = 1 S.sig[0].have_color = 0 @@ -9778,6 +10190,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9826,6 +10239,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -9848,6 +10263,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9886,6 +10302,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_bandref(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -9905,6 +10323,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9933,6 +10352,8 @@ def test_double_complete_match_same_order(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -9952,6 +10373,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9980,6 +10402,8 @@ def test_double_complete_match_same_order(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -9999,6 +10423,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10046,6 +10471,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Static items self.assertEqual(S.sig[0].npoints, 69) @@ -10072,6 +10499,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -10111,6 +10539,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -10128,6 +10558,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10181,6 +10612,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main semantic_label1 = utils.decode( ctypes.cast(S.semantic_labels[0], ctypes.c_char_p).value @@ -10210,6 +10643,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -10272,6 +10706,9 @@ def test_double_complete_match_same_order(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref1 = utils.decode(ctypes.cast(S.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref1, "The_Who") @@ -10293,6 +10730,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -10316,6 +10754,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -10333,6 +10773,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10386,6 +10827,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(S.sig[0].mean[0], 3.5) self.assertEqual(S.sig[0].var[0][0], 1.7) @@ -10414,6 +10857,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -10493,6 +10937,11 @@ def test_double_complete_match_same_order(self): S.semantic_labels[0] = None S.semantic_labels[1] = None ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = None + S.semantic_labels[1] = None +======= >>>>>>> osgeo-main S.bandrefs[0] = None S.bandrefs[1] = None @@ -10519,6 +10968,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10603,6 +11053,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(S)) I_free_group_ref(ctypes.byref(R)) @@ -10656,6 +11108,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -10735,6 +11188,11 @@ def test_complete_match_reorder(self): S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") S.semantic_labels[1] = ctypes.create_string_buffer(b"The_Doors") ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") + S.semantic_labels[1] = ctypes.create_string_buffer(b"The_Doors") +======= >>>>>>> osgeo-main S.bandrefs[0] = ctypes.create_string_buffer(b"The_Who") S.bandrefs[1] = ctypes.create_string_buffer(b"The_Doors") @@ -10761,6 +11219,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10845,6 +11304,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main S.sig[0].status = 1 S.sig[0].have_color = 0 @@ -10905,6 +11366,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -10953,6 +11415,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -10975,6 +11439,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11013,6 +11478,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_sort_signatures_by_bandref(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -11032,6 +11499,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -11060,6 +11528,8 @@ def test_complete_match_reorder(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -11079,6 +11549,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -11107,6 +11578,8 @@ def test_complete_match_reorder(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_sort_signatures_by_semantic_label(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -11126,6 +11599,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11173,6 +11647,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Static items self.assertEqual(S.sig[0].npoints, 69) @@ -11201,6 +11677,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -11240,6 +11717,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -11257,6 +11736,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11310,6 +11790,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main semantic_label1 = utils.decode( ctypes.cast(S.semantic_labels[0], ctypes.c_char_p).value @@ -11339,6 +11821,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -11401,6 +11884,9 @@ def test_complete_match_reorder(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref1 = utils.decode(ctypes.cast(S.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref1, "The_Doors") @@ -11422,6 +11908,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -11445,6 +11932,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -11462,6 +11951,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11515,6 +12005,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(S.sig[0].mean[0], 6.6) self.assertEqual(S.sig[0].mean[1], 3.3) @@ -11559,6 +12051,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -11638,6 +12131,11 @@ def test_complete_match_reorder(self): S.semantic_labels[0] = None S.semantic_labels[1] = None ======= +>>>>>>> osgeo-main +======= + S.semantic_labels[0] = None + S.semantic_labels[1] = None +======= >>>>>>> osgeo-main S.bandrefs[0] = None S.bandrefs[1] = None @@ -11664,6 +12162,7 @@ def test_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11748,6 +12247,8 @@ def test_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_free_signatures(ctypes.byref(S)) I_free_group_ref(ctypes.byref(R)) diff --git a/lib/imagery/testsuite/test_imagery_signature_management.py b/lib/imagery/testsuite/test_imagery_signature_management.py index a62af149a66..9423920fd43 100644 --- a/lib/imagery/testsuite/test_imagery_signature_management.py +++ b/lib/imagery/testsuite/test_imagery_signature_management.py @@ -25,6 +25,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -60,6 +61,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -79,6 +82,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -130,6 +134,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main import os import shutil import ctypes @@ -170,6 +176,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -204,6 +211,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_SIGFILE_TYPE_LIBSVM, ======= @@ -224,6 +233,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -274,6 +284,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_find_signature, I_signatures_remove, @@ -302,6 +314,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -386,6 +399,10 @@ ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main I_get_signatures_dir, I_make_signatures_dir, @@ -407,6 +424,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -444,6 +462,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main class GetSignaturesDirTestCase(TestCase): @xfail_windows def test_get_sig(self): @@ -489,6 +509,7 @@ def test_get_sigset(self): self.assertEqual(utils.decode(cdir.value), f"signatures{HOST_DIRSEP}sigset") +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -740,12 +761,17 @@ class MakeSignaturesElementTestCase(TestCase): ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main class MakeSignaturesElementTestCase(TestCase): <<<<<<< HEAD >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -785,6 +811,7 @@ def test_make_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -848,6 +875,10 @@ def test_make_sig(self): ======= I_make_signatures_dir(I_SIGFILE_TYPE_SIG) ======= +>>>>>>> osgeo-main +======= + I_make_signatures_dir(I_SIGFILE_TYPE_SIG) +======= >>>>>>> osgeo-main I__make_signatures_element(I_SIGFILE_TYPE_SIG) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -870,6 +901,7 @@ def test_make_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -919,6 +951,8 @@ def test_make_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue( os.path.isdir(os.path.join(self.tmp_mapset_path, "signatures", "sig")) @@ -932,6 +966,7 @@ def test_make_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1010,6 +1045,10 @@ def test_make_sig(self): ======= I_make_signatures_dir(I_SIGFILE_TYPE_SIG) ======= +>>>>>>> osgeo-main +======= + I_make_signatures_dir(I_SIGFILE_TYPE_SIG) +======= >>>>>>> osgeo-main I__make_signatures_element(I_SIGFILE_TYPE_SIG) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -1031,6 +1070,7 @@ def test_make_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1151,6 +1191,8 @@ def test_make_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue( os.path.isdir(os.path.join(self.tmp_mapset_path, "signatures", "sig")) @@ -1178,6 +1220,7 @@ def test_make_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1241,6 +1284,10 @@ def test_make_sigset(self): ======= I_make_signatures_dir(I_SIGFILE_TYPE_SIGSET) ======= +>>>>>>> osgeo-main +======= + I_make_signatures_dir(I_SIGFILE_TYPE_SIGSET) +======= >>>>>>> osgeo-main I__make_signatures_element(I_SIGFILE_TYPE_SIGSET) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -1263,6 +1310,7 @@ def test_make_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1312,6 +1360,8 @@ def test_make_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue( os.path.isdir(os.path.join(self.tmp_mapset_path, "signatures", "sigset")) @@ -1325,6 +1375,7 @@ def test_make_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1403,6 +1454,10 @@ def test_make_sigset(self): ======= I_make_signatures_dir(I_SIGFILE_TYPE_SIGSET) ======= +>>>>>>> osgeo-main +======= + I_make_signatures_dir(I_SIGFILE_TYPE_SIGSET) +======= >>>>>>> osgeo-main I__make_signatures_element(I_SIGFILE_TYPE_SIGSET) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -1424,6 +1479,7 @@ def test_make_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -1544,6 +1600,8 @@ def test_make_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue( os.path.isdir(os.path.join(self.tmp_mapset_path, "signatures", "sigset")) @@ -1566,6 +1624,7 @@ def test_make_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1606,6 +1665,8 @@ def test_make_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_make_libsvm(self): I_make_signatures_dir(I_SIGFILE_TYPE_LIBSVM) @@ -1634,6 +1695,7 @@ def test_make_libsvm(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1703,6 +1765,10 @@ def test_make_libsvm(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main class SignaturesRemoveTestCase(TestCase): @classmethod @@ -1730,6 +1796,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1795,6 +1862,10 @@ def setUpClass(cls): ======= cls.sigdirs = [] ======= +>>>>>>> osgeo-main +======= + cls.sigdirs = [] +======= >>>>>>> osgeo-main cls.sigfiles = [] >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -1818,6 +1889,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1895,6 +1967,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # As signatures are created directly not via signature creation # tools, we must ensure signature directories exist @@ -1917,6 +1991,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2003,6 +2078,11 @@ def setUpClass(cls): os.makedirs(f"{cls.mpath}/signatures/libsvm/", exist_ok=True) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= + os.makedirs(f"{cls.mpath}/signatures/libsvm/", exist_ok=True) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @classmethod @@ -2024,6 +2104,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2070,6 +2151,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= @classmethod @@ -2087,6 +2170,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -2120,6 +2204,8 @@ def tearDownClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for f in cls.sigfiles: try: @@ -2141,6 +2227,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2169,6 +2256,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) @@ -2187,6 +2276,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2261,6 +2351,10 @@ def tearDownClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_remove_existing_sig(self): @@ -2288,6 +2382,7 @@ def test_remove_existing_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2327,6 +2422,8 @@ def test_remove_existing_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2344,6 +2441,7 @@ def test_remove_existing_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2397,6 +2495,8 @@ def test_remove_existing_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_dir1 = f"{self.mpath}/signatures/sigset/{sig_name1}" os.makedirs(sig_dir1) @@ -2418,6 +2518,7 @@ def test_remove_existing_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2492,6 +2593,10 @@ def test_remove_existing_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main open(sigfile_name1, "a").close() sig_name2 = tempname(10) @@ -2522,6 +2627,7 @@ def test_remove_existing_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2568,6 +2674,9 @@ def test_remove_existing_sig(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main sigfile_name1 = f"{self.mpath}/signatures/sigset/{sig_name1}" ======= @@ -2606,6 +2715,7 @@ def test_remove_existing_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2722,6 +2832,8 @@ def test_remove_existing_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Try to remove with wrong type ret = I_signatures_remove(I_SIGFILE_TYPE_SIGSET, sig_name2) @@ -2774,6 +2886,7 @@ def test_remove_nonexisting_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2813,6 +2926,8 @@ def test_remove_nonexisting_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2830,6 +2945,7 @@ def test_remove_nonexisting_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2883,6 +2999,8 @@ def test_remove_nonexisting_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_dir1 = f"{self.mpath}/signatures/sigset/{sig_name1}" os.makedirs(sig_dir1) @@ -2904,6 +3022,7 @@ def test_remove_nonexisting_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -2978,6 +3097,10 @@ def test_remove_nonexisting_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main open(sigfile_name1, "a").close() sig_name2 = tempname(10) @@ -3004,6 +3127,7 @@ def test_remove_nonexisting_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3050,6 +3174,9 @@ def test_remove_nonexisting_sig(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main sigfile_name1 = f"{self.mpath}/signatures/sigset/{sig_name1}" ======= @@ -3084,6 +3211,7 @@ def test_remove_nonexisting_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3188,6 +3316,8 @@ def test_remove_nonexisting_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Now remove one (should fail as file is absent) ret = I_signatures_remove(I_SIGFILE_TYPE_SIG, sig_name2) @@ -3229,6 +3359,7 @@ def test_remove_existing_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3268,6 +3399,8 @@ def test_remove_existing_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3285,6 +3418,7 @@ def test_remove_existing_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3338,6 +3472,8 @@ def test_remove_existing_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_dir1 = f"{self.mpath}/signatures/sigset/{sig_name1}" os.makedirs(sig_dir1) @@ -3359,6 +3495,7 @@ def test_remove_existing_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3433,6 +3570,10 @@ def test_remove_existing_sigset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main open(sigfile_name1, "a").close() sig_name2 = tempname(10) @@ -3463,6 +3604,7 @@ def test_remove_existing_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3509,6 +3651,9 @@ def test_remove_existing_sigset(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main sigfile_name1 = f"{self.mpath}/signatures/sigset/{sig_name1}" ======= @@ -3547,6 +3692,7 @@ def test_remove_existing_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3663,6 +3809,8 @@ def test_remove_existing_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Try to remove with wrong type ret = I_signatures_remove(I_SIGFILE_TYPE_SIG, sig_name2) @@ -3715,6 +3863,7 @@ def test_remove_nonexisting_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3754,6 +3903,8 @@ def test_remove_nonexisting_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -3771,6 +3922,7 @@ def test_remove_nonexisting_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3824,6 +3976,8 @@ def test_remove_nonexisting_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_dir1 = f"{self.mpath}/signatures/sigset/{sig_name1}" os.makedirs(sig_dir1) @@ -3845,6 +3999,7 @@ def test_remove_nonexisting_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -3919,6 +4074,10 @@ def test_remove_nonexisting_sigset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main open(sigfile_name1, "a").close() sig_name2 = tempname(10) @@ -3945,6 +4104,7 @@ def test_remove_nonexisting_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3991,6 +4151,9 @@ def test_remove_nonexisting_sigset(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main sigfile_name1 = f"{self.mpath}/signatures/sigset/{sig_name1}" ======= @@ -4025,6 +4188,7 @@ def test_remove_nonexisting_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4129,6 +4293,8 @@ def test_remove_nonexisting_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Now remove one (should fail as file doesn't exist) ret = I_signatures_remove(I_SIGFILE_TYPE_SIGSET, sig_name2) @@ -4163,6 +4329,7 @@ def test_remove_nonexisting_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4203,6 +4370,8 @@ def test_remove_nonexisting_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_remove_existing_libsvm(self): # This test will fail if run in PERMANENT! @@ -4300,6 +4469,7 @@ def test_remove_nonexisting_libsvm(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -4369,6 +4539,10 @@ def test_remove_nonexisting_libsvm(self): ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main class SignaturesCopyTestCase(TestCase): @classmethod @@ -4396,6 +4570,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4461,6 +4636,10 @@ def setUpClass(cls): ======= cls.sigdirs = [] ======= +>>>>>>> osgeo-main +======= + cls.sigdirs = [] +======= >>>>>>> osgeo-main cls.sigfiles = [] >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -4484,6 +4663,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4561,6 +4741,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # As signatures are created directly not via signature creation # tools, we must ensure signature directories exist @@ -4583,6 +4765,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4617,6 +4800,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main os.makedirs(f"{cls.mpath}/signatures/libsvm/", exist_ok=True) ======= @@ -4637,6 +4822,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4687,6 +4873,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # A mapset with a random name cls.src_mapset_name = tempname(10) @@ -4715,6 +4903,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4799,6 +4988,10 @@ def setUpClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # Create fake signature files os.makedirs(f"{cls.src_mapset_path}/signatures/sig/") @@ -4823,6 +5016,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4879,6 +5073,9 @@ def setUpClass(cls): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main os.makedirs(f"{cls.src_mapset_path}/signatures/sig/") cls.src_sig = tempname(10) @@ -4899,6 +5096,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4927,6 +5125,8 @@ def setUpClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # Create fake signature files os.makedirs(f"{cls.src_mapset_path}/signatures/sig/") @@ -4950,6 +5150,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5024,6 +5225,10 @@ def setUpClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main f.write("A sig file") f.close() @@ -5050,6 +5255,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5089,6 +5295,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -5106,6 +5314,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5159,6 +5368,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.src_sigset_dir = f"{cls.src_mapset_path}/signatures/sigset/{cls.src_sigset}" os.makedirs(cls.src_sigset_dir) @@ -5180,6 +5391,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD f.write("A sigset file") f.close() @@ -5223,6 +5435,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main f.write("A sigset file") f.close() @@ -5251,6 +5465,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5280,6 +5495,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) f.write("A sigset file") f.close() @@ -5302,6 +5519,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5352,6 +5570,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @classmethod @@ -5379,6 +5599,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5478,6 +5699,11 @@ def tearDownClass(cls): for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) ======= +>>>>>>> osgeo-main +======= + for d in cls.sigdirs: + shutil.rmtree(d, ignore_errors=True) +======= >>>>>>> osgeo-main for f in cls.sigfiles: try: @@ -5499,6 +5725,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5527,6 +5754,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) @@ -5545,6 +5774,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5573,6 +5803,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) @@ -5591,6 +5823,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5638,6 +5871,8 @@ def tearDownClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_copy_to_wrong_mapset(self): @@ -5676,6 +5911,7 @@ def test_sigset_does_not_exist(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -5716,6 +5952,8 @@ def test_sigset_does_not_exist(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_libsvm_does_not_exist(self): ret = I_signatures_copy( @@ -5739,6 +5977,7 @@ def test_libsvm_does_not_exist(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5807,6 +6046,10 @@ def test_libsvm_does_not_exist(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_success_unqualified_sig(self): dst = tempname(10) @@ -5838,6 +6081,7 @@ def test_success_unqualified_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5903,6 +6147,10 @@ def test_success_unqualified_sig(self): ======= self.sigdirs.append(f"{self.mpath}/signatures/sig/{dst}") ======= +>>>>>>> osgeo-main +======= + self.sigdirs.append(f"{self.mpath}/signatures/sig/{dst}") +======= >>>>>>> osgeo-main self.sigfiles.append(f"{self.mpath}/signatures/sig/{dst}") >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -5926,6 +6174,7 @@ def test_success_unqualified_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6003,6 +6252,8 @@ def test_success_unqualified_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(ret, 0) ret = I_find_signature(I_SIGFILE_TYPE_SIG, dst, self.mapset_name) @@ -6030,6 +6281,7 @@ def test_success_unqualified_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6114,6 +6366,10 @@ def test_success_unqualified_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst}/sig")) @@ -6137,6 +6393,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6193,6 +6450,9 @@ def test_success_fq_sig(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main def test_success_fq_sig(self): @@ -6214,6 +6474,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6242,6 +6503,8 @@ def test_success_fq_sig(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst}/sig")) @@ -6264,6 +6527,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -6338,6 +6602,10 @@ def test_success_fq_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ret = I_find_signature(I_SIGFILE_TYPE_SIG, dst, self.mapset_name) self.assertFalse(ret) @@ -6375,6 +6643,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst_name}/sig")) @@ -6435,6 +6704,10 @@ def test_success_fq_sig(self): self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst_name}/sig")) ======= >>>>>>> osgeo-main +======= + self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst_name}/sig")) +======= +>>>>>>> osgeo-main >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst_name}/sig")) @@ -6454,6 +6727,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -6543,6 +6817,8 @@ def test_success_fq_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_success_unqualified_sigset(self): @@ -6577,6 +6853,7 @@ def test_success_unqualified_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6642,6 +6919,10 @@ def test_success_unqualified_sigset(self): ======= self.sigdirs.append(f"{self.mpath}/signatures/sigset/{dst}") ======= +>>>>>>> osgeo-main +======= + self.sigdirs.append(f"{self.mpath}/signatures/sigset/{dst}") +======= >>>>>>> osgeo-main self.sigfiles.append(f"{self.mpath}/signatures/sigset/{dst}") >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6665,6 +6946,7 @@ def test_success_unqualified_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6742,6 +7024,8 @@ def test_success_unqualified_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(ret, 0) ret = I_find_signature(I_SIGFILE_TYPE_SIGSET, dst, self.mapset_name) @@ -6769,6 +7053,7 @@ def test_success_unqualified_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6853,6 +7138,10 @@ def test_success_unqualified_sigset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sigset/{dst}/sig")) @@ -6876,6 +7165,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6932,6 +7222,9 @@ def test_success_fq_sigset(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main def test_success_fq_sigset(self): @@ -6953,6 +7246,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6981,6 +7275,8 @@ def test_success_fq_sigset(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sigset/{dst}/sig")) @@ -7003,6 +7299,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7077,6 +7374,10 @@ def test_success_fq_sigset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ret = I_find_signature(I_SIGFILE_TYPE_SIGSET, dst, self.mapset_name) self.assertFalse(ret) @@ -7116,6 +7417,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7200,6 +7502,10 @@ def test_success_fq_sigset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertTrue( os.path.isfile(f"{self.mpath}/signatures/sigset/{dst_name}/sig") @@ -7220,6 +7526,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7256,6 +7563,8 @@ def test_success_fq_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_success_unqualified_libsvm(self): dst = tempname(10) @@ -7315,6 +7624,7 @@ def test_success_fq_libsvm(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7343,6 +7653,8 @@ def test_success_fq_libsvm(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= self.assertTrue( os.path.isfile(f"{self.mpath}/signatures/sigset/{dst_name}/sig") @@ -7360,6 +7672,7 @@ def test_success_fq_libsvm(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7443,6 +7756,11 @@ def test_success_fq_libsvm(self): >>>>>>> osgeo-main ======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= + ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -7473,6 +7791,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7538,6 +7857,10 @@ def setUpClass(cls): ======= cls.sigdirs = [] ======= +>>>>>>> osgeo-main +======= + cls.sigdirs = [] +======= >>>>>>> osgeo-main cls.sigfiles = [] >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -7561,6 +7884,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7638,6 +7962,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # As signatures are created directly not via signature creation # tools, we must ensure signature directories exist @@ -7660,6 +7986,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -7746,6 +8073,11 @@ def setUpClass(cls): os.makedirs(f"{cls.mpath}/signatures/libsvm/", exist_ok=True) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= + os.makedirs(f"{cls.mpath}/signatures/libsvm/", exist_ok=True) +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @classmethod @@ -7767,6 +8099,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -7813,6 +8146,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= @classmethod @@ -7830,6 +8165,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -7863,6 +8199,8 @@ def tearDownClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main for f in cls.sigfiles: try: @@ -7884,6 +8222,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7912,6 +8251,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) @@ -7930,6 +8271,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -8004,6 +8346,10 @@ def tearDownClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_rename_from_wrong_mapset(self): @@ -8041,6 +8387,7 @@ def test_sigset_does_not_exist(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -8081,6 +8428,8 @@ def test_sigset_does_not_exist(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_libsvm_does_not_exist(self): ret = I_signatures_rename(I_SIGFILE_TYPE_LIBSVM, tempname(10), tempname(10)) @@ -8102,6 +8451,7 @@ def test_libsvm_does_not_exist(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8137,6 +8487,8 @@ def test_libsvm_does_not_exist(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_success_unqualified_sig(self): src_sig = tempname(10) @@ -8164,6 +8516,7 @@ def test_success_unqualified_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8210,6 +8563,9 @@ def test_success_unqualified_sig(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main def test_success_unqualified_sig(self): src_sig = tempname(10) @@ -8242,6 +8598,7 @@ def test_success_unqualified_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -8340,6 +8697,8 @@ def test_success_unqualified_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_find_signature(I_SIGFILE_TYPE_SIG, dst, self.mapset_name) self.assertFalse(ret) @@ -8372,6 +8731,7 @@ def test_success_unqualified_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8456,6 +8816,10 @@ def test_success_unqualified_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst}/sig")) @@ -8485,6 +8849,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8535,6 +8900,8 @@ def test_success_fq_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst}/sig")) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8557,6 +8924,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -8623,6 +8991,8 @@ def test_success_fq_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main dst = tempname(10) self.sigfiles.append(f"{self.mpath}/signatures/sig/{dst}") @@ -8642,6 +9012,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8670,6 +9041,8 @@ def test_success_fq_sig(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= dst_name = tempname(10) self.sigdirs.append(f"{self.mpath}/signatures/sig/{dst_name}") @@ -8689,6 +9062,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -8763,6 +9137,10 @@ def test_success_fq_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ret = I_find_signature(I_SIGFILE_TYPE_SIG, dst, self.mapset_name) self.assertFalse(ret) @@ -8799,6 +9177,7 @@ def test_success_fq_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8883,6 +9262,10 @@ def test_success_fq_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst_name}/sig")) @@ -8912,6 +9295,7 @@ def test_success_unqualified_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8959,6 +9343,9 @@ def test_success_unqualified_sigset(self): ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main ======= self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sig/{dst_name}/sig")) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -8994,6 +9381,7 @@ def test_success_unqualified_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9104,6 +9492,8 @@ def test_success_unqualified_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_find_signature(I_SIGFILE_TYPE_SIGSET, dst, self.mapset_name) self.assertFalse(ret) @@ -9136,6 +9526,7 @@ def test_success_unqualified_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9220,6 +9611,10 @@ def test_success_unqualified_sigset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sigset/{dst}/sig")) @@ -9249,6 +9644,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9299,6 +9695,8 @@ def test_success_fq_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= self.assertTrue(os.path.isfile(f"{self.mpath}/signatures/sigset/{dst}/sig")) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -9321,6 +9719,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -9387,6 +9786,8 @@ def test_success_fq_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main dst = tempname(10) self.sigfiles.append(f"{self.mpath}/signatures/sigset/{dst}") @@ -9406,6 +9807,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9434,6 +9836,8 @@ def test_success_fq_sigset(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= dst_name = tempname(10) self.sigdirs.append(f"{self.mpath}/signatures/sigset/{dst_name}") @@ -9453,6 +9857,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -9527,6 +9932,10 @@ def test_success_fq_sigset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ret = I_find_signature(I_SIGFILE_TYPE_SIGSET, dst, self.mapset_name) self.assertFalse(ret) @@ -9563,6 +9972,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9647,6 +10057,10 @@ def test_success_fq_sigset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertTrue( os.path.isfile(f"{self.mpath}/signatures/sigset/{dst_name}/sig") @@ -9667,6 +10081,7 @@ def test_success_fq_sigset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9703,6 +10118,8 @@ def test_success_fq_sigset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_success_unqualified_libsvm(self): src_sig = tempname(10) @@ -9769,6 +10186,7 @@ def test_success_fq_libsvm(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9797,6 +10215,8 @@ def test_success_fq_libsvm(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= self.assertTrue( os.path.isfile(f"{self.mpath}/signatures/sigset/{dst_name}/sig") @@ -9814,6 +10234,7 @@ def test_success_fq_libsvm(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -9897,6 +10318,11 @@ def test_success_fq_libsvm(self): >>>>>>> osgeo-main ======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= + ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main @@ -9928,6 +10354,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9993,6 +10420,10 @@ def setUpClass(cls): ======= cls.sigdirs = [] ======= +>>>>>>> osgeo-main +======= + cls.sigdirs = [] +======= >>>>>>> osgeo-main cls.sigfiles = [] >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -10016,6 +10447,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10093,6 +10525,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # As signatures are created directly not via signature creation # tools, we must ensure signature directories exist @@ -10115,6 +10549,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -10149,6 +10584,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main os.makedirs(f"{cls.mpath}/signatures/libsvm/", exist_ok=True) ======= @@ -10169,6 +10606,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10219,6 +10657,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # A mapset with a random name cls.rnd_mapset_name = tempname(10) @@ -10245,6 +10685,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -10279,6 +10720,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main os.makedirs(f"{cls.rnd_mapset_path}/signatures/libsvm/") ======= @@ -10299,6 +10742,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10349,6 +10793,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @classmethod @@ -10376,6 +10822,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -10475,6 +10922,11 @@ def tearDownClass(cls): for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) ======= +>>>>>>> osgeo-main +======= + for d in cls.sigdirs: + shutil.rmtree(d, ignore_errors=True) +======= >>>>>>> osgeo-main for f in cls.sigfiles: try: @@ -10496,6 +10948,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -10524,6 +10977,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) @@ -10542,6 +10997,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -10570,6 +11026,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= for d in cls.sigdirs: shutil.rmtree(d, ignore_errors=True) @@ -10588,6 +11046,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10635,6 +11094,8 @@ def tearDownClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_no_sigs_at_all(self): @@ -10667,6 +11128,7 @@ def test_no_sigs_at_all(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -10706,6 +11168,8 @@ def test_no_sigs_at_all(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -10723,6 +11187,7 @@ def test_no_sigs_at_all(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10776,6 +11241,8 @@ def test_no_sigs_at_all(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_signatures_list_by_type( I_SIGFILE_TYPE_SIGSET, self.rnd_mapset_name, ctypes.byref(sig_list) @@ -10799,6 +11266,7 @@ def test_no_sigs_at_all(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -10839,6 +11307,8 @@ def test_no_sigs_at_all(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ret = I_signatures_list_by_type( I_SIGFILE_TYPE_LIBSVM, self.rnd_mapset_name, ctypes.byref(sig_list) @@ -10861,6 +11331,7 @@ def test_no_sigs_at_all(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -10896,6 +11367,8 @@ def test_no_sigs_at_all(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_sig_in_different_mapset(self): @@ -10921,6 +11394,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -10966,6 +11440,8 @@ def test_sig_in_different_mapset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= ======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -10983,6 +11459,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -11039,6 +11516,8 @@ def test_sig_in_different_mapset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_file = f"{self.mpath}/signatures/sig/{local_sig}" self.sigfiles.append(sig_file) @@ -11058,6 +11537,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -11086,6 +11566,8 @@ def test_sig_in_different_mapset(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= sig_dir = f"{self.mpath}/signatures/sig/{local_sig}" os.makedirs(sig_dir) @@ -11106,6 +11588,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -11180,6 +11663,10 @@ def test_sig_in_different_mapset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main f.write("A sig file") f.close() @@ -11208,6 +11695,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -11292,6 +11780,10 @@ def test_sig_in_different_mapset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main shutil.rmtree(sig_dir) self.assertEqual(ret, 0) @@ -11317,6 +11809,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -11362,6 +11855,8 @@ def test_sig_in_different_mapset(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= os.remove(sig_file) ======= @@ -11381,6 +11876,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -11439,6 +11935,8 @@ def test_sig_in_different_mapset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sigset_file = f"{self.mpath}/signatures/sigset/{local_sigset}" self.sigfiles.append(sigset_file) @@ -11458,6 +11956,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -11486,6 +11985,8 @@ def test_sig_in_different_mapset(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= sig_dir = f"{self.mpath}/signatures/sigset/{local_sigset}" os.makedirs(sig_dir) @@ -11506,6 +12007,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -11580,6 +12082,10 @@ def test_sig_in_different_mapset(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main f.write("A sigset file") f.close() @@ -11608,6 +12114,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -11657,6 +12164,8 @@ def test_sig_in_different_mapset(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main shutil.rmtree(sig_dir) self.assertEqual(ret, 0) @@ -11692,6 +12201,7 @@ def test_sig_in_different_mapset(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= shutil.rmtree(sig_dir) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) @@ -11767,6 +12277,11 @@ def test_sig_in_different_mapset(self): ======= shutil.rmtree(sig_dir) >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= + shutil.rmtree(sig_dir) +>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertEqual(ret, 0) I_free_signatures_list(ret, ctypes.byref(sig_list)) @@ -11793,6 +12308,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -11842,6 +12358,9 @@ def test_single_sig(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main shutil.rmtree(sig_dir) self.assertEqual(ret, 0) @@ -11864,6 +12383,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -11928,6 +12448,9 @@ def test_single_sig(self): >>>>>>> osgeo-main ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # Sig type rnd_sig = tempname(10) @@ -11951,6 +12474,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -12007,6 +12531,9 @@ def test_single_sig(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main rnd_sig = tempname(10) sig_file = f"{self.rnd_mapset_path}/signatures/sig/{rnd_sig}" @@ -12026,6 +12553,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -12054,6 +12582,8 @@ def test_single_sig(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # Sig type rnd_sig = tempname(10) @@ -12076,6 +12606,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -12150,6 +12681,10 @@ def test_single_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main f.write("A sig file") f.close() @@ -12178,6 +12713,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -12243,6 +12779,10 @@ def test_single_sig(self): ======= shutil.rmtree(sig_dir) ======= +>>>>>>> osgeo-main +======= + shutil.rmtree(sig_dir) +======= >>>>>>> osgeo-main os.remove(sig_file) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -12266,6 +12806,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -12343,6 +12884,8 @@ def test_single_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(ret, 1) val = utils.decode(sig_list[0]) @@ -12369,6 +12912,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -12453,6 +12997,10 @@ def test_single_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # SigSet type # SigSet equals sig. Just testing branching inside. @@ -12477,6 +13025,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -12533,6 +13082,9 @@ def test_single_sig(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main # SigSet equals sig. Just testing branching inside. rnd_sigset = tempname(10) @@ -12553,6 +13105,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -12581,6 +13134,8 @@ def test_single_sig(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= # SigSet type # SigSet equals sig. Just testing branching inside. @@ -12604,6 +13159,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -12678,6 +13234,10 @@ def test_single_sig(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main f.write("A sigset file") f.close() @@ -12706,6 +13266,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -12771,6 +13332,10 @@ def test_single_sig(self): ======= shutil.rmtree(sig_dir) ======= +>>>>>>> osgeo-main +======= + shutil.rmtree(sig_dir) +======= >>>>>>> osgeo-main os.remove(sigset_file) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -12794,6 +13359,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -12871,6 +13437,8 @@ def test_single_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(ret, 1) val = utils.decode(sigset_list[0]) @@ -12893,6 +13461,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -12933,6 +13502,8 @@ def test_single_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # libsvm type rnd_sig = tempname(10) @@ -12967,6 +13538,7 @@ def test_single_sig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -13002,6 +13574,8 @@ def test_single_sig(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_multiple_sigs(self): @@ -13035,6 +13609,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -13081,6 +13656,9 @@ def test_multiple_sigs(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main def test_multiple_sigs(self): @@ -13120,6 +13698,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -13243,6 +13822,8 @@ def test_multiple_sigs(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main f.write("A sig file") f.close() @@ -13272,6 +13853,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -13351,6 +13933,11 @@ def test_multiple_sigs(self): shutil.rmtree(sig_dir1) shutil.rmtree(sig_dir2) ======= +>>>>>>> osgeo-main +======= + shutil.rmtree(sig_dir1) + shutil.rmtree(sig_dir2) +======= >>>>>>> osgeo-main os.remove(sig_file1) os.remove(sig_file2) @@ -13377,6 +13964,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -13461,6 +14049,8 @@ def test_multiple_sigs(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(ret, 2) golden = ( @@ -13491,6 +14081,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -13575,6 +14166,10 @@ def test_multiple_sigs(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main # SigSet type rnd_sigset1 = tempname(10) @@ -13605,6 +14200,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -13651,6 +14247,9 @@ def test_multiple_sigs(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main # Ditto for sigset ======= @@ -13690,6 +14289,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -13809,6 +14409,8 @@ def test_multiple_sigs(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main f.write("A sigset file") f.close() @@ -13837,6 +14439,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -13916,6 +14519,11 @@ def test_multiple_sigs(self): shutil.rmtree(sig_dir1) shutil.rmtree(sig_dir2) ======= +>>>>>>> osgeo-main +======= + shutil.rmtree(sig_dir1) + shutil.rmtree(sig_dir2) +======= >>>>>>> osgeo-main os.remove(sigset_file1) os.remove(sigset_file2) @@ -13942,6 +14550,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -14026,6 +14635,8 @@ def test_multiple_sigs(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(ret, 2) golden = ( @@ -14052,6 +14663,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -14092,6 +14704,8 @@ def test_multiple_sigs(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # libsvm type rnd_sig1 = tempname(10) @@ -14139,6 +14753,7 @@ def test_multiple_sigs(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -14207,6 +14822,10 @@ def test_multiple_sigs(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_multiple_sigs_multiple_mapsets(self): @@ -14233,6 +14852,7 @@ def test_multiple_sigs_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -14272,6 +14892,8 @@ def test_multiple_sigs_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -14289,6 +14911,7 @@ def test_multiple_sigs_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -14342,6 +14965,8 @@ def test_multiple_sigs_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_dir1 = f"{self.rnd_mapset_path}/signatures/sig/{rnd_sig1}" os.makedirs(sig_dir1) @@ -14363,6 +14988,7 @@ def test_multiple_sigs_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -14437,6 +15063,10 @@ def test_multiple_sigs_multiple_mapsets(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main f.write("A sig file") f.close() @@ -14463,6 +15093,7 @@ def test_multiple_sigs_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -14509,6 +15140,9 @@ def test_multiple_sigs_multiple_mapsets(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main sig_file1 = f"{self.rnd_mapset_path}/signatures/sig/{rnd_sig1}" f = open(sig_file1, "w") @@ -14544,6 +15178,7 @@ def test_multiple_sigs_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -14651,6 +15286,8 @@ def test_multiple_sigs_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_list = self.list_ptr() ret = I_signatures_list_by_type( @@ -14699,6 +15336,7 @@ def test_multiple_sigs_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -14778,6 +15416,11 @@ def test_multiple_sigs_multiple_mapsets(self): shutil.rmtree(sig_dir1) shutil.rmtree(sig_dir2) ======= +>>>>>>> osgeo-main +======= + shutil.rmtree(sig_dir1) + shutil.rmtree(sig_dir2) +======= >>>>>>> osgeo-main os.remove(sig_file1) os.remove(sig_file2) @@ -14804,6 +15447,7 @@ def test_multiple_sigs_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -14888,6 +15532,8 @@ def test_multiple_sigs_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # There could be more sigs if this is not an empty mapset self.assertTrue(ret >= 2) @@ -14920,6 +15566,7 @@ def test_multiple_sigsets_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -14959,6 +15606,8 @@ def test_multiple_sigsets_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -14976,6 +15625,7 @@ def test_multiple_sigsets_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -15029,6 +15679,8 @@ def test_multiple_sigsets_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_dir1 = f"{self.rnd_mapset_path}/signatures/sigset/{rnd_sig1}" os.makedirs(sig_dir1) @@ -15050,6 +15702,7 @@ def test_multiple_sigsets_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -15124,6 +15777,10 @@ def test_multiple_sigsets_multiple_mapsets(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main f.write("A sigset file") f.close() @@ -15184,6 +15841,7 @@ def test_multiple_sigsets_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -15220,6 +15878,8 @@ def test_multiple_sigsets_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_multiple_libsvms_multiple_mapsets(self): # Test searching in multiple mapsets. Identical to SIG and SIGSET case @@ -15259,6 +15919,7 @@ def test_multiple_libsvms_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -15282,6 +15943,8 @@ def test_multiple_libsvms_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) f.write("A sigset file") f.close() @@ -15302,6 +15965,7 @@ def test_multiple_libsvms_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -15380,6 +16044,8 @@ def test_multiple_libsvms_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_list = self.list_ptr() ret = I_signatures_list_by_type( @@ -15431,6 +16097,7 @@ def test_multiple_libsvms_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -15458,6 +16125,8 @@ def test_multiple_libsvms_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main os.remove(sig_file1) os.remove(sig_file2) @@ -15478,6 +16147,7 @@ def test_multiple_libsvms_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -15523,6 +16193,8 @@ def test_multiple_libsvms_multiple_mapsets(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # There could be more sigs if this is not an empty mapset self.assertTrue(ret >= 2) @@ -15547,6 +16219,7 @@ def test_multiple_libsvms_multiple_mapsets(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -15583,6 +16256,8 @@ def test_multiple_libsvms_multiple_mapsets(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main if __name__ == "__main__": test() diff --git a/lib/imagery/testsuite/test_imagery_sigsetfile.py b/lib/imagery/testsuite/test_imagery_sigsetfile.py index 7de6b236b20..2b80155ff35 100644 --- a/lib/imagery/testsuite/test_imagery_sigsetfile.py +++ b/lib/imagery/testsuite/test_imagery_sigsetfile.py @@ -25,6 +25,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -106,12 +107,18 @@ ======= +>>>>>>> osgeo-main +======= + >>>>>>> osgeo-main <<<<<<< HEAD ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -140,6 +147,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -200,6 +208,8 @@ ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main from pathlib import Path ======= ======= @@ -208,6 +218,9 @@ >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -230,6 +243,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -317,6 +331,8 @@ ======= ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> af0cda6849 (ci: Ignore paths in CodeQL (#1778)) ======= ======= @@ -328,6 +344,9 @@ >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -361,6 +380,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -427,6 +447,10 @@ from grass.lib.raster import Rast_write_semantic_label ======= >>>>>>> osgeo-main +======= +from grass.lib.raster import Rast_write_semantic_label +======= +>>>>>>> osgeo-main from grass.lib.raster import Rast_write_bandref >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= @@ -449,6 +473,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -527,6 +552,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main from grass.lib.imagery import ( SigSet, I_InitSigSet, @@ -555,6 +582,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -620,6 +648,10 @@ ======= I_SortSigSetBySemanticLabel, ======= +>>>>>>> osgeo-main +======= + I_SortSigSetBySemanticLabel, +======= >>>>>>> osgeo-main I_SortSigSetByBandref, >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -643,6 +675,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -720,6 +753,8 @@ ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main I_fopen_sigset_file_new, I_fopen_sigset_file_old, @@ -748,6 +783,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -813,6 +849,10 @@ ======= ReturnString, ======= +>>>>>>> osgeo-main +======= + ReturnString, +======= >>>>>>> osgeo-main String, >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -836,6 +876,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -914,6 +955,8 @@ >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ) @@ -945,6 +988,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1029,6 +1073,10 @@ def setUpClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main cls.sig_dir = f"{cls.mpath}/signatures/sigset/{cls.sig_name}" @@ -1051,6 +1099,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1107,6 +1156,9 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main cls.sigfile_name = f"{cls.mpath}/signatures/sigset/{cls.sig_name}" @@ -1131,6 +1183,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1159,6 +1212,8 @@ def tearDownClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cls.sig_dir = f"{cls.mpath}/signatures/sigset/{cls.sig_name}" @@ -1180,6 +1235,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1254,6 +1310,10 @@ def tearDownClass(cls): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main def test_I_fopen_signature_file_old_fail(self): @@ -1281,6 +1341,7 @@ def test_I_fopen_signature_file_old_fail(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1329,6 +1390,8 @@ def test_I_fopen_signature_file_old_fail(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_roundtrip_sigset_v1_one_label(self): """Test writing and reading back sigset file (v1) @@ -1351,6 +1414,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1389,6 +1453,8 @@ def test_roundtrip_sigset_v1_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main def test_roundtrip_sigset_v1_one_band(self): """Test writing and reading back sigset file (v1) @@ -1408,6 +1474,7 @@ def test_roundtrip_sigset_v1_one_band(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1436,6 +1503,8 @@ def test_roundtrip_sigset_v1_one_band(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= def test_roundtrip_sigset_v1_one_label(self): """Test writing and reading back sigset file (v1) @@ -1455,6 +1524,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1483,6 +1553,8 @@ def test_roundtrip_sigset_v1_one_label(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= def test_roundtrip_sigset_v1_one_label(self): """Test writing and reading back sigset file (v1) @@ -1502,6 +1574,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1549,6 +1622,8 @@ def test_roundtrip_sigset_v1_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Create signature struct @@ -1582,6 +1657,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1666,6 +1742,10 @@ def test_roundtrip_sigset_v1_one_label(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main So.title = ReturnString("Signature title") So.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") @@ -1688,6 +1768,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1744,6 +1825,9 @@ def test_roundtrip_sigset_v1_one_label(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main So.title = String("Signature title") So.bandrefs[0] = ctypes.create_string_buffer(b"The_Doors") @@ -1765,6 +1849,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -1793,6 +1878,8 @@ def test_roundtrip_sigset_v1_one_label(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= So.title = ReturnString("Signature title") So.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") @@ -1814,6 +1901,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -1888,6 +1976,10 @@ def test_roundtrip_sigset_v1_one_label(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main So.ClassSig[0].type = 1 So.ClassSig[0].SubSig[0].pi = 3.14 @@ -1917,6 +2009,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2071,6 +2164,8 @@ def test_roundtrip_sigset_v1_one_label(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_stat = Path(self.sig_dir, "sig").stat() ======= @@ -2097,6 +2192,9 @@ def test_roundtrip_sigset_v1_one_label(self): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -2133,6 +2231,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2172,6 +2271,8 @@ def test_roundtrip_sigset_v1_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -2189,6 +2290,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2242,6 +2344,8 @@ def test_roundtrip_sigset_v1_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main semantic_label = utils.decode( ctypes.cast(Sn.semantic_labels[0], ctypes.c_char_p).value @@ -2267,6 +2371,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2313,6 +2418,9 @@ def test_roundtrip_sigset_v1_one_label(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref = utils.decode(ctypes.cast(Sn.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref, "The_Doors") @@ -2335,6 +2443,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2407,6 +2516,8 @@ def test_roundtrip_sigset_v1_one_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(Sn.nclasses, 1) self.assertEqual(Sn.ClassSig[0].nsubclasses, 1) @@ -2442,6 +2553,7 @@ def test_roundtrip_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2521,6 +2633,11 @@ def test_read_fail_sigset_v1_one_label(self): def test_read_fail_sigset_v1_one_label(self): """Reading back should fail as semantic label length exceeds limit""" ======= +>>>>>>> osgeo-main +======= + def test_read_fail_sigset_v1_one_label(self): + """Reading back should fail as semantic label length exceeds limit""" +======= >>>>>>> osgeo-main def test_read_fail_sigset_v1_one_band(self): """Reading back should fail as band reference exceeds limit""" @@ -2547,6 +2664,7 @@ def test_read_fail_sigset_v1_one_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2631,6 +2749,8 @@ def test_read_fail_sigset_v1_one_band(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Create signature struct @@ -2664,6 +2784,7 @@ def test_read_fail_sigset_v1_one_band(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2748,6 +2869,10 @@ def test_read_fail_sigset_v1_one_band(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main So.title = ReturnString("Signature title") So.semantic_labels[0] = ctypes.create_string_buffer(tempname(252).encode()) @@ -2770,6 +2895,7 @@ def test_read_fail_sigset_v1_one_band(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2826,6 +2952,9 @@ def test_read_fail_sigset_v1_one_band(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main So.title = String("Signature title") So.bandrefs[0] = ctypes.create_string_buffer(tempname(252).encode()) @@ -2847,6 +2976,7 @@ def test_read_fail_sigset_v1_one_band(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -2875,6 +3005,8 @@ def test_read_fail_sigset_v1_one_band(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= So.title = ReturnString("Signature title") So.semantic_labels[0] = ctypes.create_string_buffer(tempname(252).encode()) @@ -2896,6 +3028,7 @@ def test_read_fail_sigset_v1_one_band(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -2970,6 +3103,10 @@ def test_read_fail_sigset_v1_one_band(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main So.ClassSig[0].type = 1 So.ClassSig[0].SubSig[0].pi = 3.14 @@ -2999,6 +3136,7 @@ def test_read_fail_sigset_v1_one_band(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3153,6 +3291,8 @@ def test_read_fail_sigset_v1_one_band(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_stat = Path(self.sig_dir, "sig").stat() ======= @@ -3179,6 +3319,9 @@ def test_read_fail_sigset_v1_one_band(self): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3216,6 +3359,7 @@ def test_read_fail_sigset_v1_one_band(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3295,6 +3439,11 @@ def test_roundtrip_sigset_v1_two_labels(self): def test_roundtrip_sigset_v1_two_labels(self): """Test writing and reading back sigset (v1) with two labels""" ======= +>>>>>>> osgeo-main +======= + def test_roundtrip_sigset_v1_two_labels(self): + """Test writing and reading back sigset (v1) with two labels""" +======= >>>>>>> osgeo-main def test_roundtrip_sigset_v1_two_bands(self): """Test writing and reading back sigset (v1) with two bands""" @@ -3321,6 +3470,7 @@ def test_roundtrip_sigset_v1_two_labels(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -3405,6 +3555,8 @@ def test_roundtrip_sigset_v1_two_bands(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Create signature struct @@ -3438,6 +3590,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3522,6 +3675,10 @@ def test_roundtrip_sigset_v1_two_bands(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main So.title = ReturnString("Signature title") So.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") @@ -3545,6 +3702,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3601,6 +3759,9 @@ def test_roundtrip_sigset_v1_two_bands(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main So.title = String("Signature title") So.bandrefs[0] = ctypes.create_string_buffer(b"The_Doors") @@ -3623,6 +3784,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -3651,6 +3813,8 @@ def test_roundtrip_sigset_v1_two_bands(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= So.title = ReturnString("Signature title") So.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") @@ -3673,6 +3837,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -3747,6 +3912,10 @@ def test_roundtrip_sigset_v1_two_bands(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main So.ClassSig[0].type = 1 So.ClassSig[0].SubSig[0].pi = 3.14 @@ -3780,6 +3949,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -3934,6 +4104,8 @@ def test_roundtrip_sigset_v1_two_bands(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main sig_stat = Path(self.sig_dir, "sig").stat() ======= @@ -3960,6 +4132,9 @@ def test_roundtrip_sigset_v1_two_bands(self): >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ======= >>>>>>> osgeo-main @@ -3995,6 +4170,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4034,6 +4210,8 @@ def test_roundtrip_sigset_v1_two_bands(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4051,6 +4229,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4104,6 +4283,8 @@ def test_roundtrip_sigset_v1_two_bands(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main semantic_label = utils.decode( ctypes.cast(Sn.semantic_labels[0], ctypes.c_char_p).value @@ -4133,6 +4314,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4195,6 +4377,9 @@ def test_roundtrip_sigset_v1_two_bands(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main bandref = utils.decode(ctypes.cast(Sn.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref, "The_Doors") @@ -4216,6 +4401,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -4239,6 +4425,8 @@ def test_roundtrip_sigset_v1_two_bands(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -4256,6 +4444,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4309,6 +4498,8 @@ def test_roundtrip_sigset_v1_two_bands(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertEqual(Sn.nclasses, 1) self.assertEqual(Sn.ClassSig[0].nsubclasses, 1) @@ -4349,6 +4540,7 @@ def test_roundtrip_sigset_v1_two_bands(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4415,6 +4607,10 @@ class SortSigSetBySemanticLabelTest(TestCase): class SortSigSetBySemanticLabelTest(TestCase): ======= >>>>>>> osgeo-main +======= +class SortSigSetBySemanticLabelTest(TestCase): +======= +>>>>>>> osgeo-main class SortSigSetByBandrefTest(TestCase): >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) ======= @@ -4437,6 +4633,7 @@ class SortSigSetBySemanticLabelTest(TestCase): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4514,6 +4711,8 @@ class SortSigSetBySemanticLabelTest(TestCase): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @classmethod def setUpClass(cls): @@ -4541,6 +4740,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4589,6 +4789,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.semantic_label1 = "The_Doors" cls.map2 = tempname(10) @@ -4611,6 +4813,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4649,6 +4852,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.bandref1 = "The_Doors" cls.map2 = tempname(10) @@ -4668,6 +4873,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4696,6 +4902,8 @@ def setUpClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cls.semantic_label1 = "The_Doors" cls.map2 = tempname(10) @@ -4715,6 +4923,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -4743,6 +4952,8 @@ def setUpClass(cls): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= cls.semantic_label1 = "The_Doors" cls.map2 = tempname(10) @@ -4762,6 +4973,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -4809,6 +5021,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main cls.map3 = tempname(10) cls.use_temp_region() @@ -4837,6 +5051,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -4916,6 +5131,11 @@ def setUpClass(cls): Rast_write_semantic_label(cls.map1, cls.semantic_label1) Rast_write_semantic_label(cls.map2, cls.semantic_label2) ======= +>>>>>>> osgeo-main +======= + Rast_write_semantic_label(cls.map1, cls.semantic_label1) + Rast_write_semantic_label(cls.map2, cls.semantic_label2) +======= >>>>>>> osgeo-main Rast_write_bandref(cls.map1, cls.bandref1) Rast_write_bandref(cls.map2, cls.bandref2) @@ -4942,6 +5162,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5026,6 +5247,8 @@ def setUpClass(cls): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main @classmethod @@ -5074,6 +5297,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5158,6 +5382,10 @@ def test_symmetric_complete_difference(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Troggs") @@ -5180,6 +5408,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5236,6 +5465,9 @@ def test_symmetric_complete_difference(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main S.title = String("Signature title") S.bandrefs[0] = ctypes.create_string_buffer(b"The_Troggs") @@ -5257,6 +5489,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5285,6 +5518,8 @@ def test_symmetric_complete_difference(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Troggs") @@ -5306,6 +5541,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5380,6 +5616,10 @@ def test_symmetric_complete_difference(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.ClassSig[0].type = 1 S.ClassSig[0].SubSig[0].pi = 3.14 @@ -5408,6 +5648,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5473,6 +5714,10 @@ def test_symmetric_complete_difference(self): ======= ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) ======= +>>>>>>> osgeo-main +======= + ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) +======= >>>>>>> osgeo-main ret = I_SortSigSetByBandref(ctypes.byref(S), ctypes.byref(R)) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -5496,6 +5741,7 @@ def test_symmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -5573,6 +5819,8 @@ def test_symmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue(bool(ret)) sig_err = utils.decode(ctypes.cast(ret[0], ctypes.c_char_p).value) @@ -5628,6 +5876,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -5712,6 +5961,10 @@ def test_asymmetric_complete_difference(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Troggs") @@ -5734,6 +5987,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5790,6 +6044,9 @@ def test_asymmetric_complete_difference(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main S.title = String("Signature title") S.bandrefs[0] = ctypes.create_string_buffer(b"The_Troggs") @@ -5811,6 +6068,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -5839,6 +6097,8 @@ def test_asymmetric_complete_difference(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Troggs") @@ -5860,6 +6120,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -5934,6 +6195,10 @@ def test_asymmetric_complete_difference(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.ClassSig[0].type = 1 S.ClassSig[0].SubSig[0].pi = 3.14 @@ -5962,6 +6227,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6027,6 +6293,10 @@ def test_asymmetric_complete_difference(self): ======= ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) ======= +>>>>>>> osgeo-main +======= + ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) +======= >>>>>>> osgeo-main ret = I_SortSigSetByBandref(ctypes.byref(S), ctypes.byref(R)) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6050,6 +6320,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6127,6 +6398,8 @@ def test_asymmetric_complete_difference(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue(bool(ret)) sig_err = utils.decode(ctypes.cast(ret[0], ctypes.c_char_p).value) @@ -6164,6 +6437,7 @@ def test_asymmetric_complete_difference(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6229,6 +6503,10 @@ def test_missing_label(self): ======= def test_missing_label(self): ======= +>>>>>>> osgeo-main +======= + def test_missing_label(self): +======= >>>>>>> osgeo-main def test_missing_bandref(self): >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6252,6 +6530,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6329,6 +6608,8 @@ def test_missing_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Prepare imagery group reference struct R = Ref() @@ -6369,6 +6650,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6453,6 +6735,10 @@ def test_missing_label(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") @@ -6475,6 +6761,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6531,6 +6818,9 @@ def test_missing_label(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main S.title = String("Signature title") S.bandrefs[0] = ctypes.create_string_buffer(b"The_Who") @@ -6552,6 +6842,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -6580,6 +6871,8 @@ def test_missing_label(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") @@ -6601,6 +6894,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -6675,6 +6969,10 @@ def test_missing_label(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.ClassSig[0].type = 1 S.ClassSig[0].SubSig[0].pi = 3.14 @@ -6703,6 +7001,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6768,6 +7067,10 @@ def test_missing_label(self): ======= ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) ======= +>>>>>>> osgeo-main +======= + ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) +======= >>>>>>> osgeo-main ret = I_SortSigSetByBandref(ctypes.byref(S), ctypes.byref(R)) >>>>>>> 268d757b7d (ci: Ignore paths in CodeQL (#1778)) @@ -6791,6 +7094,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -6868,6 +7172,8 @@ def test_missing_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main self.assertTrue(bool(ret)) sig_err = utils.decode(ctypes.cast(ret[0], ctypes.c_char_p).value) @@ -6895,6 +7201,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -6934,6 +7241,8 @@ def test_missing_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -6951,6 +7260,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7004,6 +7314,8 @@ def test_missing_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main ",," + ",," @@ -7026,6 +7338,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7115,6 +7428,11 @@ def test_missing_label(self): ) self.assertEqual(ref_err, f"The_Doors,{self.map3}") ======= +>>>>>>> osgeo-main +======= + ) + self.assertEqual(ref_err, f"The_Doors,{self.map3}") +======= >>>>>>> osgeo-main ",," + ",," @@ -7138,6 +7456,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7166,6 +7485,8 @@ def test_missing_label(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ) self.assertEqual(ref_err, f"The_Doors,{self.map3}") @@ -7184,6 +7505,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7212,6 +7534,8 @@ def test_missing_label(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ) self.assertEqual(ref_err, f"The_Doors,{self.map3}") @@ -7230,6 +7554,7 @@ def test_missing_label(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -7277,6 +7602,8 @@ def test_missing_label(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main # Clean up memory to help track memory leaks when run by valgrind @@ -7324,6 +7651,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7408,6 +7736,10 @@ def test_single_complete_match(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") @@ -7430,6 +7762,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7486,6 +7819,9 @@ def test_single_complete_match(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main S.title = String("Signature title") S.bandrefs[0] = ctypes.create_string_buffer(b"The_Doors") @@ -7507,6 +7843,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7535,6 +7872,8 @@ def test_single_complete_match(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Doors") @@ -7556,6 +7895,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7630,6 +7970,10 @@ def test_single_complete_match(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.ClassSig[0].type = 1 S.ClassSig[0].SubSig[0].pi = 3.14 @@ -7658,6 +8002,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -7742,6 +8087,10 @@ def test_single_complete_match(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -7765,6 +8114,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7821,6 +8171,9 @@ def test_single_complete_match(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main ret = I_SortSigSetByBandref(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -7841,6 +8194,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -7869,6 +8223,8 @@ def test_single_complete_match(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -7891,6 +8247,7 @@ def test_single_complete_match(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -7965,6 +8322,10 @@ def test_single_complete_match(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertEqual(S.ClassSig[0].SubSig[0].pi, 3.14) self.assertEqual(S.ClassSig[0].SubSig[0].means[0], 42.42) @@ -8017,6 +8378,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8101,6 +8463,10 @@ def test_double_complete_match_reorder(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") @@ -8124,6 +8490,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8180,6 +8547,9 @@ def test_double_complete_match_reorder(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main S.title = String("Signature title") S.bandrefs[0] = ctypes.create_string_buffer(b"The_Who") @@ -8202,6 +8572,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8230,6 +8601,8 @@ def test_double_complete_match_reorder(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") @@ -8252,6 +8625,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -8326,6 +8700,10 @@ def test_double_complete_match_reorder(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.ClassSig[0].type = 1 S.ClassSig[0].SubSig[0].pi = 3.14 @@ -8358,6 +8736,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8442,6 +8821,10 @@ def test_double_complete_match_reorder(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -8472,6 +8855,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -8518,6 +8902,8 @@ def test_double_complete_match_reorder(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_SortSigSetByBandref(ctypes.byref(S), ctypes.byref(R)) ======= @@ -8538,6 +8924,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -8598,6 +8985,8 @@ def test_double_complete_match_reorder(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main bandref1 = utils.decode(ctypes.cast(S.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref1, "The_Doors") @@ -8618,6 +9007,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8646,6 +9036,8 @@ def test_double_complete_match_reorder(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= semantic_label1 = utils.decode( ctypes.cast(S.semantic_labels[0], ctypes.c_char_p).value @@ -8670,6 +9062,7 @@ def test_double_complete_match_reorder(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -8744,6 +9137,10 @@ def test_double_complete_match_reorder(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertEqual(S.ClassSig[0].SubSig[0].means[0], 24.24) self.assertEqual(S.ClassSig[0].SubSig[0].means[1], 42.42) @@ -8799,6 +9196,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -8883,6 +9281,10 @@ def test_double_complete_match_same_order(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") @@ -8906,6 +9308,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -8962,6 +9365,9 @@ def test_double_complete_match_same_order(self): >>>>>>> osgeo-main ======= ======= +>>>>>>> osgeo-main +======= +======= >>>>>>> osgeo-main S.title = String("Signature title") S.bandrefs[0] = ctypes.create_string_buffer(b"The_Who") @@ -8984,6 +9390,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9012,6 +9419,8 @@ def test_double_complete_match_same_order(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= S.title = ReturnString("Signature title") S.semantic_labels[0] = ctypes.create_string_buffer(b"The_Who") @@ -9034,6 +9443,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -9108,6 +9518,10 @@ def test_double_complete_match_same_order(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main S.ClassSig[0].type = 1 S.ClassSig[0].SubSig[0].pi = 3.14 @@ -9140,6 +9554,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -9224,6 +9639,10 @@ def test_double_complete_match_same_order(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main ret = I_SortSigSetBySemanticLabel(ctypes.byref(S), ctypes.byref(R)) self.assertFalse(bool(ret)) @@ -9254,6 +9673,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -9300,6 +9720,8 @@ def test_double_complete_match_same_order(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= ret = I_SortSigSetByBandref(ctypes.byref(S), ctypes.byref(R)) ======= @@ -9320,6 +9742,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 12a69d7f45 (ci: Ignore paths in CodeQL (#1778)) ======= <<<<<<< HEAD @@ -9380,6 +9803,8 @@ def test_double_complete_match_same_order(self): ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main bandref1 = utils.decode(ctypes.cast(S.bandrefs[0], ctypes.c_char_p).value) self.assertEqual(bandref1, "The_Who") @@ -9400,6 +9825,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= @@ -9428,6 +9854,8 @@ def test_double_complete_match_same_order(self): >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= semantic_label1 = utils.decode( ctypes.cast(S.semantic_labels[0], ctypes.c_char_p).value @@ -9452,6 +9880,7 @@ def test_double_complete_match_same_order(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD @@ -9526,6 +9955,10 @@ def test_double_complete_match_same_order(self): ======= ======= >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main self.assertEqual(S.ClassSig[0].SubSig[0].means[0], 42.42) self.assertEqual(S.ClassSig[0].SubSig[0].means[1], 24.24) diff --git a/lib/init/grass.html b/lib/init/grass.html index 539af5d7403..6e6b4fd1ad5 100644 --- a/lib/init/grass.html +++ b/lib/init/grass.html @@ -22,6 +22,7 @@

    SYNOPSIS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [--tmp-location | --tmp-mapset] [[[<GISDBASE>/]<LOCATION>/] ======= @@ -65,6 +66,8 @@

    SYNOPSIS

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main [--tmp-project | --tmp-mapset] [[[<GISDBASE>/]<PROJECT>/] ======= @@ -85,6 +88,7 @@

    SYNOPSIS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -114,6 +118,8 @@

    SYNOPSIS

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= [--tmp-location | --tmp-mapset] [[[<GISDBASE>/]<LOCATION>/] >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -131,6 +137,7 @@

    SYNOPSIS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -172,6 +179,8 @@

    SYNOPSIS

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main <MAPSET>] [--exec EXECUTABLE] @@ -203,6 +212,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -244,6 +254,8 @@

    Flags:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
    -c XY
    Creates new GRASS project (location) without coordinate reference system in specified GISDBASE @@ -273,6 +285,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD @@ -342,6 +355,10 @@

    Flags:

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main
    -c
    Creates new GRASS unprojected location in specified GISDBASE @@ -373,6 +390,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -464,6 +482,11 @@

    Flags:

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main
    -f
    Forces removal of .gislock if exists (use with care!). Only with --text flag @@ -503,6 +526,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -578,6 +602,10 @@

    Flags:

    Prints GRASS configuration parameters (options: arch, build, compiler, date, path, python_path, revision, svn_revision, version) ======= >>>>>>> osgeo-main +======= +
    Prints GRASS configuration parameters (options: arch, build, compiler, date, path, python_path, revision, svn_revision, version) +======= +>>>>>>> osgeo-main
    Prints GRASS configuration parameters (options: arch, build, compiler, date, path, revision, svn_revision, version) >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -600,6 +628,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD =======
    Prints GRASS configuration parameters (options: arch, build, compiler, date, path, python_path, revision, svn_revision, version) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) @@ -725,6 +754,11 @@

    Flags:

    Prints GRASS configuration parameters (options: arch, build, compiler, date, path, python_path, revision, svn_revision, version) >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> osgeo-main +======= +======= +
    Prints GRASS configuration parameters (options: arch, build, compiler, date, path, python_path, revision, svn_revision, version) +>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) +>>>>>>> osgeo-main
    --exec EXECUTABLE
    Execute GRASS module or script. The provided executable will be executed in a GRASS GIS non-interactive session. @@ -746,6 +780,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD
    --tmp-location
    Run using a temporary location which is created based on the given ======= @@ -789,6 +824,8 @@

    Flags:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
    --tmp-project
    Run using a temporary project which is created based on the given ======= @@ -809,6 +846,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -838,6 +876,8 @@

    Flags:

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +=======
    --tmp-location
    Run using a temporary location which is created based on the given >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -855,6 +895,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -897,6 +938,8 @@

    Flags:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main coordinate reference system and deleted at the end of the execution (use with the --exec flag). The active mapset will be the PERMANENT mapset. @@ -920,6 +963,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD location and deleted at the end of the execution ======= <<<<<<< HEAD @@ -962,6 +1006,8 @@

    Flags:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main project and deleted at the end of the execution ======= location and deleted at the end of the execution @@ -980,6 +1026,7 @@

    Flags:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= location and deleted at the end of the execution >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -1063,6 +1110,11 @@

    Flags:

    location and deleted at the end of the execution >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= +location and deleted at the end of the execution +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main (use with the --exec flag). @@ -1091,6 +1143,7 @@

    Parameters:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1132,6 +1185,8 @@

    Parameters:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
    PROJECT
    Initial project directory which is a subdirectory of GISDBASE (project was previously called location) @@ -1153,6 +1208,7 @@

    Parameters:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD @@ -1222,6 +1278,10 @@

    Parameters:

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main
    LOCATION
    Initial location directory which is a subdirectory of GISDBASE @@ -1244,6 +1304,7 @@

    Parameters:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -1335,6 +1396,11 @@

    Parameters:

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main Note: These parameters must be specified in one of the @@ -1358,6 +1424,7 @@

    Parameters:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD LOCATION/MAPSET GISDBASE/LOCATION/MAPSET @@ -1401,6 +1468,8 @@

    Parameters:

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main PROJECT/MAPSET GISDBASE/PROJECT/MAPSET @@ -1422,6 +1491,7 @@

    Parameters:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -1450,6 +1520,8 @@

    Parameters:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main ======= LOCATION/MAPSET GISDBASE/LOCATION/MAPSET @@ -1468,6 +1540,7 @@

    Parameters:

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1510,6 +1583,8 @@

    Parameters:

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    DESCRIPTION

    @@ -1553,6 +1628,7 @@

    DESCRIPTION

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -1638,6 +1714,10 @@

    DESCRIPTION

    ======= >>>>>>> 6dd43833fd (Improve G_open|find _misc function documentation (#1760)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 6dd43833fd (Improve G_open|find _misc function documentation (#1760)) +>>>>>>> osgeo-main

    Running non-interactive jobs

    The --exec flag can run an executable on path, GRASS module, or a script. @@ -1666,6 +1746,7 @@

    Config flag

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5b1a121e4b (Improve G_open|find _misc function documentation (#1760)) ======= @@ -1713,6 +1794,9 @@

    Config flag

    ======= ======= >>>>>>> osgeo-main +======= +======= +>>>>>>> osgeo-main

    FLAGS

    >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= @@ -1734,6 +1818,7 @@

    FLAGS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -1803,6 +1888,8 @@

    FLAGS

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main The flag --config option prints GRASS GIS configuration and version parameters, with the options: @@ -1828,6 +1915,7 @@

    FLAGS

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1869,6 +1957,8 @@

    FLAGS

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
  • date: (e.g., 2024-04-10T11:44:54+00:00)
  • path: (e.g., /usr/lib64/grass)
  • python_path: (e.g., /usr/lib64/grass/etc/python)
    • @@ -1897,6 +1987,7 @@

    SAMPLE DATA

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD @@ -1946,6 +2037,10 @@

    SAMPLE DATA

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main
  • date: (e.g., Tue Mar 31 20:34:57 2020 +0200)
  • path: (e.g., /usr/lib64/grass)
  • python_path: (e.g., /usr/lib64/grass/etc/python)
    • @@ -1969,6 +2064,7 @@

    SAMPLE DATA

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2006,6 +2102,8 @@

    SAMPLE DATA

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +=======
  • version: (e.g., 8.2.0dev)
    • @@ -2024,6 +2122,7 @@

    SAMPLE DATA

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2114,6 +2213,8 @@

    SAMPLE DATA

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    SAMPLE DATA

    The GRASS GIS project provides several free sample geospatial datasets @@ -2135,6 +2236,7 @@

    SAMPLE DATA

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -2226,6 +2328,11 @@

    SAMPLE DATA

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main https://grass.osgeo.org/download/sample-data/. The "North Carolina data set" is a modern package of geospatial data from @@ -2345,6 +2452,7 @@

    HTML Browser Variable

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> main ======= @@ -2439,6 +2547,11 @@

    HTML Browser Variable

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main

    Running non-interactive batch jobs

    If the GRASS_BATCH_JOB environment variable is set to the full @@ -2464,6 +2577,7 @@

    Running non-interactive batch jobs

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> osgeo-main @@ -2486,6 +2600,8 @@

    Running non-interactive batch jobs

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -2505,6 +2621,7 @@

    Running non-interactive batch jobs

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> main @@ -2565,6 +2682,8 @@

    Running non-interactive batch jobs

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main

    EXAMPLES

    The following are some examples of how you could start GRASS @@ -2589,6 +2708,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -2629,6 +2749,8 @@

    EXAMPLES

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main prompted to choose the appropriate project and mapset. @@ -2654,6 +2776,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD @@ -2722,6 +2845,10 @@

    EXAMPLES

    ======= ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main prompted to choose the appropriate location and mapset. @@ -2749,6 +2876,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -2840,6 +2968,11 @@

    EXAMPLES

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main examples below) otherwise taken from the last GRASS session.
    grass --gtext @@ -2860,6 +2993,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD prompted to choose the appropriate location and mapset. ======= @@ -2902,6 +3036,8 @@

    EXAMPLES

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main prompted to choose the appropriate project and mapset. ======= @@ -2921,6 +3057,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= prompted to choose the appropriate location and mapset. >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -3004,6 +3141,11 @@

    EXAMPLES

    prompted to choose the appropriate location and mapset. >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= + prompted to choose the appropriate location and mapset. +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main
    grass $HOME/grassdata/spearfish70/user1
    Start GRASS using the default user interface and automatically @@ -3028,6 +3170,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3068,6 +3211,8 @@

    EXAMPLES

    ======= >>>>>>> osgeo-main ======= +>>>>>>> osgeo-main +======= >>>>>>> osgeo-main obtain the project and mapset from environment variables. @@ -3092,6 +3237,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD @@ -3160,6 +3306,10 @@

    EXAMPLES

    ======= ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main obtain the location and mapset from environment variables. @@ -3186,6 +3336,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -3276,6 +3427,11 @@

    EXAMPLES

    >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main +======= +>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main East North - SJTSK) with datum transformation parameters used in Czech Republic in the specified GISDBASE @@ -3298,6 +3454,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3339,6 +3496,8 @@

    EXAMPLES

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main
    Creates a new GRASS project from PROJ definition string (here: gnomonic) in the specified GISDBASE @@ -3363,6 +3522,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD @@ -3432,6 +3592,10 @@

    EXAMPLES

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main
    Creates a new GRASS location from PROJ definition string (here: gnomonic) in the specified GISDBASE @@ -3458,6 +3622,7 @@

    EXAMPLES

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -3549,6 +3714,11 @@

    EXAMPLES

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main

    Batch jobs with the exec interface

    @@ -3577,6 +3747,7 @@

    Batch jobs with the exec interface

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Creating a new Location based on a geodata file's projection (-c) ======= <<<<<<< HEAD @@ -3619,6 +3790,8 @@

    Batch jobs with the exec interface

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main Creating a new project based on a geodata file's projection (-c) ======= Creating a new Location based on a geodata file's projection (-c) @@ -3637,6 +3810,7 @@

    Batch jobs with the exec interface

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= Creating a new Location based on a geodata file's projection (-c) >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -3720,6 +3894,11 @@

    Batch jobs with the exec interface

    Creating a new Location based on a geodata file's projection (-c) >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= +Creating a new Location based on a geodata file's projection (-c) +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main and exit (-e) immediately: 
    @@ -3804,6 +3983,7 @@ 
    Execution of shell and Python scripts instead of single commands
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3910,6 +4090,11 @@ 
    Execution of shell and Python scripts instead of single commands
    
 >>>>>>> osgeo-main
 =======
 
+gs.message('Current GRASS GIS environment:')
+=======
+>>>>>>> osgeo-main
+=======
+
 gs.message('Current GRASS GIS environment:')
 =======
 >>>>>>> osgeo-main
@@ -3931,6 +4116,7 @@ 
    Execution of shell and Python scripts instead of single commands
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -3960,6 +4146,8 @@ 
    Execution of shell and Python scripts instead of single commands
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 import grass.script.setup as gsetup
 
 gs.message('Current GRASS GIS 8 environment:')
@@ -3978,6 +4166,7 @@ 
    Execution of shell and Python scripts instead of single commands
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4007,6 +4196,8 @@ 
    Execution of shell and Python scripts instead of single commands
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 gs.message('Current GRASS GIS environment:')
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4024,6 +4215,7 @@ 
    Execution of shell and Python scripts instead of single commands
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4053,6 +4245,8 @@ 
    Execution of shell and Python scripts instead of single commands
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 gs.message('Current GRASS GIS environment:')
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4070,6 +4264,7 @@ 
    Execution of shell and Python scripts instead of single commands
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4124,6 +4319,8 @@ 
    Execution of shell and Python scripts instead of single commands
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 print(gs.gisenv())
 
 gs.message('Available raster maps:')
@@ -4152,6 +4349,7 @@ 
    Execution of shell and Python scripts instead of single commands
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -4193,6 +4391,8 @@ 
    Execution of shell and Python scripts instead of single commands
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
    Using temporary project
    
 
 Creating a new temporary project based on a georeferenced file's
@@ -4216,6 +4416,7 @@ 
    Using temporary project
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
@@ -4285,6 +4486,10 @@ 
    Using temporary project
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
 
    Using temporary location
    
 
 Creating a new temporary location based on a georeferenced file's
@@ -4310,6 +4515,7 @@ 
    Using temporary location
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -4401,6 +4607,11 @@ 
    Using temporary location
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
+=======
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
    The same, but using an EPSG code and a Python script: @@ -4423,6 +4634,7 @@

    Using temporary location

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4464,6 +4676,8 @@

    Using temporary location

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main grass --tmp-project EPSG:3358 --exec test.py @@ -4489,6 +4703,7 @@

    Using temporary location

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD @@ -4558,6 +4773,10 @@

    Using temporary location

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main grass --tmp-location EPSG:3358 --exec test.py @@ -4585,6 +4804,7 @@

    Using temporary location

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) @@ -4676,6 +4896,11 @@

    Using temporary location

    ======= >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) >>>>>>> osgeo-main +======= +>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) +======= +>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) +>>>>>>> osgeo-main so the script is expected to export, link or otherwise preserve the output data before ending. @@ -4698,6 +4923,7 @@

    Using temporary location

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4739,6 +4965,8 @@

    Using temporary location

    >>>>>>> osgeo-main ======= >>>>>>> osgeo-main +======= +>>>>>>> osgeo-main temporary project: 
    @@ -4765,6 +4993,7 @@ 
    Using temporary location
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 <<<<<<< HEAD
@@ -4834,6 +5063,10 @@ 
    Using temporary location
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
 temporary location:
 
 
    @@ -4862,6 +5095,7 @@ 
    Using temporary location
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -4953,6 +5187,11 @@ 
    Using temporary location
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
+=======
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
 
    
 
 
@@ -4977,6 +5216,7 @@ 
    Using temporary mapset
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 location (here using the NC SPM sample location):
 =======
 <<<<<<< HEAD
@@ -5019,6 +5259,8 @@ 
    Using temporary mapset
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 project (here using the NC SPM sample dataset):
 =======
 location (here using the NC SPM sample location):
@@ -5037,6 +5279,7 @@ 
    Using temporary mapset
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 location (here using the NC SPM sample location):
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -5120,6 +5363,11 @@ 
    Using temporary mapset
    
 location (here using the NC SPM sample location):
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+=======
+location (here using the NC SPM sample location):
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
 
 
     grass --tmp-mapset /path/to/grassdata/nc_spm_08/ --exec g.proj -p
@@ -5177,6 +5425,7 @@ 
    Troubleshooting
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5240,6 +5489,8 @@ 
    Troubleshooting
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Importantly, to avoid an "[Errno 8] Exec format error" there must be a
 shebang line at the top of
 the script (like #!/bin/sh, #!/bin/bash, or #!/usr/bin/env python3)
@@ -5260,6 +5511,7 @@ 
    Troubleshooting
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5343,6 +5595,11 @@ 
    Troubleshooting
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
 Importantly, to avoid an "[Errno 8] Exec format error" there must be a 
 shebang line at the top of
 the script (like #!/bin/sh, #!/bin/bash, or #!/usr/bin/env python3)
@@ -5364,6 +5621,7 @@ 
    Troubleshooting
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -5386,6 +5644,8 @@ 
    Troubleshooting
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -5410,6 +5670,7 @@ 
    Troubleshooting
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -5439,6 +5700,8 @@ 
    Troubleshooting
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 Importantly, to avoid an "[Errno 8] Exec format error" there must be a
 shebang line at the top of
 the script (like #!/bin/sh, #!/bin/bash, or #!/usr/bin/env python3)
@@ -5459,6 +5722,7 @@ 
    Troubleshooting
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5525,6 +5789,8 @@ 
    Troubleshooting
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
    CAVEAT
    
 
@@ -5580,6 +5846,7 @@ 
    AUTHORS (of this page)
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5681,6 +5948,11 @@ 
    AUTHORS (of this page)
    
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
 
  cronjob (on grasslxd container): /home/neteler/cronjobs/cron_grass8_main_src_snapshot.sh
@@ -728,6 +764,7 @@ GENERAL TRANSLATION PROCEDURE (no programming required)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -788,6 +825,8 @@ GENERAL TRANSLATION PROCEDURE (no programming required)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	https://www.transifex.com/grass-gis/grass7/dashboard/
 
@@ -807,6 +846,7 @@ GENERAL TRANSLATION PROCEDURE (no programming required)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 08401a0a3a (r.horizon manual - fix typo (#2794))
 =======
@@ -891,6 +931,11 @@ GENERAL TRANSLATION PROCEDURE (no programming required)
     Script: https://github.com/OSGeo/grass-addons/blob/grass8/utils/transifex_merge.sh
 >>>>>>> osgeo-main
 =======
+[4] Updated po files are taken from Transifex and merged into GRASS GIS source repo
+    (MO files are generated when compiling GRASS GIS)
+    Script: https://github.com/OSGeo/grass-addons/blob/grass8/utils/transifex_merge.sh
+>>>>>>> osgeo-main
+=======
 [4] Updated po files are taken from Transifex and merged into GRASS GIS source repo
     (MO files are generated when compiling GRASS GIS)
     Script: https://github.com/OSGeo/grass-addons/blob/grass8/utils/transifex_merge.sh
@@ -918,6 +963,7 @@ Semi-automated procedure:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
      
@@ -968,6 +1014,9 @@ Semi-automated procedure:
 >>>>>>> osgeo-main
 =======
 
+>>>>>>> osgeo-main
+=======
+
 >>>>>>> osgeo-main
         ./configured --with-nls [...further options...]
         make
@@ -991,6 +1040,7 @@ TODO OLD    make update-po  merges new messages into existing *.po files
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
   3. Now translate the messages in the po/*.po files (using kbabel or
 =======
@@ -1040,6 +1090,9 @@ TODO OLD    make update-po  merges new messages into existing *.po files
 =======
   3. Now translate the messages in the po/*.po files (using kbabel or
 >>>>>>> osgeo-main
+=======
+  3. Now translate the messages in the po/*.po files (using kbabel or
+>>>>>>> osgeo-main
 =======
   3. Now translate the messages in the po/*.po files (using kbabel or
 >>>>>>> osgeo-main
@@ -1061,6 +1114,7 @@ TODO OLD    make update-po  merges new messages into existing *.po files
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
       
@@ -1111,6 +1165,9 @@ TODO OLD    make update-po  merges new messages into existing *.po files
 >>>>>>> osgeo-main
 =======
 
+>>>>>>> osgeo-main
+=======
+
 >>>>>>> osgeo-main
         make mo         creates the mo files (containing translated messages as
                         binary file)
@@ -1170,6 +1227,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
     
@@ -1220,6 +1278,9 @@ DETAILED PROCEDURE :
 >>>>>>> osgeo-main
 =======
 
+>>>>>>> osgeo-main
+=======
+
 >>>>>>> osgeo-main
    This will create
     ./templates/grasslibs.pot
@@ -1248,6 +1309,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1269,6 +1331,8 @@ DETAILED PROCEDURE :
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
   3.a) First CASE: Messages have not yet been translated to your language.
@@ -1288,6 +1352,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
        
 =======
@@ -1360,6 +1425,8 @@ DETAILED PROCEDURE :
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
        Move the generated file from the ./template/ directory
        to the ./po/ directory (for example German language):
@@ -1386,6 +1453,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
   3.b) Second CASE: Some messages have already been translated to
 =======
@@ -1435,6 +1503,9 @@ DETAILED PROCEDURE :
 =======
   3.b) Second CASE: Some messages have already been translated to
 >>>>>>> osgeo-main
+=======
+  3.b) Second CASE: Some messages have already been translated to
+>>>>>>> osgeo-main
 =======
   3.b) Second CASE: Some messages have already been translated to
 >>>>>>> osgeo-main
@@ -1457,6 +1528,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1478,6 +1550,8 @@ DETAILED PROCEDURE :
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
        First we have to merge new messages into existing .po files
        (which contain already translated messages) as new messages
@@ -1500,6 +1574,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
        First we have to merge new messages into existing .po files 
 =======
@@ -1582,6 +1657,8 @@ DETAILED PROCEDURE :
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 4. TRANSLATE MESSAGES
 
@@ -1601,6 +1678,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
    
@@ -1651,6 +1729,9 @@ DETAILED PROCEDURE :
 >>>>>>> osgeo-main
 =======
 
+>>>>>>> osgeo-main
+=======
+
 >>>>>>> osgeo-main
    Run 'kbabel' or equivalent program
     kbabel ./po/grasslibs_.po
@@ -1682,6 +1763,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1703,6 +1785,8 @@ DETAILED PROCEDURE :
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
    * Pay attention to keep '%s', '\n' and other stuff also
      in the translated messages!
@@ -1723,6 +1807,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
    * Pay attention to keep '%s', '\n' and other stuff also 
 =======
@@ -1799,6 +1884,8 @@ DETAILED PROCEDURE :
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 5. CREATE MO FILES
 
    run
@@ -1836,6 +1923,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1857,6 +1945,8 @@ DETAILED PROCEDURE :
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
    git diff file.c > file.diff
@@ -1874,6 +1964,7 @@ DETAILED PROCEDURE :
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
    
 =======
@@ -1941,6 +2032,8 @@ DETAILED PROCEDURE :
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 PLEASE HELP TO TRANSLATE GRASS MESSAGES!
 
 ----------------------------------------------
diff --git a/locale/po/grasslibs_cs.po b/locale/po/grasslibs_cs.po
index 4a2c94069d4..a1b0943bda4 100644
--- a/locale/po/grasslibs_cs.po
+++ b/locale/po/grasslibs_cs.po
@@ -3759,6 +3759,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3800,6 +3801,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset.c:38
 msgid "MAPSET is not set"
 msgstr "MAPSET není nastaven"
@@ -4027,6 +4030,7 @@ msgstr "<%s> v mapsetu <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -4075,6 +4079,9 @@ msgstr "<%s> v mapsetu <%s>"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -4234,6 +4241,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4271,6 +4279,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
 msgstr ""
@@ -9558,6 +9568,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -9649,6 +9660,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:467
 msgid "Cannot add network arc representing turn."
@@ -12142,6 +12158,7 @@ msgstr "[%s]: Neznámá barva"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12230,6 +12247,8 @@ msgstr "Svrchní hodnota musí být větší, než spodní."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 #~ msgid "Datum <%s> not recognised by GRASS and no parameters found"
 #~ msgstr ""
@@ -12442,6 +12461,7 @@ msgstr "Svrchní hodnota musí být větší, než spodní."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -12471,6 +12491,8 @@ msgstr "Svrchní hodnota musí být větší, než spodní."
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "jenž chybí."
 
@@ -12537,6 +12559,7 @@ msgstr "Svrchní hodnota musí být větší, než spodní."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12579,5 +12602,7 @@ msgstr "Svrchní hodnota musí být větší, než spodní."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to open header file for raster map <%s@%s>"
 msgstr "Nelze otevřít hlavičkový soubor rastrové mapy <%s@%s>"
diff --git a/locale/po/grasslibs_de.po b/locale/po/grasslibs_de.po
index 1d818c41d85..fd20cee3a81 100644
--- a/locale/po/grasslibs_de.po
+++ b/locale/po/grasslibs_de.po
@@ -26,6 +26,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -98,6 +99,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+"POT-Creation-Date: 2024-05-23 03:37-0600\n"
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 "PO-Revision-Date: 2023-11-04 10:23+0000\n"
@@ -121,6 +127,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -212,6 +219,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Last-Translator: Markus \n"
 "Language-Team: German \n"
@@ -237,6 +249,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -278,6 +291,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "X-Generator: Weblate 5.0\n"
 
 #: ../lib/nviz/render.c:43
@@ -296,6 +311,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -365,6 +381,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "X-Generator: Weblate 4.12.2\n"
 
 #: ../lib/init/grass.py:209
@@ -975,6 +995,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1066,6 +1087,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/nviz/render.c:186
 msgid "Unable to get visual info"
@@ -1112,6 +1138,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1147,6 +1174,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to set current context (CGL error = %d)"
 msgstr ""
 =======
@@ -1166,6 +1195,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1217,6 +1247,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "There are classbreaks outside the range min-max. Number of classes reduced "
 "to %i, but using probabilities for %i classes."
@@ -1240,6 +1272,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1331,6 +1364,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/nviz/render.c:390
 #, c-format
@@ -3224,6 +3262,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3315,6 +3354,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/parser.c:566
 msgid "Use either --quiet or --verbose flag, not both. Assuming --quiet."
@@ -3505,6 +3549,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3540,6 +3585,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "G__open(read): mapset <%s> doesn't match xmapset <%s>"
 msgstr "G__open(read): mapset <%s> passt nicht zu xmapset <%s>."
 =======
@@ -3559,6 +3606,7 @@ msgstr "G__open(read): mapset <%s> passt nicht zu xmapset <%s>."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3610,6 +3658,8 @@ msgstr "G__open(read): mapset <%s> passt nicht zu xmapset <%s>."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Module built against version %s but trying to use version %s. You need to "
 "rebuild GRASS GIS or untangle multiple installations."
@@ -3634,6 +3684,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3725,6 +3776,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/open.c:90
 #, c-format
@@ -4707,6 +4763,7 @@ msgstr "Datenbank Schema"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4798,6 +4855,11 @@ msgstr "Datenbank Schema"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Do not use this option if schemas are not supported by driver/database server"
 msgstr ""
@@ -4964,6 +5026,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5055,6 +5118,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Number of digits used as mantissa in the internal map storage, 0 -23 for "
 "float, 0 - 52 for double, max or default"
@@ -5085,6 +5153,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5176,6 +5245,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The dimensions of the tiles used in the output raster3d map (XxYxZ or "
 "default: 16x16x8)"
@@ -5441,6 +5515,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5532,6 +5607,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "WHERE conditions of SQL statement without 'where' keyword used in the "
 "temporal GIS framework"
@@ -5719,6 +5799,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5810,6 +5891,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/gis/rd_cellhd.c:219
@@ -5872,6 +5958,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5901,6 +5988,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 #: ../lib/imagery/iscatt_core.c:817
 msgid "Corrupted category raster conditions file (fseek failed)"
@@ -5936,6 +6025,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5995,6 +6085,9 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Kann die Signatur-Datei <%s> für die Untergruppe <%s> der Gruppe <%s> - <%s> "
 "nicht erstellen, da es nicht im aktuellen Mapset ist."
 
@@ -6208,6 +6301,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Neither %s (managed by d.mon command) nor %s (used for direct rendering) "
 "defined"
@@ -6577,6 +6671,11 @@ msgid "Unable to open %s for writing"
 msgstr "Kann %s nicht zum Schreiben öffnen."
 =======
 >>>>>>> osgeo-main
+=======
+msgid "Unable to open %s for writing"
+msgstr "Kann %s nicht zum Schreiben öffnen."
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Neither %s (managed by d.mon command) nor %s (used for direct rendering) "
 "defined"
@@ -6596,6 +6695,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6632,6 +6732,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
 #: ../lib/gis/view.c:254 ../lib/gis/view.c:471
@@ -6682,6 +6784,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -6751,6 +6854,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "\n"
 "++ Führe Tests für ccmath wrapper aus ++"
 
@@ -7008,6 +7115,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -7049,6 +7157,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/timestamp.c:525
 #, c-format
 msgid "Unable to create timestamp file for vector map <%s@%s>"
@@ -7121,6 +7231,7 @@ msgstr "Variable '%s' nicht gesetzt"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -7169,6 +7280,9 @@ msgstr "Variable '%s' nicht gesetzt"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -7188,6 +7302,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7225,6 +7340,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
 msgstr ""
@@ -7287,6 +7404,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7378,6 +7496,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/gis/mapset_msc.c:223
@@ -7399,6 +7522,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Your GRASS version does not fully support topology format %d.%d of the "
 "vector. Consider to rebuild topology or upgrade GRASS."
@@ -7443,6 +7567,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to make mapset element %s (%s): %s"
 msgstr "Kann das Mapset Element %s (%s) nicht erzeugen: %s."
 
@@ -7473,6 +7599,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7502,6 +7629,8 @@ msgid ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid ""
 "Your GRASS version does not fully support topology format %d.%d of the "
 "vector. Consider to rebuild topology or upgrade GRASS."
@@ -7520,6 +7649,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7562,6 +7692,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/gis/cmprzlib.c:199
@@ -7583,6 +7715,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Old topology format version %d.%d is not supported by this release. Try to "
 "rebuild topology using v.build or v.build.all module."
@@ -7627,6 +7760,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "ZLIB decompression error %d: %s"
 =======
 msgid ""
@@ -7647,6 +7782,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7676,6 +7812,8 @@ msgid ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid ""
 "Old topology format version %d.%d is not supported by this release. Try to "
 "rebuild topology using v.build or v.build.all module."
@@ -7694,6 +7832,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7736,6 +7875,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/gis/mapset.c:38
@@ -7771,6 +7912,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -7806,6 +7948,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "gettimeofday failed: %s"
 msgstr "gettimeofday fehlgeschlagen: %s"
 =======
@@ -7825,6 +7969,7 @@ msgstr "gettimeofday fehlgeschlagen: %s"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7876,6 +8021,8 @@ msgstr "gettimeofday fehlgeschlagen: %s"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Attempt to read line angle for the line which is not connected to the node: "
 "node %d, line %d"
@@ -7899,6 +8046,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7990,6 +8138,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/lrand48.c:121
 msgid "Pseudo-random number generator not seeded"
@@ -8289,6 +8442,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -8330,6 +8484,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Das Module wurde mit Version %s gebaut, aber versucht Version %s zu "
 "verwenden. Sie müssen GRASS erneut bauen oder verschiedene Installationen "
 "entwirren."
@@ -8350,6 +8506,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -8419,6 +8576,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "\n"
 "++ Führe grundlegende Tests aus ++"
 
@@ -9344,6 +9505,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "%d features without category skipped. To export also features without "
 "category use '%s=-1'."
@@ -9423,6 +9585,11 @@ msgid ""
 "%d features without category skipped. To export also features without "
 "category use '%s=-1'."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"%d features without category skipped. To export also features without "
+"category use '%s=-1'."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/intersect2.c:1260 ../lib/vector/Vlib/intersect2.c:1266
@@ -9447,6 +9614,7 @@ msgid "Error while adding point to array. Out of memory"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Fehler beim Hinzufügen eines Punktes zum Array. Nicht genügend "
 "Arbeitsspeicher."
@@ -9526,6 +9694,11 @@ msgstr ""
 "Fehler beim Hinzufügen eines Punktes zum Array. Nicht genügend "
 "Arbeitsspeicher."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Fehler beim Hinzufügen eines Punktes zum Array. Nicht genügend "
+"Arbeitsspeicher."
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/close.c:91
 #, c-format
@@ -9630,6 +9803,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "More DB links defined for input vector map. Using only first DB link for "
 "output."
@@ -9709,6 +9883,11 @@ msgid ""
 "More DB links defined for input vector map. Using only first DB link for "
 "output."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"More DB links defined for input vector map. Using only first DB link for "
+"output."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/field.c:290
@@ -9774,6 +9953,7 @@ msgstr "Kann den OGR DBMI-Treiber nicht öffnen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -9802,6 +9982,8 @@ msgstr "Kann den OGR DBMI-Treiber nicht öffnen."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "All FID tests failed. Neither 'FID' nor 'ogc_fid' nor 'ogr_fid' nor 'gid' "
 "available in OGR DB table"
@@ -9820,6 +10002,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -9843,6 +10026,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/field.c:885
 #, c-format
@@ -9858,6 +10043,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -9919,6 +10105,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/field.c:905
@@ -9950,6 +10138,7 @@ msgid "Bug: attempt to update map which is not in current mapset"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Bug: Versuch eine Karte zu aktualisieren, die nicht im aktuellen Mapset ist."
 =======
@@ -10015,6 +10204,10 @@ msgstr ""
 msgstr ""
 "Bug: Versuch eine Karte zu aktualisieren, die nicht im aktuellen Mapset ist."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Bug: Versuch eine Karte zu aktualisieren, die nicht im aktuellen Mapset ist."
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/bridges.c:213
 #, c-format
@@ -10088,6 +10281,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Connection to PostgreSQL database failed. Try to set up username/password by "
 "db.login."
@@ -10167,6 +10361,11 @@ msgid ""
 "Connection to PostgreSQL database failed. Try to set up username/password by "
 "db.login."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Connection to PostgreSQL database failed. Try to set up username/password by "
+"db.login."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/open_pg.c:566
@@ -10268,6 +10467,7 @@ msgid "Changed"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr "Geändert"
 =======
 msgstr ""
@@ -10319,6 +10519,9 @@ msgstr "Geändert"
 =======
 msgstr "Geändert"
 >>>>>>> osgeo-main
+=======
+msgstr "Geändert"
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/dangles.c:151
 msgid "Removed"
@@ -10455,6 +10658,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -10483,6 +10687,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Feature index format version %d.%d is not supported by this release. Try to "
 "rebuild topology or upgrade GRASS."
@@ -10501,6 +10707,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -10524,6 +10731,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/open_ogr.c:289
 #, c-format
@@ -10544,6 +10753,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -10613,6 +10823,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/read.c:25 ../lib/vector/Vlib/write.c:30
 #: ../lib/vector/Vlib/write.c:36 ../lib/vector/Vlib/write.c:42
@@ -10767,6 +10979,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -10795,6 +11008,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Vector map which is not in the current mapset cannot be opened for update"
 msgstr ""
@@ -10812,6 +11027,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10855,6 +11071,8 @@ msgstr "Eine Karte, die sich nicht im aktuellen Mapset befindet, kann nicht zum
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/open.c:311
 #, c-format
@@ -10887,6 +11105,7 @@ msgstr "Kann die Kategorieindex-Datei der Vektorkarte <%s> nicht öffnen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to open vector map <%s> on level %d. Try to rebuild vector topology "
 "with v.build."
@@ -10966,6 +11185,11 @@ msgid ""
 "Unable to open vector map <%s> on level %d. Try to rebuild vector topology "
 "with v.build."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to open vector map <%s> on level %d. Try to rebuild vector topology "
+"with v.build."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/open.c:445
@@ -11041,6 +11265,7 @@ msgid "Size of 'coor' file differs from value saved in topology file"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Größe der 'coor' Datei unterscheidet sich von dem in der Topologie-Datei "
 "gespeicherten Wert."
@@ -11120,6 +11345,11 @@ msgstr ""
 "Größe der 'coor' Datei unterscheidet sich von dem in der Topologie-Datei "
 "gespeicherten Wert."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Größe der 'coor' Datei unterscheidet sich von dem in der Topologie-Datei "
+"gespeicherten Wert."
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/open.c:1149 ../lib/vector/Vlib/open.c:1248
 #, c-format
@@ -11160,6 +11390,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "There exists more than one point on node <%d> with unique category in field  "
 "<%d>.\n"
 =======
@@ -11225,6 +11456,10 @@ msgid ""
 "There exists more than one point on node <%d> with unique category in field  "
 "<%d>.\n"
 >>>>>>> osgeo-main
+=======
+"There exists more than one point on node <%d> with unique category in field  "
+"<%d>.\n"
+>>>>>>> osgeo-main
 "The unique category layer may not be valid."
 msgstr ""
 
@@ -11346,6 +11581,7 @@ msgid "Illegal vector map name <%s>. May not contain '.' or 'NULL'."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Ungültiger Name der Vektorkarte <%s>. Darf nicht '.' oder 'NULL' enthalten."
 =======
@@ -11411,6 +11647,10 @@ msgstr ""
 msgstr ""
 "Ungültiger Name der Vektorkarte <%s>. Darf nicht '.' oder 'NULL' enthalten."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Ungültiger Name der Vektorkarte <%s>. Darf nicht '.' oder 'NULL' enthalten."
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/legal_vname.c:50
 #, c-format
@@ -11429,6 +11669,7 @@ msgid "Illegal vector map name <%s>. Must start with a letter."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Ungültiger Name der Vektorkarte <%s>. Muss mit einem Buchstaben beginnen."
 =======
@@ -11494,6 +11735,10 @@ msgstr ""
 msgstr ""
 "Ungültiger Name der Vektorkarte <%s>. Muss mit einem Buchstaben beginnen."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Ungültiger Name der Vektorkarte <%s>. Muss mit einem Buchstaben beginnen."
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/legal_vname.c:58
 #, c-format
@@ -11516,6 +11761,7 @@ msgstr "Ungültiger Name der Vektorkarte <%s>. Zeichen '%c' ist nicht erlaubt."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -11544,6 +11790,8 @@ msgstr "Ungültiger Name der Vektorkarte <%s>. Zeichen '%c' ist nicht erlaubt."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Illegal vector map name <%s>. SQL keyword cannot be used as vector map name."
 msgstr ""
@@ -11561,6 +11809,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -11604,6 +11853,8 @@ msgstr "Ungültiger Name der Vektorkarte <%s>. SQL-Schlüsselwort darf nicht als
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/legal_vname.c:100 ../lib/vector/Vlib/legal_vname.c:104
 #, c-format
@@ -11676,6 +11927,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Requesting invalid feature from cache (%d). Number of features in cache: %d"
 =======
@@ -11741,6 +11993,10 @@ msgid ""
 msgid ""
 "Requesting invalid feature from cache (%d). Number of features in cache: %d"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Requesting invalid feature from cache (%d). Number of features in cache: %d"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/read_pg.c:368
@@ -11859,6 +12115,7 @@ msgid "Unable to convert category string '%s' (from '%s') to category range"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Kann die Kategorie-Zeichenkette '%s' (von '%s') nicht in eine "
 "Kategoriespanne konvertieren."
@@ -11938,6 +12195,11 @@ msgstr ""
 "Kann die Kategorie-Zeichenkette '%s' (von '%s') nicht in eine "
 "Kategoriespanne konvertieren."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Kann die Kategorie-Zeichenkette '%s' (von '%s') nicht in eine "
+"Kategoriespanne konvertieren."
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/cats.c:572 ../lib/vector/Vlib/cats.c:673
 msgid "Layer number must be > 0 for category constraints"
@@ -12191,6 +12453,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -12213,6 +12476,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to rewrite feature/offset %"
 msgstr ""
 
@@ -12229,6 +12494,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -12296,6 +12562,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/write.c:299
 msgid "Unable to restore feature/offset %"
@@ -12361,6 +12629,7 @@ msgid "Data type of column <%s> not supported (must be numeric)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Spaltentyp der Spalte <%s> wird nicht unterstützt (muss numerisch sein)."
 =======
@@ -12426,6 +12695,10 @@ msgstr ""
 msgstr ""
 "Spaltentyp der Spalte <%s> wird nicht unterstützt (muss numerisch sein)."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Spaltentyp der Spalte <%s> wird nicht unterstützt (muss numerisch sein)."
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:202 ../lib/vector/Vlib/net_build.c:967
 msgid "Setting node costs..."
@@ -12448,6 +12721,7 @@ msgid "Database record for node %d (cat = %d) not found (cost set to 0)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Datenbankeintrag für Knoten %d (cat = %d) nicht gefunden (Kosten auf 0 "
 "gesetzt)."
@@ -12527,6 +12801,11 @@ msgstr ""
 "Datenbankeintrag für Knoten %d (cat = %d) nicht gefunden (Kosten auf 0 "
 "gesetzt)."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Datenbankeintrag für Knoten %d (cat = %d) nicht gefunden (Kosten auf 0 "
+"gesetzt)."
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:332 ../lib/vector/Vlib/net_build.c:352
 msgid "Cannot add network arc for virtual node connection."
@@ -12549,6 +12828,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -12577,6 +12857,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "There exists more than one point of node <%d> with unique category field  <"
 "%d>.\n"
 "The unique categories layer is not valid therefore you will probably get "
@@ -12593,6 +12875,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12636,6 +12919,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/net_build.c:393
@@ -12656,6 +12941,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -12678,6 +12964,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Unable to find point representing intersection <%d> in unique categories "
 "field <%d>.\n"
 "Cost for the intersection was set to 0.\n"
@@ -12693,6 +12981,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "Unable to find point representing intersection <%d> in unique categories field <%d>.\n"
 "Cost for the intersection was set to 0.\n"
@@ -12751,6 +13040,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/net_build.c:407
@@ -12771,6 +13062,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -12793,6 +13085,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Unable to find node for point representing intersection <%d> in unique "
 "categories field <%d>.\n"
 "Cost for the intersection was set to 0.\n"
@@ -12808,6 +13102,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "Unable to find node for point representing intersection <%d> in unique categories field <%d>.\n"
 "Cost for the intersection was set to 0.\n"
@@ -12866,6 +13161,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/net_build.c:432
@@ -12884,6 +13181,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Database record for turn with cat = %d in not found. (The turn was skipped."
 =======
@@ -12949,6 +13247,10 @@ msgid ""
 msgid ""
 "Database record for turn with cat = %d in not found. (The turn was skipped."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Database record for turn with cat = %d in not found. (The turn was skipped."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/net_build.c:465
@@ -12981,6 +13283,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "The unique categories layer is not valid therefore you will probably get "
 "incorrect results."
 =======
@@ -13046,6 +13349,10 @@ msgid ""
 "The unique categories layer is not valid therefore you will probably get "
 "incorrect results."
 >>>>>>> osgeo-main
+=======
+"The unique categories layer is not valid therefore you will probably get "
+"incorrect results."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/net_build.c:579
@@ -13064,6 +13371,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Database record for line %d (cat = %d, forward/both direction(s)) not found "
 "(cost was set to 0)"
@@ -13143,6 +13451,11 @@ msgid ""
 "Database record for line %d (cat = %d, forward/both direction(s)) not found "
 "(cost was set to 0)"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Database record for line %d (cat = %d, forward/both direction(s)) not found "
+"(cost was set to 0)"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/net_build.c:596
@@ -13161,6 +13474,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Database record for line %d (cat = %d, backword direction) not found(cost "
 "was set to 0)"
@@ -13240,6 +13554,11 @@ msgid ""
 "Database record for line %d (cat = %d, backword direction) not found(cost "
 "was set to 0)"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Database record for line %d (cat = %d, backword direction) not found(cost "
+"was set to 0)"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/net_build.c:658 ../lib/vector/Vlib/net_build.c:1064
@@ -13266,6 +13585,7 @@ msgstr "Graph wurde erstellt."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -13294,6 +13614,8 @@ msgstr "Graph wurde erstellt."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Database record for line %d (cat = %d, forward/both direction(s)) not found "
 "(forward/both direction(s) of line skipped)"
@@ -13312,6 +13634,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -13335,6 +13658,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:888
 #, c-format
@@ -13354,6 +13679,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -13422,6 +13748,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:937
 msgid "Cannot add network arc"
@@ -13485,6 +13813,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Random read is not supported by OGR for this layer. Unable to build topology."
 =======
@@ -13550,6 +13879,10 @@ msgid ""
 msgid ""
 "Random read is not supported by OGR for this layer. Unable to build topology."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Random read is not supported by OGR for this layer. Unable to build topology."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/build_ogr.c:95 ../lib/vector/Vlib/build_pg.c:101
@@ -13651,6 +13984,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to build simple features from topogeometry data. Unsupported type %d."
 =======
@@ -13716,6 +14050,10 @@ msgid ""
 msgid ""
 "Unable to build simple features from topogeometry data. Unsupported type %d."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to build simple features from topogeometry data. Unsupported type %d."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/break_polygons.c:102
@@ -13788,6 +14126,7 @@ msgid "Vect_segment_intersection() ERROR (collinear non vertical segments)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Vect_segment_intersection() FEHLER (kollineare nicht vertikale Segmente)"
 =======
@@ -13853,6 +14192,10 @@ msgstr ""
 msgstr ""
 "Vect_segment_intersection() FEHLER (kollineare nicht vertikale Segmente)"
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Vect_segment_intersection() FEHLER (kollineare nicht vertikale Segmente)"
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/select.c:116
 #, c-format
@@ -13900,6 +14243,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Cairo: input mask file has incorrect dimensions: expected: %dx%d got: %dx%d"
 =======
@@ -13965,6 +14309,10 @@ msgid ""
 msgid ""
 "Cairo: input mask file has incorrect dimensions: expected: %dx%d got: %dx%d"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Cairo: input mask file has incorrect dimensions: expected: %dx%d got: %dx%d"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/cairodriver/read_bmp.c:96
@@ -14133,6 +14481,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "DB connection <%s/%s> already exists. Re-run '%s' with '--%s' flag to "
 "overwrite existing settings."
@@ -14212,6 +14561,11 @@ msgid ""
 "DB connection <%s/%s> already exists. Re-run '%s' with '--%s' flag to "
 "overwrite existing settings."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"DB connection <%s/%s> already exists. Re-run '%s' with '--%s' flag to "
+"overwrite existing settings."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/db/dbmi_base/test/test_main.c:83
@@ -14237,6 +14591,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "\n"
 "++ Führe Tests für Spalten aus ++"
 =======
@@ -14299,6 +14654,10 @@ msgstr ""
 "\n"
 "++ Führe Tests für Spalten aus ++"
 >>>>>>> osgeo-main
+=======
+"\n"
+"++ Führe Tests für Spalten aus ++"
+>>>>>>> osgeo-main
 
 #: ../lib/db/dbmi_base/test/test_columns.c:42
 msgid ""
@@ -14331,6 +14690,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "\n"
 "++ Teste das Kopieren von Spalten ++"
 =======
@@ -14393,6 +14753,10 @@ msgstr ""
 "\n"
 "++ Teste das Kopieren von Spalten ++"
 >>>>>>> osgeo-main
+=======
+"\n"
+"++ Teste das Kopieren von Spalten ++"
+>>>>>>> osgeo-main
 
 #: ../lib/db/dbmi_base/test/test_columns.c:150
 msgid ""
@@ -14413,6 +14777,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "\n"
 "++ Tests für das Kopieren von Spalten beendet ++"
 =======
@@ -14475,6 +14840,10 @@ msgstr ""
 "\n"
 "++ Tests für das Kopieren von Spalten beendet ++"
 >>>>>>> osgeo-main
+=======
+"\n"
+"++ Tests für das Kopieren von Spalten beendet ++"
+>>>>>>> osgeo-main
 
 #: ../lib/db/dbmi_base/test/test_table.c:38
 msgid ""
@@ -14495,6 +14864,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "\n"
 "++ Führe Tests für Tabellen aus ++"
 =======
@@ -14557,6 +14927,10 @@ msgstr ""
 "\n"
 "++ Führe Tests für Tabellen aus ++"
 >>>>>>> osgeo-main
+=======
+"\n"
+"++ Führe Tests für Tabellen aus ++"
+>>>>>>> osgeo-main
 
 #: ../lib/db/dbmi_base/test/test_table.c:43
 msgid ""
@@ -14677,6 +15051,7 @@ msgstr "Kann die Symbol-Linien-Koordinaten %s nicht lesen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -14705,6 +15080,8 @@ msgstr "Kann die Symbol-Linien-Koordinaten %s nicht lesen."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Incorrect symbol name: '%s' (should be: group/name or group/name@mapset)"
 msgstr ""
@@ -14721,6 +15098,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14764,6 +15142,8 @@ msgstr "Falscher Symbolname: '%s' (sollte sein: Gruppe/Name oder Gruppe/Name@Map
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/symbol/read.c:284
 #, c-format
@@ -14885,6 +15265,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Map <{}> not found in current mapset"
 msgstr "Karte <{}> nicht im aktuellen Mapset <%s> gefunden."
 =======
@@ -14956,6 +15337,10 @@ msgstr "Karte <{}> nicht im aktuellen Mapset <%s> gefunden."
 msgid "Map <{}> not found in current mapset"
 msgstr "Karte <{}> nicht im aktuellen Mapset <%s> gefunden."
 >>>>>>> osgeo-main
+=======
+msgid "Map <{}> not found in current mapset"
+msgstr "Karte <{}> nicht im aktuellen Mapset <%s> gefunden."
+>>>>>>> osgeo-main
 
 #: ../lib/python/pygrass/vector/table.py:1042
 #, python-format
@@ -15075,6 +15460,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -15097,6 +15483,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Projections are different. Unable to compute overlapping_2d for spatial "
 "extents"
@@ -15126,6 +15514,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgid "Projections are different. Unable to compute overlapping_2d for spatial extents"
 =======
@@ -15232,6 +15621,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/spatial_extent.py:835
@@ -15292,6 +15683,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Start time must be of type datetime for %(type)s map <%(id)s> with layer: "
 "%(l)s"
@@ -15371,6 +15763,11 @@ msgid ""
 "Start time must be of type datetime for %(type)s map <%(id)s> with layer: "
 "%(l)s"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Start time must be of type datetime for %(type)s map <%(id)s> with layer: "
+"%(l)s"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:357
@@ -15394,6 +15791,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "End time must be of type datetime for %(type)s map <%(id)s> with layer: %(l)s"
 =======
@@ -15459,6 +15857,10 @@ msgid ""
 msgid ""
 "End time must be of type datetime for %(type)s map <%(id)s> with layer: %(l)s"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"End time must be of type datetime for %(type)s map <%(id)s> with layer: %(l)s"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:372
@@ -15482,6 +15884,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "End time must be greater than start time for %(type)s map <%(id)s> with "
 "layer: %(l)s"
@@ -15561,6 +15964,11 @@ msgid ""
 "End time must be greater than start time for %(type)s map <%(id)s> with "
 "layer: %(l)s"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"End time must be greater than start time for %(type)s map <%(id)s> with "
+"layer: %(l)s"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:389
@@ -15589,6 +15997,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to update dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
@@ -15668,6 +16077,11 @@ msgid ""
 "Unable to update dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to update dataset <%(ds)s> of type %(type)s in the temporal database. "
+"The mapset of the dataset does not match the current mapset"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:460
@@ -15686,6 +16100,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unsupported relative time unit type for %(type)s map <%(id)s> with layer "
 "%(l)s: %(u)s"
@@ -15765,6 +16180,11 @@ msgid ""
 "Unsupported relative time unit type for %(type)s map <%(id)s> with layer "
 "%(l)s: %(u)s"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unsupported relative time unit type for %(type)s map <%(id)s> with layer "
+"%(l)s: %(u)s"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:467
@@ -15788,6 +16208,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "End time must be greater than start time for %(typ)s map <%(id)s> with layer "
 "%(l)s"
@@ -15867,6 +16288,11 @@ msgid ""
 "End time must be greater than start time for %(typ)s map <%(id)s> with layer "
 "%(l)s"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"End time must be greater than start time for %(typ)s map <%(id)s> with layer "
+"%(l)s"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:800
@@ -15885,6 +16311,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Map <%(id)s> with layer %(layer)s has incorrect time interval, start time is "
 "greater than end time"
@@ -15964,6 +16391,11 @@ msgid ""
 "Map <%(id)s> with layer %(layer)s has incorrect time interval, start time is "
 "greater than end time"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Map <%(id)s> with layer %(layer)s has incorrect time interval, start time is "
+"greater than end time"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:806
@@ -15982,6 +16414,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Map <%s> has incorrect time interval, start time is greater than end time"
 =======
@@ -16047,6 +16480,10 @@ msgid ""
 msgid ""
 "Map <%s> has incorrect time interval, start time is greater than end time"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Map <%s> has incorrect time interval, start time is greater than end time"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:812
@@ -16071,6 +16508,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to delete dataset <%(ds)s> of type %(type)s from the temporal "
 "database. The mapset of the dataset does not match the current mapset"
@@ -16150,6 +16588,11 @@ msgid ""
 "Unable to delete dataset <%(ds)s> of type %(type)s from the temporal "
 "database. The mapset of the dataset does not match the current mapset"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to delete dataset <%(ds)s> of type %(type)s from the temporal "
+"database. The mapset of the dataset does not match the current mapset"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:859
@@ -16173,6 +16616,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to unregister dataset <%(ds)s> of type %(type)s from the temporal "
 "database. The mapset of the dataset does not match the current mapset"
@@ -16252,6 +16696,11 @@ msgid ""
 "Unable to unregister dataset <%(ds)s> of type %(type)s from the temporal "
 "database. The mapset of the dataset does not match the current mapset"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to unregister dataset <%(ds)s> of type %(type)s from the temporal "
+"database. The mapset of the dataset does not match the current mapset"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_map_dataset.py:1074
@@ -16289,6 +16738,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -16311,6 +16761,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Illegal dataset name <{}>. Character '.' not allowed."
 msgstr "Ungültiger Datensatz-Name <{}>. Zeichen '.' ist nicht erlaubt."
 
@@ -16329,6 +16781,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -16402,6 +16855,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/open_stds.py:169
@@ -16420,6 +16875,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Overwriting space time %(sp)s dataset <%(name)s> and unregistering all maps"
 =======
@@ -16485,6 +16941,10 @@ msgid ""
 msgid ""
 "Overwriting space time %(sp)s dataset <%(name)s> and unregistering all maps"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Overwriting space time %(sp)s dataset <%(name)s> and unregistering all maps"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/open_stds.py:177
@@ -16509,6 +16969,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Map <%s> is already in temporal database, use overwrite flag to overwrite"
 =======
@@ -16574,6 +17035,10 @@ msgid ""
 msgid ""
 "Map <%s> is already in temporal database, use overwrite flag to overwrite"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Map <%s> is already in temporal database, use overwrite flag to overwrite"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/stds_export.py:105
@@ -16656,6 +17121,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -16678,6 +17144,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Space time %(sp)s dataset <%(name)s> with relative time found, but no "
 "relative unit set for %(sp)s maps"
@@ -16696,6 +17164,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -16765,6 +17234,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/register.py:196
@@ -16796,6 +17267,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to register %(t)s map <%(id)s> with layer %(l)s. The map has "
 "timestamp and the start time is not set."
@@ -16875,6 +17347,11 @@ msgid ""
 "Unable to register %(t)s map <%(id)s> with layer %(l)s. The map has "
 "timestamp and the start time is not set."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to register %(t)s map <%(id)s> with layer %(l)s. The map has "
+"timestamp and the start time is not set."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/register.py:244
@@ -16893,6 +17370,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to register %(t)s map <%(id)s>. The map has no timestamp and the "
 "start time is not set."
@@ -16972,6 +17450,11 @@ msgid ""
 "Unable to register %(t)s map <%(id)s>. The map has no timestamp and the "
 "start time is not set."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to register %(t)s map <%(id)s>. The map has no timestamp and the "
+"start time is not set."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/register.py:252
@@ -17000,6 +17483,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Map is already registered in temporal database. Unable to update %(t)s map <"
 "%(id)s> with layer %(l)s. Overwrite flag is not set."
@@ -17079,6 +17563,11 @@ msgid ""
 "Map is already registered in temporal database. Unable to update %(t)s map <"
 "%(id)s> with layer %(l)s. Overwrite flag is not set."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Map is already registered in temporal database. Unable to update %(t)s map <"
+"%(id)s> with layer %(l)s. Overwrite flag is not set."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/register.py:275
@@ -17097,6 +17586,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Map is already registered in temporal database. Unable to update %(t)s map <"
 "%(id)s>. Overwrite flag is not set."
@@ -17176,6 +17666,11 @@ msgid ""
 "Map is already registered in temporal database. Unable to update %(t)s map <"
 "%(id)s>. Overwrite flag is not set."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Map is already registered in temporal database. Unable to update %(t)s map <"
+"%(id)s>. Overwrite flag is not set."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/register.py:299
@@ -17194,6 +17689,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to update %(t)s map <%(id)s> with layer %(l)s. The temporal types are "
 "different."
@@ -17273,6 +17769,11 @@ msgid ""
 "Unable to update %(t)s map <%(id)s> with layer %(l)s. The temporal types are "
 "different."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to update %(t)s map <%(id)s> with layer %(l)s. The temporal types are "
+"different."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/register.py:305
@@ -17319,6 +17820,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Set absolute valid time for map <%(id)s> with layer %(layer)s to %(start)s - "
 "%(end)s"
@@ -17398,6 +17900,11 @@ msgid ""
 "Set absolute valid time for map <%(id)s> with layer %(layer)s to %(start)s - "
 "%(end)s"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Set absolute valid time for map <%(id)s> with layer %(layer)s to %(start)s - "
+"%(end)s"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/register.py:460
@@ -17421,6 +17928,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Set relative valid time for map <%s> with layer %s to %i - %s with unit %s"
 =======
@@ -17486,6 +17994,10 @@ msgid ""
 msgid ""
 "Set relative valid time for map <%s> with layer %s to %i - %s with unit %s"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Set relative valid time for map <%s> with layer %s to %i - %s with unit %s"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/register.py:482
@@ -17546,6 +18058,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to shift dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
@@ -17625,6 +18138,11 @@ msgid ""
 "Unable to shift dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to shift dataset <%(ds)s> of type %(type)s in the temporal database. "
+"The mapset of the dataset does not match the current mapset"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:1704
@@ -17649,6 +18167,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to snap dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
@@ -17728,6 +18247,11 @@ msgid ""
 "Unable to snap dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to snap dataset <%(ds)s> of type %(type)s in the temporal database. "
+"The mapset of the dataset does not match the current mapset"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:1968
@@ -17746,6 +18270,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to rename dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
@@ -17825,6 +18350,11 @@ msgid ""
 "Unable to rename dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to rename dataset <%(ds)s> of type %(type)s in the temporal database. "
+"The mapset of the dataset does not match the current mapset"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:1977
@@ -17862,6 +18392,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -17884,6 +18415,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Unable to register map in dataset <%(ds)s> of type %(type)s. The mapset of "
 "the dataset does not match the current mapset"
@@ -17903,6 +18436,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -17975,6 +18509,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:2177
@@ -18003,6 +18539,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Temporal type of space time dataset <%(id)s> and map <%(map)s> with layer "
 "%(l)s are different"
@@ -18082,6 +18619,11 @@ msgid ""
 "Temporal type of space time dataset <%(id)s> and map <%(map)s> with layer "
 "%(l)s are different"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Temporal type of space time dataset <%(id)s> and map <%(map)s> with layer "
+"%(l)s are different"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:2205
@@ -18100,6 +18642,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Temporal type of space time dataset <%(id)s> and map <%(map)s> are different"
 =======
@@ -18165,6 +18708,10 @@ msgid ""
 msgid ""
 "Temporal type of space time dataset <%(id)s> and map <%(map)s> are different"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Temporal type of space time dataset <%(id)s> and map <%(map)s> are different"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:2220
@@ -18188,6 +18735,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Relative time units of space time dataset <%(id)s> and map <%(map)s> with "
 "layer %(l)s are different"
@@ -18267,6 +18815,11 @@ msgid ""
 "Relative time units of space time dataset <%(id)s> and map <%(map)s> with "
 "layer %(l)s are different"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Relative time units of space time dataset <%(id)s> and map <%(map)s> with "
+"layer %(l)s are different"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:2236
@@ -18285,6 +18838,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Relative time units of space time dataset <%(id)s> and map <%(map)s> are "
 "different"
@@ -18333,7 +18887,12 @@ msgid ""
 "Relative time units of space time dataset <%(id)s> and map <%(map)s> are "
 "different"
 >>>>>>> osgeo-main
->>>>>>> main
+>>>>>>> main
+=======
+msgid ""
+"Relative time units of space time dataset <%(id)s> and map <%(map)s> are "
+"different"
+>>>>>>> osgeo-main
 =======
 msgid ""
 "Relative time units of space time dataset <%(id)s> and map <%(map)s> are "
@@ -18396,6 +18955,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18424,6 +18984,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Unable to unregister map from dataset <%(ds)s> of type %(type)s in the "
 "temporal database. The mapset of the dataset does not match the current "
@@ -18440,6 +19002,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18480,6 +19043,8 @@ msgid "Unable to unregister map from dataset <%(ds)s> of type %(type)s in the te
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:2312
@@ -18498,6 +19063,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Map <%(map)s> with layer %(l)s is not registered in space time dataset <"
 "%(base)s>"
@@ -18577,6 +19143,11 @@ msgid ""
 "Map <%(map)s> with layer %(l)s is not registered in space time dataset <"
 "%(base)s>"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Map <%(map)s> with layer %(l)s is not registered in space time dataset <"
+"%(base)s>"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/abstract_space_time_dataset.py:2318
@@ -18600,6 +19171,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Update metadata, spatial and temporal extent from all registered maps of <%s>"
 =======
@@ -18665,6 +19237,10 @@ msgid ""
 msgid ""
 "Update metadata, spatial and temporal extent from all registered maps of <%s>"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Update metadata, spatial and temporal extent from all registered maps of <%s>"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/mapcalc.py:117
@@ -18694,6 +19270,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18722,6 +19299,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Found more than a single map in a sample granule. Only the first map is used "
 "for computation. Use t.rast.aggregate.ds to create synchronous raster "
@@ -18738,6 +19317,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18778,6 +19358,8 @@ msgid "Found more than a single map in a sample granule. Only the first map is u
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/mapcalc.py:185
@@ -18835,6 +19417,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Output granularity seems not to be valid. Please use one of the following "
 "values : {gr}"
@@ -18914,6 +19497,11 @@ msgid ""
 "Output granularity seems not to be valid. Please use one of the following "
 "values : {gr}"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Output granularity seems not to be valid. Please use one of the following "
+"values : {gr}"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/temporal_granularity.py:1055
@@ -18942,6 +19530,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Error vector maps with basename %s exist. Use --o flag to overwrite existing "
 "file"
@@ -19021,6 +19610,11 @@ msgid ""
 "Error vector maps with basename %s exist. Use --o flag to overwrite existing "
 "file"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Error vector maps with basename %s exist. Use --o flag to overwrite existing "
+"file"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/temporal_vector_algebra.py:420
@@ -19052,6 +19646,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Spatio-temporal topological operators are not supported in granularity "
 "algebra mode"
@@ -19131,6 +19726,11 @@ msgid ""
 "Spatio-temporal topological operators are not supported in granularity "
 "algebra mode"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Spatio-temporal topological operators are not supported in granularity "
+"algebra mode"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/temporal_algebra.py:867
@@ -19168,6 +19768,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Wrong temporal type of space time dataset <"
 "%s>                                       <%s> time is required"
@@ -19247,6 +19848,11 @@ msgid ""
 "Wrong temporal type of space time dataset <"
 "%s>                                       <%s> time is required"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Wrong temporal type of space time dataset <"
+"%s>                                       <%s> time is required"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/temporal_algebra.py:1234
@@ -19270,6 +19876,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -19292,6 +19899,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "The resulting space time dataset type <%(a)s> is different from the "
 "requested type <%(b)s>"
@@ -19311,6 +19920,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -19383,6 +19993,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/temporal_algebra.py:2434
@@ -19406,6 +20018,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Wrong map type. TMAP only supports single maps that are registered in the "
 "temporal GRASS database"
@@ -19485,6 +20098,11 @@ msgid ""
 "Wrong map type. TMAP only supports single maps that are registered in the "
 "temporal GRASS database"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Wrong map type. TMAP only supports single maps that are registered in the "
+"temporal GRASS database"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/temporal_algebra.py:2468
@@ -19541,6 +20159,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to initialize the temporal DBMI interface. Please use t.connect to "
 "specify the driver and the database string"
@@ -19620,6 +20239,11 @@ msgid ""
 "Unable to initialize the temporal DBMI interface. Please use t.connect to "
 "specify the driver and the database string"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to initialize the temporal DBMI interface. Please use t.connect to "
+"specify the driver and the database string"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/core.py:654
@@ -19645,6 +20269,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -19667,6 +20292,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Run t.upgrade command installed from GRASS Addons in order to upgrade your "
 "temporal database.\n"
@@ -19692,6 +20319,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -19770,6 +20398,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/core.py:686 ../lib/python/temporal/core.py:879
@@ -20039,6 +20669,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Space time %(t)s dataset <%(sp)s> is already in the database. Use the "
 "overwrite flag."
@@ -20118,6 +20749,11 @@ msgid ""
 "Space time %(t)s dataset <%(sp)s> is already in the database. Use the "
 "overwrite flag."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Space time %(t)s dataset <%(sp)s> is already in the database. Use the "
+"overwrite flag."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/stds_import.py:454
@@ -20253,6 +20889,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to insert dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
@@ -20332,6 +20969,11 @@ msgid ""
 "Unable to insert dataset <%(ds)s> of type %(type)s in the temporal database. "
 "The mapset of the dataset does not match the current mapset"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to insert dataset <%(ds)s> of type %(type)s in the temporal database. "
+"The mapset of the dataset does not match the current mapset"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/aggregation.py:126
@@ -20355,6 +20997,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Raster map <%(name)s> is already in temporal database, use overwrite flag to "
 "overwrite"
@@ -20434,6 +21077,11 @@ msgid ""
 "Raster map <%(name)s> is already in temporal database, use overwrite flag to "
 "overwrite"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Raster map <%(name)s> is already in temporal database, use overwrite flag to "
+"overwrite"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/aggregation.py:145
@@ -20466,6 +21114,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to perform aggregation. Output raster map <%(name)s> exists and "
 "overwrite flag was not set"
@@ -20545,6 +21194,11 @@ msgid ""
 "Unable to perform aggregation. Output raster map <%(name)s> exists and "
 "overwrite flag was not set"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to perform aggregation. Output raster map <%(name)s> exists and "
+"overwrite flag was not set"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/aggregation.py:318
@@ -20563,6 +21217,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "The limit of open files (%i) was reached (%i). The module r.series will be "
 "run with flag z, to avoid open files limit exceeding."
@@ -20642,6 +21297,11 @@ msgid ""
 "The limit of open files (%i) was reached (%i). The module r.series will be "
 "run with flag z, to avoid open files limit exceeding."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"The limit of open files (%i) was reached (%i). The module r.series will be "
+"run with flag z, to avoid open files limit exceeding."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/temporal/list_stds.py:206
@@ -20696,6 +21356,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Mapset <{mapset}> or Location <{location}> is invalid for an unknown reason"
 =======
@@ -20761,6 +21422,10 @@ msgid ""
 msgid ""
 "Mapset <{mapset}> or Location <{location}> is invalid for an unknown reason"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Mapset <{mapset}> or Location <{location}> is invalid for an unknown reason"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/grassdb/checks.py:268
@@ -20789,6 +21454,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "<%s> is not a valid GRASS Location because PERMANENT Mapset does not have a "
 "DEFAULT_WIND file (default computational region)"
@@ -20868,6 +21534,11 @@ msgid ""
 "<%s> is not a valid GRASS Location because PERMANENT Mapset does not have a "
 "DEFAULT_WIND file (default computational region)"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"<%s> is not a valid GRASS Location because PERMANENT Mapset does not have a "
+"DEFAULT_WIND file (default computational region)"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/grassdb/checks.py:294
@@ -20891,6 +21562,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "<{location}> looks like a mapset, not a location. Did you mean just "
 "<{one_dir_up}>?"
@@ -20970,6 +21642,11 @@ msgid ""
 "<{location}> looks like a mapset, not a location. Did you mean just "
 "<{one_dir_up}>?"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"<{location}> looks like a mapset, not a location. Did you mean just "
+"<{one_dir_up}>?"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/grassdb/checks.py:317
@@ -20989,6 +21666,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -21011,6 +21689,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "It looks like <{location}> contains locations. Did you mean to specify one "
 "of them?"
@@ -21036,6 +21716,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgid "It looks like <{location}> contains locations. Did you mean to specify one of them?"
 =======
@@ -21130,6 +21811,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/grassdb/checks.py:351
@@ -21148,6 +21831,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Mapset  <{mapset}> already exists. Please consider using another name for "
 "your mapset."
@@ -21227,6 +21911,11 @@ msgid ""
 "Mapset  <{mapset}> already exists. Please consider using another name for "
 "your mapset."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Mapset  <{mapset}> already exists. Please consider using another name for "
+"your mapset."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/grassdb/checks.py:378
@@ -21245,6 +21934,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Location  <{location}> already exists. Please consider using another name "
 "for your location."
@@ -21324,6 +22014,11 @@ msgid ""
 "Location  <{location}> already exists. Please consider using another name "
 "for your location."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Location  <{location}> already exists. Please consider using another name "
+"for your location."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/grassdb/checks.py:433
@@ -21347,6 +22042,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -21369,6 +22065,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Mapset <{mapset}> is the current mapset."
 msgstr "Mapset <{mapset}> ist das aktuellen Mapset."
@@ -21387,6 +22085,7 @@ msgstr "Mapset <{mapset}> ist in Gebrauch."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy, python-brace-format
 =======
@@ -21460,6 +22159,8 @@ msgstr "Mapset <{mapset}> ist in Gebrauch."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/python/grassdb/checks.py:445
 #, python-brace-format
@@ -21521,6 +22222,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Install a newer version of PIL or Pillow to use this function (missing "
 "ImageOps module)"
@@ -21600,6 +22302,11 @@ msgid ""
 "Install a newer version of PIL or Pillow to use this function (missing "
 "ImageOps module)"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Install a newer version of PIL or Pillow to use this function (missing "
+"ImageOps module)"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/script/task.py:60
@@ -21664,6 +22371,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21692,6 +22400,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "To run the module <%s> add underscore at the end of the option <%s> to avoid "
 "conflict with Python keywords. Underscore at the beginning is deprecated in "
@@ -21708,6 +22418,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21748,6 +22459,8 @@ msgid "To run the module <%s> add underscore at the end of the option <%s> to av
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/script/core.py:385
@@ -21845,6 +22558,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Unable to write history for <%(map)s>. Raster map <%(map)s> not found in "
 "current mapset."
@@ -21924,6 +22638,11 @@ msgid ""
 "Unable to write history for <%(map)s>. Raster map <%(map)s> not found in "
 "current mapset."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Unable to write history for <%(map)s>. Raster map <%(map)s> not found in "
+"current mapset."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/script/raster.py:120
@@ -21963,6 +22682,7 @@ msgstr "Farbe"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Programmer error: '%(sql)s', '%(filename)s', or '%(table)s' must be provided"
 =======
@@ -22028,6 +22748,10 @@ msgid ""
 msgid ""
 "Programmer error: '%(sql)s', '%(filename)s', or '%(table)s' must be provided"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Programmer error: '%(sql)s', '%(filename)s', or '%(table)s' must be provided"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/script/db.py:172
@@ -22062,6 +22786,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "grass.script.array.read is deprecated and does not work on MS Windows, pass "
 "raster name in the constructor"
@@ -22141,6 +22866,11 @@ msgid ""
 "grass.script.array.read is deprecated and does not work on MS Windows, pass "
 "raster name in the constructor"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"grass.script.array.read is deprecated and does not work on MS Windows, pass "
+"raster name in the constructor"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/script/array.py:250 ../lib/python/script/array.py:400
@@ -22168,6 +22898,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "grass.script.array3d.read is deprecated and does not work on MS Windows, "
 "pass 3D raster name in the constructor"
@@ -22247,6 +22978,11 @@ msgid ""
 "grass.script.array3d.read is deprecated and does not work on MS Windows, "
 "pass 3D raster name in the constructor"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"grass.script.array3d.read is deprecated and does not work on MS Windows, "
+"pass 3D raster name in the constructor"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/python/script/setup.py:229
@@ -22952,6 +23688,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23043,6 +23780,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/raster/put_row.c:413
@@ -23687,6 +24429,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23778,6 +24521,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Rast_set_read_window(): projection/zone differs from that of currently open "
 "raster maps"
@@ -25228,6 +25976,7 @@ msgstr "Kann Datei mit Kontrollpunkten der Gruppe [%s in %s] nicht erzeugen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -25315,6 +26064,11 @@ msgid "subgroup <%s> of group <%s> is empty\n"
 msgstr "Untergruppe <%s> der Gruppe <%s> ist leer\n"
 =======
 >>>>>>> osgeo-main
+=======
+msgid "subgroup <%s> of group <%s> is empty\n"
+msgstr "Untergruppe <%s> der Gruppe <%s> ist leer\n"
+=======
+>>>>>>> osgeo-main
 msgid ""
 "The transformation pipeline contains an '%s' step. Remove this step if "
 "easting and northing are swapped in the output."
@@ -25623,6 +26377,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -25714,6 +26469,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/imagery/georef_tps.c:267 ../lib/imagery/georef_tps.c:271
 #: ../lib/imagery/georef_tps.c:275 ../lib/imagery/georef_tps.c:281
@@ -25793,6 +26553,7 @@ msgstr "FEHLER: <%s> ist keine gültige GRASS location"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -25884,6 +26645,11 @@ msgstr "FEHLER: <%s> ist keine gültige GRASS location"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/imagery/iscatt_core.c:81
 #, c-format
@@ -25912,6 +26678,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -25953,6 +26720,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/imagery/iscatt_core.c:250
 #, c-format
 msgid "Unable to open category raster conditions file <%s>."
@@ -25977,6 +26746,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26046,6 +26816,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Hit RETURN to continue"
 msgstr "RETURN zum Weitermachen drücken"
 
@@ -26068,6 +26842,7 @@ msgstr "Vektorkarte <%s> ist nicht im Topologielevel geöffnet."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26159,6 +26934,11 @@ msgstr "Vektorkarte <%s> ist nicht im Topologielevel geöffnet."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/imagery/iscatt_core.c:274
 #, c-format
@@ -26182,6 +26962,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Removing empty 3D raster maps"
 msgstr "Entfernen der leeren 3D Rasterkarte"
 =======
@@ -26225,6 +27006,8 @@ msgstr "Entfernen der leeren 3D Rasterkarte"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/imagery/iscatt_core.c:300 ../lib/imagery/iscatt_core.c:341
 #, c-format
 msgid "Corrupted  category raster conditions file <%s> (fseek failed)"
@@ -26247,6 +27030,7 @@ msgstr "Entfernen der leeren 3D Rasterkarte"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -26276,6 +27060,8 @@ msgstr "Entfernen der leeren 3D Rasterkarte"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Removing empty 3D raster maps"
 msgstr "Entfernen der leeren 3D Rasterkarte"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -26293,6 +27079,7 @@ msgstr "Entfernen der leeren 3D Rasterkarte"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26335,6 +27122,8 @@ msgstr "Entfernen der leeren 3D Rasterkarte"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/imagery/iscatt_core.c:331
 #, c-format
@@ -28733,6 +29522,7 @@ msgstr "Zuviele Kategorien (%d), kann cat %d (Layer %d) nicht setzen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -28774,6 +29564,8 @@ msgstr "Zuviele Kategorien (%d), kann cat %d (Layer %d) nicht setzen."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/vector/Vlib/cats.c:420
 #, c-format
 msgid "Unable to convert category string '%s' (from '%s') to category range"
@@ -28795,6 +29587,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -28864,6 +29657,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Dev note: Adapted sites library used for vector points. (module should be "
 "updated to GRASS 6 vector library)"
@@ -28887,6 +29684,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -28978,6 +29776,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/cats.c:573 ../lib/vector/Vlib/cats.c:677
 msgid "Layer number must be > 0 for category constraints"
@@ -29052,6 +29855,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29143,6 +29947,8 @@ msgstr "Kann Header-Datei der Rasterkarte <%s@%s> nicht öffnen."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/vector/Vlib/legal_vname.c:104 ../lib/vector/Vlib/legal_vname.c:109
 #, c-format
 msgid "Output vector map name <%s> is not in the current mapset (%s)"
@@ -30735,6 +31541,7 @@ msgstr "Kann Header-Datei der Rasterkarte <%s@%s> nicht öffnen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -30764,6 +31571,8 @@ msgstr "Kann Header-Datei der Rasterkarte <%s@%s> nicht öffnen."
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "welche fehlt."
 
@@ -30833,6 +31642,7 @@ msgstr "Kann Header-Datei der Rasterkarte <%s@%s> nicht öffnen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30875,5 +31685,7 @@ msgstr "Kann Header-Datei der Rasterkarte <%s@%s> nicht öffnen."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "Kopiere %s <%s> in das aktuelle Mapset als <%s>"
diff --git a/locale/po/grasslibs_el.po b/locale/po/grasslibs_el.po
index 808f4f1d59a..df9c8579eec 100644
--- a/locale/po/grasslibs_el.po
+++ b/locale/po/grasslibs_el.po
@@ -2386,6 +2386,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Illegal n-s resolution value for 3D: %g"
 msgstr ""
@@ -2441,6 +2442,9 @@ msgstr ""
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal n-s resolution value for 3D: %g"
 msgstr ""
@@ -2459,6 +2463,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2496,6 +2501,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal n-s resolution value for 3D: %g"
 msgstr ""
@@ -3883,6 +3890,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3924,6 +3932,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset.c:38
 msgid "MAPSET is not set"
 msgstr "MAPSET δεν έχει οριστεί"
@@ -4153,6 +4163,7 @@ msgstr "<%s> στο mapset <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -4201,6 +4212,9 @@ msgstr "<%s> στο mapset <%s>"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -4282,6 +4296,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4319,6 +4334,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
 msgstr ""
@@ -4638,6 +4655,7 @@ msgid "Invalid offset (%"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -4688,6 +4706,9 @@ msgid "Invalid offset (%"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/write_pg.c:348 ../lib/vector/Vlib/write_ogr.c:140
@@ -4705,6 +4726,7 @@ msgid "Unable to delete feature"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4742,6 +4764,8 @@ msgid "Unable to delete feature"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -9273,6 +9297,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -9314,6 +9339,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/vector/Vlib/read_pg.c:1097
 #, c-format
 msgid "Invalid cache index %d (max: %d)"
@@ -9593,6 +9620,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -9662,6 +9690,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/raster/get_cellhd.c:70
 #, c-format
 msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of raster map <%s@%s>. %s"
@@ -13044,6 +13076,7 @@ msgstr "[%s]: Δεν υπάρχει τέτοιο χρώμα"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13134,6 +13167,8 @@ msgstr "Αδυναμία ανοίγματος κεφαλικού (header) αρχ
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 #~ msgid ""
 #~ "Datum <%s> apparently recognised by GRASS but no parameters found. You "
@@ -13329,6 +13364,7 @@ msgstr "Αδυναμία ανοίγματος κεφαλικού (header) αρχ
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -13387,6 +13423,10 @@ msgstr "Αδυναμία ανοίγματος κεφαλικού (header) αρχ
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "το οποίο λείπει"
 
@@ -13455,6 +13495,7 @@ msgstr "Αδυναμία ανοίγματος κεφαλικού (header) αρχ
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13514,3 +13555,6 @@ msgstr "Αδυναμία ανοίγματος κεφαλικού (header) αρχ
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasslibs_es.po b/locale/po/grasslibs_es.po
index 13125237e4d..8c111d46c6d 100644
--- a/locale/po/grasslibs_es.po
+++ b/locale/po/grasslibs_es.po
@@ -4409,6 +4409,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4500,6 +4501,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/mkstemp.c:133
 msgid "Attempt to create read-only temporary file"
@@ -11385,6 +11391,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -11476,6 +11483,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/write_nat.c:420
 #, c-format
@@ -13441,6 +13453,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13564,6 +13577,8 @@ msgstr "El archivo de coordenadas del mapa vectorial <%s@%s> es menor de lo que
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/vector/diglib/test.c:105
 #, c-format
 msgid ""
@@ -15967,6 +15982,7 @@ msgstr "Copiar %s <%s> al Directorio de mapas actual con el nombre <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coor file of vector map <%s@%s> is larger than it should be (%ld bytes excess)"
 msgstr "El archivo de coordenadas del mapa vectorial <%s@%s> es mayor de lo que debiera (%ld bytes sobrantes)"
 
@@ -16035,6 +16051,8 @@ msgstr "Copiar %s <%s> al Directorio de mapas actual con el nombre <%s>"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "To run the module <%s> add underscore at the end of the option <%s> to "
 #~ "avoid conflict with Python keywords. Underscore at the beginning is "
@@ -16062,6 +16080,7 @@ msgstr "Copiar %s <%s> al Directorio de mapas actual con el nombre <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -16091,6 +16110,8 @@ msgstr "Copiar %s <%s> al Directorio de mapas actual con el nombre <%s>"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "To run the module <%s> add underscore at the end of the option <%s> to avoid conflict with Python keywords. Underscore at the beginning is depreciated in GRASS GIS 7.0 and will be removed in version 7.1."
 msgstr "Para correr el módulo <%s> añada guión bajo al final de la opción <%s> para evitar conflicto con las palabras reservadas de Python. El guión bajo al inicio es despreciado en GRASS 7.0 y será removido en la versión 7.1."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -16108,6 +16129,7 @@ msgstr "Para correr el módulo <%s> añada guión bajo al final de la opción <%
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -16137,6 +16159,8 @@ msgstr "Para correr el módulo <%s> añada guión bajo al final de la opción <%
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "el cual no se ha encontrado."
 
@@ -16237,6 +16261,7 @@ msgstr "El archivo de coordenadas del mapa vectorial <%s@%s> es menor de lo que
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16273,6 +16298,8 @@ msgstr "El archivo de coordenadas del mapa vectorial <%s@%s> es menor de lo que
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "Copiar %s <%s> al Directorio de mapas actual con el nombre <%s>"
 
@@ -16293,6 +16320,7 @@ msgstr "Para correr el módulo <%s> añada guión bajo al final de la opción <%
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16358,3 +16386,6 @@ msgstr "Para correr el módulo <%s> añada guión bajo al final de la opción <%
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasslibs_fr.po b/locale/po/grasslibs_fr.po
index 37216e45e0f..4ff8e9bf89f 100644
--- a/locale/po/grasslibs_fr.po
+++ b/locale/po/grasslibs_fr.po
@@ -2837,6 +2837,7 @@ msgstr "erreur dans la table du fichier de datums, ligne %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Failed to print %s"
 msgstr ""
@@ -2897,6 +2898,9 @@ msgstr ""
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Failed to print %s"
 msgstr ""
@@ -2920,6 +2924,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2957,6 +2962,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Failed to print %s"
 msgstr ""
@@ -3090,6 +3097,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3181,6 +3189,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal e-w resolution value: %g"
 msgstr ""
@@ -3211,6 +3224,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3302,6 +3316,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "North must be north of South, but %g (north) <= %g (south"
 msgstr ""
@@ -3327,6 +3346,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3418,6 +3438,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "North must be larger than South, but %g (north) <= %g (south"
 msgstr ""
@@ -3443,6 +3468,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3534,6 +3560,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "East must be larger than West, but %g (east) <= %g (west)"
 msgstr ""
@@ -3563,6 +3594,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3654,6 +3686,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Invalid coordinates: negative number of rows"
 msgstr ""
 
@@ -3690,6 +3727,7 @@ msgstr "Les résolutions NS et EO sont différentes"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3781,6 +3819,11 @@ msgstr "Les résolutions NS et EO sont différentes"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal n-s resolution value for 3D: %g"
 msgstr ""
@@ -3811,6 +3854,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3902,6 +3946,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal e-w resolution value for 3D: %g"
 msgstr ""
@@ -3932,6 +3981,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4023,6 +4073,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal t-b resolution value: %g"
 msgstr ""
@@ -4048,6 +4103,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4139,6 +4195,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal depths value: %d"
 msgstr ""
@@ -4164,6 +4225,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4255,6 +4317,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Top must be larger than Bottom, but %g (top) <= %g (bottom)"
 msgstr ""
@@ -5103,6 +5170,7 @@ msgstr "Champ d'est invalide : %s"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -5144,6 +5212,8 @@ msgstr "Champ d'est invalide : %s"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/rd_cellhd.c:217
 msgid "Duplicate west field"
 msgstr "Champ Ouest dupliqué"
@@ -5422,6 +5492,7 @@ msgstr "Tentative de création d'un fichier temporaire en lecture-seule"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -5491,6 +5562,10 @@ msgstr "Tentative de création d'un fichier temporaire en lecture-seule"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -6921,6 +6996,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7012,6 +7088,11 @@ msgstr[1] ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/gisinit.c:67 ../lib/gis/gisinit.c:118
 #, c-format
@@ -7733,6 +7814,7 @@ msgstr "Impossible d'écrire le fichier de plage pour <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -7774,6 +7856,8 @@ msgstr "Impossible d'écrire le fichier de plage pour <%s>"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/raster/range.c:465 ../lib/raster/range.c:479
 #: ../lib/raster/range.c:497 ../lib/raster/range.c:502
 #, c-format
@@ -8027,6 +8111,7 @@ msgstr "afficher les paramètres de configuration GRASS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -8096,6 +8181,10 @@ msgstr "afficher les paramètres de configuration GRASS"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/vector/Vlib/write.c:234
 msgid "Unable to rewrite feature/offset %"
 msgstr ""
@@ -15617,6 +15706,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15785,6 +15875,8 @@ msgstr "Le fichier coor de la carte vecteur <%s@%s> est plus petit qu'il ne devr
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/vector/diglib/test.c:56
 msgid "Unable to open test.tmp file"
 msgstr "Impossible d'ouvrir le fichier test.tmp"
@@ -18674,6 +18766,7 @@ msgstr "Impossible de lire le fichier header de la carte raster <%s@%s>. II s'ag
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18702,6 +18795,8 @@ msgstr "Impossible de lire le fichier header de la carte raster <%s@%s>. II s'ag
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Coor file of vector map <%s@%s> is larger than it should be (%ld bytes excess)"
 msgstr "Le fichier coor de la carte vecteur <%s@%s> est plus grand qu'il ne devrait (%ld bytes en trop)"
@@ -18722,6 +18817,7 @@ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'optio
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
 
 <<<<<<< HEAD
@@ -18841,6 +18937,10 @@ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'optio
 >>>>>>> osgeo-main
 =======
 
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 #~ msgid ""
@@ -18869,6 +18969,7 @@ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'optio
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
@@ -18903,6 +19004,8 @@ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'optio
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #~ msgid "To run the module <%s> add underscore at the end of the option <%s> to avoid conflict with Python keywords. Underscore at the beginning is depreciated in GRASS GIS 7.0 and will be removed in version 7.1."
 #~ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'option <%s> pour éviter un conflit avec les mots-clefs Python. Le tiret-bas est obsolète dans GRASS 7.0 et sera supprimé dans la version 7.1."
@@ -18921,6 +19024,7 @@ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'optio
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -18990,3 +19094,7 @@ msgstr "Pour exécuter le module <%s>, ajouter un tiret-bas à la fin de l'optio
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasslibs_id_ID.po b/locale/po/grasslibs_id_ID.po
index 29010c6bd74..895f5456460 100644
--- a/locale/po/grasslibs_id_ID.po
+++ b/locale/po/grasslibs_id_ID.po
@@ -10406,6 +10406,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -10497,6 +10498,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:467
 msgid "Cannot add network arc representing turn."
@@ -12659,6 +12665,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12696,6 +12703,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/vector/diglib/spindex_rw.c:100 ../lib/vector/diglib/spindex_rw.c:109
 msgid "Topology file must be written before spatial index file"
 msgstr ""
@@ -12978,6 +12987,7 @@ msgstr "[%s]: Tidak ada warna seperti itu"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -13047,5 +13057,9 @@ msgstr "[%s]: Tidak ada warna seperti itu"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "Salin %s <%s> ke current mapset sebagai <%s>"
diff --git a/locale/po/grasslibs_it.po b/locale/po/grasslibs_it.po
index 5eec2e462dc..9a3a7fb182c 100644
--- a/locale/po/grasslibs_it.po
+++ b/locale/po/grasslibs_it.po
@@ -12209,6 +12209,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12306,6 +12307,8 @@ msgstr "Impossibile leggere il file dell'intestazione per la mappa raster <%s@%s
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/vector/Vlib/legal_vname.c:61
 #, c-format
 msgid "Illegal vector map name <%s>. Character '%c' not allowed."
@@ -14329,6 +14332,7 @@ msgstr "Impossibile leggere il file dell'intestazione per la mappa raster <%s@%s
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14375,6 +14379,9 @@ msgstr "Impossibile leggere il file dell'intestazione per la mappa raster <%s@%s
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "Copia %s <%s> al mapset corrente come <%s>"
@@ -14395,6 +14402,7 @@ msgstr "Copia %s <%s> al mapset corrente come <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
@@ -14429,6 +14437,8 @@ msgstr "Copia %s <%s> al mapset corrente come <%s>"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "To run the module <%s> add underscore at the end of the option <%s> to "
 #~ "avoid conflict with Python keywords. Underscore at the beginning is "
@@ -14456,6 +14466,7 @@ msgstr "Copia %s <%s> al mapset corrente come <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -14485,6 +14496,8 @@ msgstr "Copia %s <%s> al mapset corrente come <%s>"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "To run the module <%s> add underscore at the end of the option <%s> to avoid conflict with Python keywords. Underscore at the beginning is depreciated in GRASS GIS 7.0 and will be removed in version 7.1."
 msgstr "per eseguire il modulo <%s> aggiungere il trattino basso alla fine dell'opzione <%s> per evitare conflitti con le parole chiave di Python. Il trattino basso all'inizio è obsoleto in GRASS GIS 7.0 e sarà rimosso nella versione 7.1."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -14502,6 +14515,7 @@ msgstr "per eseguire il modulo <%s> aggiungere il trattino basso alla fine dell'
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -14531,6 +14545,8 @@ msgstr "per eseguire il modulo <%s> aggiungere il trattino basso alla fine dell'
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "che non è presente."
 
@@ -14605,6 +14621,7 @@ msgstr "Impossibile leggere il file dell'intestazione per la mappa raster <%s@%s
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14641,6 +14658,8 @@ msgstr "Impossibile leggere il file dell'intestazione per la mappa raster <%s@%s
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "Copia %s <%s> al mapset corrente come <%s>"
 
@@ -14661,6 +14680,7 @@ msgstr "per eseguire il modulo <%s> aggiungere il trattino basso alla fine dell'
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14726,3 +14746,6 @@ msgstr "per eseguire il modulo <%s> aggiungere il trattino basso alla fine dell'
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasslibs_ja.po b/locale/po/grasslibs_ja.po
index 51a7effd724..d3477138b7b 100644
--- a/locale/po/grasslibs_ja.po
+++ b/locale/po/grasslibs_ja.po
@@ -3643,6 +3643,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3684,6 +3685,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/timestamp.c:534
 #, c-format
 msgid "Invalid timestamp specified for vector map <%s@%s>"
@@ -3994,6 +3997,7 @@ msgstr "<%s> マップセット <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -4042,6 +4046,9 @@ msgstr "<%s> マップセット <%s>"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -4061,6 +4068,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4098,6 +4106,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
 msgstr ""
@@ -9451,6 +9461,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -9542,6 +9553,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:467
 msgid "Cannot add network arc representing turn."
@@ -12159,6 +12175,7 @@ msgstr "[%s]: そのような色はありません"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12252,6 +12269,8 @@ msgstr "無効なオフセット (%ld)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Absurd polygon."
 #~ msgstr "不正なポリゴン"
 
@@ -12341,6 +12360,7 @@ msgstr "降順"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -12370,6 +12390,8 @@ msgstr "降順"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "見つかりません"
 
@@ -12434,6 +12456,7 @@ msgstr "降順"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12471,6 +12494,8 @@ msgstr "降順"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to open header file for raster map <%s@%s>"
 msgstr "ラスターマップ <%s@%s>のヘッダーファイルが開きません"
 
@@ -12491,6 +12516,7 @@ msgstr "無効なオフセット (%ld)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -12576,3 +12602,8 @@ msgstr "無効なオフセット (%ld)"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasslibs_ko.po b/locale/po/grasslibs_ko.po
index 33c8f2aebd5..acdb5508cfc 100644
--- a/locale/po/grasslibs_ko.po
+++ b/locale/po/grasslibs_ko.po
@@ -22,6 +22,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -94,6 +95,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+"POT-Creation-Date: 2024-05-23 03:37-0600\n"
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 "PO-Revision-Date: 2023-09-23 06:30+0000\n"
@@ -117,6 +123,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -208,6 +215,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Last-Translator: Huidae Cho \n"
 "Language-Team: Korean \n"
@@ -233,6 +245,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -274,6 +287,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "X-Generator: Weblate 5.0\n"
 
 #: ../lib/nviz/render.c:43
@@ -292,6 +307,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -361,6 +377,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "X-Generator: Weblate 4.12.2\n"
 
 #: ../lib/init/grass.py:209
@@ -7239,6 +7259,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -7261,6 +7282,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to rewrite feature/offset %"
 msgstr ""
 
@@ -7277,6 +7300,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -7344,6 +7368,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/write.c:299
 msgid "Unable to restore feature/offset %"
@@ -7913,6 +7939,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "\n"
 "++ 열 복사 검정 ++"
 =======
@@ -7975,6 +8002,10 @@ msgstr ""
 "\n"
 "++ 열 복사 검정 ++"
 >>>>>>> osgeo-main
+=======
+"\n"
+"++ 열 복사 검정 ++"
+>>>>>>> osgeo-main
 
 #: ../lib/db/dbmi_base/test/test_columns.c:150
 msgid ""
@@ -11464,6 +11495,7 @@ msgstr "GRASS GIS를 시작하는 중입니다..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -11609,6 +11641,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../lib/init/grass.py:2614
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../lib/init/grass.py:2598
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 msgid ""
@@ -16138,6 +16175,7 @@ msgstr "헤더 파일을 열 수 없습니다"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16184,6 +16222,9 @@ msgstr "헤더 파일을 열 수 없습니다"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Illegal row value"
 msgstr "잘못된 row 값"
@@ -16211,6 +16252,7 @@ msgstr "잘못된 col3 값"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 <<<<<<< HEAD
@@ -16232,6 +16274,8 @@ msgstr "잘못된 col3 값"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 #~ msgid "Illegal n-s resolution value <%lf>"
@@ -16297,6 +16341,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -16310,6 +16355,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "%s <%s>를 현재 지도 세트의 <%s>로 복사합니다"
@@ -16322,6 +16369,7 @@ msgstr "%s <%s>를 현재 지도 세트의 <%s>로 복사합니다"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #~ msgid "Illegal n-s resolution value <%lf>"
 #~ msgstr "잘못된 n-s 해상도값 <%lf>"
 =======
@@ -16496,6 +16544,8 @@ msgstr "%s <%s>를 현재 지도 세트의 <%s>로 복사합니다"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "To run the module <%s> add underscore at the end of the option <%s> to "
 #~ "avoid conflict with Python keywords. Underscore at the beginning is "
@@ -16522,6 +16572,7 @@ msgstr "%s <%s>를 현재 지도 세트의 <%s>로 복사합니다"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -16551,6 +16602,8 @@ msgstr "%s <%s>를 현재 지도 세트의 <%s>로 복사합니다"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "To run the module <%s> add underscore at the end of the option <%s> to avoid conflict with Python keywords. Underscore at the beginning is depreciated in GRASS GIS 7.0 and will be removed in version 7.1."
 msgstr "모듈 <%s>를 실행하기 위해서는 옵션 <%s>의 끝에 언더스코어를 추가해서 파이썬 키위드와의 충돌을 방지해야 합니다. 앞부분의 언더스코어는 GRASS GIS 7.0에서는 추천하지 않으며 버전 7.1부터는 지원하지 않을 것입니다."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -16568,6 +16621,7 @@ msgstr "모듈 <%s>를 실행하기 위해서는 옵션 <%s>의 끝에 언더스
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -16597,6 +16651,8 @@ msgstr "모듈 <%s>를 실행하기 위해서는 옵션 <%s>의 끝에 언더스
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "whose header file can't be opened."
 msgstr "헤더 파일을 열 수 없습니다"
 
@@ -16680,6 +16736,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16716,6 +16773,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "%s <%s>를 현재 지도 세트의 <%s>로 복사합니다"
 
@@ -16736,6 +16795,7 @@ msgstr "모듈 <%s>를 실행하기 위해서는 옵션 <%s>의 끝에 언더스
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16801,3 +16861,6 @@ msgstr "모듈 <%s>를 실행하기 위해서는 옵션 <%s>의 끝에 언더스
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasslibs_ml.po b/locale/po/grasslibs_ml.po
index 182fb4eb6c1..f8ef1bf08f3 100644
--- a/locale/po/grasslibs_ml.po
+++ b/locale/po/grasslibs_ml.po
@@ -3329,6 +3329,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3370,6 +3371,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset.c:38
 msgid "MAPSET is not set"
 msgstr ""
@@ -3597,6 +3600,7 @@ msgstr "<%s> മാപ്പ്സെറ്റിൽ <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -3645,6 +3649,9 @@ msgstr "<%s> മാപ്പ്സെറ്റിൽ <%s>"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -4260,6 +4267,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4297,6 +4305,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
 msgstr ""
diff --git a/locale/po/grasslibs_pl.po b/locale/po/grasslibs_pl.po
index 9404702878d..b3ad1f644b4 100644
--- a/locale/po/grasslibs_pl.po
+++ b/locale/po/grasslibs_pl.po
@@ -4571,6 +4571,7 @@ msgid "Invalid offset (%"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -4621,6 +4622,9 @@ msgid "Invalid offset (%"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/write_pg.c:348 ../lib/vector/Vlib/write_ogr.c:140
@@ -4638,6 +4642,7 @@ msgid "Unable to delete feature"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4675,6 +4680,8 @@ msgid "Unable to delete feature"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -9461,6 +9468,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -9552,6 +9560,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:467
 msgid "Cannot add network arc representing turn."
@@ -10862,6 +10875,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10953,6 +10967,8 @@ msgstr "Nie można odczytać pliku nagłówkowego mapy rastrowej <%s@%s>"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/vector/Vlib/legal_vname.c:104 ../lib/vector/Vlib/legal_vname.c:109
 #, c-format
 msgid "Output vector map name <%s> is not in the current mapset (%s)"
@@ -12361,6 +12377,7 @@ msgstr "Nie można odczytać pliku nagłówkowego mapy rastrowej <%s@%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -12390,6 +12407,8 @@ msgstr "Nie można odczytać pliku nagłówkowego mapy rastrowej <%s@%s>"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr ", której brak."
 
@@ -12459,6 +12478,7 @@ msgstr "Nie można odczytać pliku nagłówkowego mapy rastrowej <%s@%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12501,5 +12521,7 @@ msgstr "Nie można odczytać pliku nagłówkowego mapy rastrowej <%s@%s>"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "Kopiuj %s <%s> do bieżącego mapsetu jako <%s>"
diff --git a/locale/po/grasslibs_pt.po b/locale/po/grasslibs_pt.po
index 64862aefc81..64a87a0e564 100644
--- a/locale/po/grasslibs_pt.po
+++ b/locale/po/grasslibs_pt.po
@@ -3732,6 +3732,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3773,6 +3774,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset.c:38
 msgid "MAPSET is not set"
 msgstr "MAPSET não foi definido"
@@ -4011,6 +4014,7 @@ msgstr "nenhum"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4047,6 +4051,8 @@ msgstr "nenhum"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -9544,6 +9550,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -9635,6 +9642,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/ogsf/gsd_legend.c:245
 #, c-format
@@ -12833,6 +12845,7 @@ msgstr "[%s]: Cor não existe"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12923,6 +12936,8 @@ msgstr "Não foi possível abrir o ficheiro de cabeçalho do mapa raster <%s@%s>
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "invalid color name"
 #~ msgstr "nome de cor inválido"
 
@@ -13019,6 +13034,7 @@ msgstr "Não foi possível abrir o ficheiro de cabeçalho do mapa raster <%s@%s>
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -13048,6 +13064,8 @@ msgstr "Não foi possível abrir o ficheiro de cabeçalho do mapa raster <%s@%s>
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "que está faltando."
 
@@ -13116,6 +13134,7 @@ msgstr "Não foi possível abrir o ficheiro de cabeçalho do mapa raster <%s@%s>
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13158,3 +13177,5 @@ msgstr "Não foi possível abrir o ficheiro de cabeçalho do mapa raster <%s@%s>
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasslibs_pt_BR.po b/locale/po/grasslibs_pt_BR.po
index 4feb5cb91a5..de86f4c05c8 100644
--- a/locale/po/grasslibs_pt_BR.po
+++ b/locale/po/grasslibs_pt_BR.po
@@ -224,6 +224,7 @@ msgstr "GUI <%s> não suportado nesta versão"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
@@ -261,6 +262,8 @@ msgstr "GUI <%s> não suportado nesta versão"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "The python command does not work as expected.\n"
 "Please check your installation or set the GRASS_PYTHON environment variable."
@@ -279,6 +282,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "O comando python não funciona como esperado!\n"
 "Por favor verifique seu ambiente de variável GRASS_PYTHON.\n"
@@ -322,6 +326,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/init/grass.py:810
 msgid "GRASS GUI not found. Please check your installation."
@@ -380,6 +386,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Mapset <{}> already exists."
 msgstr ""
 =======
@@ -451,6 +458,10 @@ msgstr ""
 msgid "Mapset <{}> already exists."
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Mapset <{}> already exists."
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../lib/init/grass.py:985
 msgid "A new mapset can be created using '-c' flag."
@@ -3094,6 +3105,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3185,6 +3197,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal number of rows: %d (resolution is %g)"
 msgstr ""
@@ -3210,6 +3227,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3301,6 +3319,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal e-w resolution value: %g"
 msgstr ""
@@ -3331,6 +3354,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3422,6 +3446,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "North must be north of South, but %g (north) <= %g (south"
 msgstr ""
@@ -3447,6 +3476,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3538,6 +3568,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "North must be larger than South, but %g (north) <= %g (south"
 msgstr ""
@@ -3563,6 +3598,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3654,6 +3690,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "East must be larger than West, but %g (east) <= %g (west)"
 msgstr ""
@@ -3683,6 +3724,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3774,6 +3816,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Invalid coordinates: negative number of rows"
 msgstr ""
 
@@ -3810,6 +3857,7 @@ msgstr "As resoluções para NS e EW são diferentes"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3901,6 +3949,11 @@ msgstr "As resoluções para NS e EW são diferentes"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal n-s resolution value for 3D: %g"
 msgstr ""
@@ -3931,6 +3984,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4022,6 +4076,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal e-w resolution value for 3D: %g"
 msgstr ""
@@ -4052,6 +4111,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4143,6 +4203,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal t-b resolution value: %g"
 msgstr ""
@@ -4168,6 +4233,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4259,6 +4325,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal depths value: %d"
 msgstr ""
@@ -4284,6 +4355,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4375,6 +4447,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Top must be larger than Bottom, but %g (top) <= %g (bottom)"
 msgstr ""
@@ -5341,6 +5418,7 @@ msgstr "As dimensões dos mosaicos usados ​​no mapa raster3d de saída (XxYx
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -5432,6 +5510,11 @@ msgstr "As dimensões dos mosaicos usados ​​no mapa raster3d de saída (XxYx
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/parser_standard_options.c:484
 msgid "Name of input vector map"
@@ -6869,6 +6952,7 @@ msgstr "Erro interno: tipo de regra inválido:%d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6903,6 +6987,8 @@ msgstr "Erro interno: tipo de regra inválido:%d"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser_dependencies.c:514
 #, fuzzy
 msgid "Internal error: the number of options is < 0"
@@ -6926,6 +7012,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6955,6 +7042,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/vector/diglib/test.c:150
 #, c-format
 msgid "Error in read/write portable short, byte_order = %d Written: %d Read: %d"
@@ -7647,6 +7736,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7706,6 +7796,9 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/rd_cellhd.c:139 ../lib/gis/rd_cellhd.c:178
 #: ../lib/gis/rd_cellhd.c:355
@@ -8647,6 +8740,7 @@ msgstr[1] "%d primitivas registradas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -8689,6 +8783,8 @@ msgstr[1] "%d primitivas registradas"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 #, fuzzy, c-format
 msgid "Incomplete GRASS session: Variable '%s' not set"
@@ -8708,6 +8804,7 @@ msgstr "Variável '%s' não definida"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -8770,6 +8867,10 @@ msgstr "Variável '%s' não definida"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "One vertex registered"
 msgid_plural "% vertices registered"
@@ -8790,6 +8891,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8868,6 +8970,11 @@ msgstr[1] ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/mkstemp.c:133
 msgid "Attempt to create read-only temporary file"
@@ -9893,6 +10000,7 @@ msgstr "Não foi possível excluir linha de coor"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -9933,6 +10041,8 @@ msgstr "Não foi possível excluir linha de coor"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../lib/raster/histogram.c:53
@@ -10241,6 +10351,7 @@ msgstr "opções: arch,build,compiler,date,path,revision,svn_revision,version"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -10264,6 +10375,8 @@ msgstr "opções: arch,build,compiler,date,path,revision,svn_revision,version"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/vector/Vlib/write.c:234
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Unable to rewrite feature/offset %"
@@ -10279,6 +10392,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -10603,6 +10717,10 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 
+=======
+>>>>>>> osgeo-main
+=======
+
 =======
 >>>>>>> osgeo-main
 
@@ -10819,6 +10937,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10859,6 +10978,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/init/grass.py:387
 msgid "initial GRASS database directory"
@@ -10894,6 +11015,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10929,6 +11051,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "diretório contendo Mapsets com um sistema de coordenadas comum (projeção)"
 
 #: ../lib/init/grass.py:393
@@ -14430,6 +14554,7 @@ msgid "Unable to flush all tiles"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -14452,6 +14577,8 @@ msgid "Unable to flush all tiles"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr "Não foi possível limpar todos os mosaicos"
 
 #: ../lib/raster3d/close.c:84
@@ -14467,6 +14594,7 @@ msgstr "Não foi possível limpar o índice"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -14527,6 +14655,8 @@ msgstr "Não foi possível limpar o índice"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/raster3d/close.c:94
 msgid "Unable to position file"
@@ -14997,6 +15127,7 @@ msgstr "Não foi possível limpar o arquivo %s para o mapa raster %s: %s"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -15037,6 +15168,8 @@ msgstr "Não foi possível limpar o arquivo %s para o mapa raster %s: %s"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../lib/ogsf/gsds.c:109
@@ -15076,6 +15209,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15112,6 +15246,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/ogsf/gsd_legend.c:245
 #, c-format
@@ -15140,6 +15276,7 @@ msgstr "Não foi possível ler arquivo de categoria do mapa raster <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -15169,6 +15306,8 @@ msgstr "Não foi possível ler arquivo de categoria do mapa raster <%s>"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Invalid descriptor: %d"
 msgstr "Descritor inválido: %d"
 
@@ -15236,6 +15375,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15273,6 +15413,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of raster map <%s@%s>. %s"
 msgstr ""
@@ -20338,6 +20480,7 @@ msgstr "[%s]: cor não existe"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20429,6 +20572,8 @@ msgstr "script de shell a ser processado como trabalho em lote"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Cannot fetch row"
 #~ msgstr "não consegui obter informações da camada"
@@ -20509,6 +20654,7 @@ msgstr "script de shell a ser processado como trabalho em lote"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -20538,6 +20684,8 @@ msgstr "script de shell a ser processado como trabalho em lote"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "whose header file can't be opened."
 msgstr "cujo cabeçalho de arquivo não pode ser aberto."
 
@@ -20607,6 +20755,7 @@ msgstr "script de shell a ser processado como trabalho em lote"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20643,6 +20792,8 @@ msgstr "script de shell a ser processado como trabalho em lote"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "The python command does not work as expected!\n"
 "Please check your GRASS_PYTHON environment variable.\n"
@@ -20664,6 +20815,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20845,6 +20997,8 @@ msgstr "Para executar o módulo <%s>, adicione underscore no final da opção <%
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid ""
 "{}\n"
@@ -20882,6 +21036,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 <<<<<<< HEAD
@@ -20916,6 +21071,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Mapset <{mapset}> doesn't exist in GRASS Location <{loc}>. A new mapset "
 #~ "can be created by '-c' switch."
@@ -20980,6 +21137,7 @@ msgstr "Altera a permissão do arquivo para 'executável' para <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21009,6 +21167,8 @@ msgstr "Altera a permissão do arquivo para 'executável' para <%s>"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 msgid ""
 "{}\n"
@@ -21076,6 +21236,7 @@ msgstr "Não foi possível excluir feição/offset %lu do mapa vetorial <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21137,6 +21298,8 @@ msgstr "Não foi possível excluir feição/offset %lu do mapa vetorial <%s>"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
 msgid "Copy %s <%s> to current mapset as <%s>"
@@ -21205,6 +21368,7 @@ msgstr "Para executar o módulo <%s>, adicione underscore no final da opção <%
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21234,6 +21398,8 @@ msgstr "Para executar o módulo <%s>, adicione underscore no final da opção <%
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #~ msgid "Invalid value <%s> for parameter <%s>"
 #~ msgstr "Valor inválido <%s> para o parâmetro <%s>"
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -21251,6 +21417,7 @@ msgstr "Para executar o módulo <%s>, adicione underscore no final da opção <%
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21280,6 +21447,8 @@ msgstr "Para executar o módulo <%s>, adicione underscore no final da opção <%
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "Copia %s <%s> para o mapset atual como <%s>"
@@ -21319,6 +21488,7 @@ msgstr "Para executar o módulo <%s>, adicione underscore no final da opção <%
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21367,3 +21537,5 @@ msgstr "Para executar o módulo <%s>, adicione underscore no final da opção <%
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasslibs_ro.po b/locale/po/grasslibs_ro.po
index 988887dc571..2397656cba2 100644
--- a/locale/po/grasslibs_ro.po
+++ b/locale/po/grasslibs_ro.po
@@ -10466,6 +10466,7 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -10495,6 +10496,8 @@ msgid "Unable to read header file for raster map <%s@%s>. It is a reclass of ras
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgstr ""
 
 #: ../lib/raster/get_cellhd.c:78
@@ -10513,6 +10516,7 @@ msgid "Unable to open header file for raster map <%s@%s>. It seems that some pre
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10550,6 +10554,8 @@ msgid "Unable to open header file for raster map <%s@%s>. It seems that some pre
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
diff --git a/locale/po/grasslibs_ru.po b/locale/po/grasslibs_ru.po
index bf7e7943acd..a465033b586 100644
--- a/locale/po/grasslibs_ru.po
+++ b/locale/po/grasslibs_ru.po
@@ -2388,6 +2388,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2479,6 +2480,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/adj_cellhd.c:73 ../lib/gis/adj_cellhd.c:196
 #, c-format
@@ -2502,6 +2508,7 @@ msgstr "Неверное число столбцов: %d (разрешение:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/adj_cellhd.c:81 ../lib/gis/adj_cellhd.c:219
 #, c-format
 msgid "North must be north of South, but %g (north) <= %g (south"
@@ -2547,6 +2554,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/adj_cellhd.c:81 ../lib/gis/adj_cellhd.c:217
 #, c-format
 msgid "North must be north of South, but %g (north) <= %g (south"
@@ -2586,6 +2595,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2615,6 +2625,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/gis/adj_cellhd.c:81 ../lib/gis/adj_cellhd.c:219
 #, c-format
 msgid "North must be north of South, but %g (north) <= %g (south"
@@ -2634,6 +2646,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2676,6 +2689,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/gis/adj_cellhd.c:85 ../lib/gis/adj_cellhd.c:223
 #, c-format
@@ -2703,6 +2718,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2794,6 +2810,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/gis/adj_cellhd.c:112 ../lib/gis/adj_cellhd.c:271
 msgid "Invalid coordinates: negative number of columns"
@@ -2816,6 +2837,7 @@ msgstr "Недопустимые координаты: отрицательно
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/adj_cellhd.c:117 ../lib/gis/adj_cellhd.c:280
 msgid "Invalid coordinates: negative number of rows"
 msgstr ""
@@ -2860,6 +2882,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/adj_cellhd.c:115 ../lib/gis/adj_cellhd.c:274
 msgid "Invalid coordinates: negative number of rows"
 msgstr "Недопустимые координаты: отрицательное число рядов"
@@ -2882,6 +2906,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2911,6 +2936,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/gis/adj_cellhd.c:117 ../lib/gis/adj_cellhd.c:280
 msgid "Invalid coordinates: negative number of rows"
 msgstr ""
@@ -2929,6 +2956,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2971,6 +2999,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/gis/adj_cellhd.c:122 ../lib/gis/adj_cellhd.c:284
 msgid "NS resolution has been changed"
@@ -3001,6 +3031,7 @@ msgstr "Отличаются разрешения север-юг и восто
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/adj_cellhd.c:175
 #, c-format
 msgid "Illegal n-s resolution value for 3D: %g"
@@ -3046,6 +3077,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/adj_cellhd.c:173
 #, c-format
 msgid "Illegal n-s resolution value for 3D: %g"
@@ -3070,6 +3103,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3099,6 +3133,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/gis/adj_cellhd.c:175
 #, c-format
 msgid "Illegal n-s resolution value for 3D: %g"
@@ -3118,6 +3154,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3160,6 +3197,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/gis/adj_cellhd.c:182
 #, c-format
@@ -3183,6 +3222,7 @@ msgstr "Неверное число рядов для 3D: %d (разрешени
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/adj_cellhd.c:193
 #, c-format
 msgid "Illegal e-w resolution value for 3D: %g"
@@ -3228,6 +3268,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/adj_cellhd.c:191
 #, c-format
 msgid "Illegal e-w resolution value for 3D: %g"
@@ -3252,6 +3294,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3281,6 +3324,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/gis/adj_cellhd.c:193
 #, c-format
 msgid "Illegal e-w resolution value for 3D: %g"
@@ -3300,6 +3345,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3342,6 +3388,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/gis/adj_cellhd.c:200
 #, c-format
@@ -3364,6 +3412,7 @@ msgstr "Неверное число столбцов для 3D: %d (разреш
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3398,6 +3447,8 @@ msgstr "Неверное число столбцов для 3D: %d (разреш
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/adj_cellhd.c:206
 #, c-format
 msgid "Illegal t-b resolution value: %g"
@@ -3430,6 +3481,7 @@ msgid "Illegal t-b resolution value: %g"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3459,6 +3511,8 @@ msgid "Illegal t-b resolution value: %g"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/gis/adj_cellhd.c:208
 #, c-format
 msgid "Illegal t-b resolution value: %g"
@@ -3475,6 +3529,7 @@ msgid "Illegal t-b resolution value: %g"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3520,6 +3575,8 @@ msgid "Illegal t-b resolution value: %g"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/gis/adj_cellhd.c:213
@@ -3536,6 +3593,7 @@ msgid "Illegal depths value: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -3593,6 +3651,9 @@ msgid "Illegal depths value: %d"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/gis/adj_cellhd.c:236
@@ -3615,6 +3676,7 @@ msgid "Invalid coordinates: negative number of depths"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3652,6 +3714,8 @@ msgid "Invalid coordinates: negative number of depths"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/gis/adj_cellhd.c:236
@@ -5635,6 +5699,7 @@ msgstr "Внутренняя ошибка: недопустимый тип пр
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/vector/Vlib/write_pg.c:327 ../lib/vector/Vlib/write_ogr.c:134
 msgid "Invalid offset (%"
 =======
@@ -5678,6 +5743,8 @@ msgid "Invalid offset (%"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser_dependencies.c:514
 #, fuzzy
 msgid "Internal error: the number of options is < 0"
@@ -5699,6 +5766,7 @@ msgid "Invalid offset (%"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/vector/Vlib/write_pg.c:327 ../lib/vector/Vlib/write_ogr.c:134
 msgid "Invalid offset (%"
@@ -5773,6 +5841,11 @@ msgid "Invalid offset (%"
 #: ../lib/vector/Vlib/write_pg.c:327 ../lib/vector/Vlib/write_ogr.c:134
 msgid "Invalid offset (%"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/vector/Vlib/write_pg.c:327 ../lib/vector/Vlib/write_ogr.c:134
+msgid "Invalid offset (%"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/vector/Vlib/write_pg.c:348 ../lib/vector/Vlib/write_ogr.c:140
@@ -5790,6 +5863,7 @@ msgid "Unable to delete feature"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5827,6 +5901,8 @@ msgid "Unable to delete feature"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -7563,6 +7639,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -7585,6 +7662,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to rewrite feature/offset %"
 msgstr ""
 
@@ -7601,6 +7680,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -7668,6 +7748,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/write.c:299
 msgid "Unable to restore feature/offset %"
@@ -12300,6 +12382,7 @@ msgstr "Повреждён файл условий для категорий р
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12388,6 +12471,8 @@ msgstr "Верх должен быть больше Низа"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/imagery/iscatt_core.c:958 ../lib/imagery/iclass_statistics.c:225
 #, c-format
 msgid "prepare_signature: scan line %d has odd number of points."
@@ -18074,6 +18159,7 @@ msgstr "Верх должен быть больше Низа"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18103,6 +18189,8 @@ msgstr "Верх должен быть больше Низа"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "который отсутствует."
 
@@ -18169,6 +18257,7 @@ msgstr "Верх должен быть больше Низа"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18211,5 +18300,7 @@ msgstr "Верх должен быть больше Низа"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to open header file for raster map <%s@%s>"
 msgstr "Невозможно открыть файл заголовка для растрового слоя <%s@%s>"
diff --git a/locale/po/grasslibs_th.po b/locale/po/grasslibs_th.po
index 401c74170a9..4a2e184a51c 100644
--- a/locale/po/grasslibs_th.po
+++ b/locale/po/grasslibs_th.po
@@ -3638,6 +3638,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3679,6 +3680,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset.c:38
 msgid "MAPSET is not set"
 msgstr "ยังไม่ได้กำหนด ชุดแผนที่"
@@ -3915,6 +3918,7 @@ msgstr "none"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3951,6 +3955,8 @@ msgstr "none"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -10854,6 +10860,7 @@ msgstr "[%s]: ไม่ใช่ค่าสี"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10933,6 +10940,8 @@ msgstr "ค่าความลึก ไม่ถูกต้อง"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Attributes for category %d not found"
 #~ msgstr "ไม่พบ ข้อมูลสำหรับแสดง %d  จากฐานข้อมูล"
@@ -11020,6 +11029,7 @@ msgstr "ค่าความลึก ไม่ถูกต้อง"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -11049,6 +11059,8 @@ msgstr "ค่าความลึก ไม่ถูกต้อง"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Illegal row value"
 msgstr "ค่าแถว ไม่ถูกต้อง"
 
@@ -11106,6 +11118,7 @@ msgstr "ค่าความลึก ไม่ถูกต้อง"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -11148,5 +11161,7 @@ msgstr "ค่าความลึก ไม่ถูกต้อง"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Top must be larger than Bottom"
 msgstr "ค่าบน ต้องมากกว่าล่าง"
diff --git a/locale/po/grasslibs_tr.po b/locale/po/grasslibs_tr.po
index 54ff1c82966..e9eb6db2b86 100644
--- a/locale/po/grasslibs_tr.po
+++ b/locale/po/grasslibs_tr.po
@@ -3742,6 +3742,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3783,6 +3784,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset.c:38
 msgid "MAPSET is not set"
 msgstr "MAPSET ayarlanmadı"
@@ -4010,6 +4013,7 @@ msgstr "<%s> harita takımındaki <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -4058,6 +4062,9 @@ msgstr "<%s> harita takımındaki <%s>"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -4653,6 +4660,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4690,6 +4698,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
 msgstr ""
@@ -9482,6 +9492,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -9573,6 +9584,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/net_build.c:467
 msgid "Cannot add network arc representing turn."
@@ -12063,6 +12079,7 @@ msgstr "[%s]:Böyle bir renk yok"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12148,6 +12165,8 @@ msgstr "Uygun olmayan derinlik değeri"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Unable to open null file <%s>"
 #~ msgstr "datum tablo dosyası açılamıyor <%s>"
@@ -12268,6 +12287,7 @@ msgstr "Uygun olmayan derinlik değeri"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -12297,6 +12317,8 @@ msgstr "Uygun olmayan derinlik değeri"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "which is missing."
 msgstr "kayıp olan"
 
@@ -12360,6 +12382,7 @@ msgstr "Uygun olmayan derinlik değeri"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12402,5 +12425,7 @@ msgstr "Uygun olmayan derinlik değeri"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Top must be larger than Bottom"
 msgstr "Tepe dipten büyük olmalıdır"
diff --git a/locale/po/grasslibs_vi.po b/locale/po/grasslibs_vi.po
index 01a0581d0b1..4e750adecf3 100644
--- a/locale/po/grasslibs_vi.po
+++ b/locale/po/grasslibs_vi.po
@@ -10224,6 +10224,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -10315,6 +10316,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../lib/vector/Vlib/header.c:131
 #, c-format
@@ -13078,6 +13084,7 @@ msgstr "[%s]: Không có màu này"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Invalid offset (%ld)"
 msgstr "Độ lệch không hợp lệ (%ld)"
 
@@ -13122,6 +13129,8 @@ msgstr "Độ lệch không hợp lệ (%ld)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Cannot fetch row"
 #~ msgstr "Không thể lấy hàng"
 
@@ -13146,6 +13155,7 @@ msgstr "Độ lệch không hợp lệ (%ld)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -13175,6 +13185,8 @@ msgstr "Độ lệch không hợp lệ (%ld)"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Invalid offset (%ld)"
 msgstr "Độ lệch không hợp lệ (%ld)"
 
@@ -13193,6 +13205,7 @@ msgstr "Độ lệch không hợp lệ (%ld)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13235,5 +13248,7 @@ msgstr "Độ lệch không hợp lệ (%ld)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Copy %s <%s> to current mapset as <%s>"
 msgstr "Chép %s < %s> vào bộ bản độ hiện tại thành <%s>"
diff --git a/locale/po/grasslibs_zh.po b/locale/po/grasslibs_zh.po
index 3c179fd3cc9..181e67f606e 100644
--- a/locale/po/grasslibs_zh.po
+++ b/locale/po/grasslibs_zh.po
@@ -3752,6 +3752,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3793,6 +3794,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser_help.c:198
 msgid "Flags:"
 msgstr ""
@@ -4080,6 +4083,7 @@ msgstr "<%s>在地图集<%s>中"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -4128,6 +4132,9 @@ msgstr "<%s>在地图集<%s>中"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #: ../lib/manage/do_copy.c:43
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
@@ -4434,6 +4441,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4471,6 +4479,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Copying %s <%s> to current mapset as <%s>"
 msgstr ""
@@ -12208,6 +12218,7 @@ msgstr "[%s]: 没有此颜色"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12287,6 +12298,8 @@ msgstr "非法的深度值"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "ERROR: option <%s>: <%s> exists.\n"
 #~ msgstr "错误：选项<%s>：<%s>已存在。\n"
 
@@ -12403,6 +12416,7 @@ msgstr "非法的深度值"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -12432,6 +12446,8 @@ msgstr "非法的深度值"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Illegal row value"
 msgstr "非法的行值"
 
@@ -12489,6 +12505,7 @@ msgstr "非法的深度值"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12531,5 +12548,7 @@ msgstr "非法的深度值"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Top must be larger than Bottom"
 msgstr "顶部的值必须比底部的值大"
diff --git a/locale/po/grassmods_ar.po b/locale/po/grassmods_ar.po
index 90736d54680..b0b7b0859e2 100644
--- a/locale/po/grassmods_ar.po
+++ b/locale/po/grassmods_ar.po
@@ -91651,6 +91651,7 @@ msgstr "اسم خريطة الراستر المخرجة"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -91683,6 +91684,8 @@ msgstr "اسم خريطة الراستر المخرجة"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy, c-format
 #~ msgid "Unable to create new location <%s>"
 #~ msgstr "%s:لم يتم إنشاء الجدول"
@@ -91905,6 +91908,7 @@ msgstr "اسم خريطة الراستر المخرجة"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -91938,6 +91942,8 @@ msgstr "اسم خريطة الراستر المخرجة"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../scripts/r.fillnulls/r.fillnulls.py:161
 msgid "A user raster mask (MASK) is present. Saving it..."
 msgstr ""
@@ -93829,6 +93835,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -93875,6 +93882,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Creates a raster map from LAS LiDAR points using univariate statistics "
diff --git a/locale/po/grassmods_cs.po b/locale/po/grassmods_cs.po
index e0beb2c0629..a8a5e8fb45a 100644
--- a/locale/po/grassmods_cs.po
+++ b/locale/po/grassmods_cs.po
@@ -28010,6 +28010,7 @@ msgid "Apriori Phi (roll) standard deviation"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -28060,6 +28061,9 @@ msgid "Apriori Phi (roll) standard deviation"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:117
@@ -28901,6 +28905,7 @@ msgid "Name of the directory where the image and metadata file are stored (*.SAF
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28938,6 +28943,8 @@ msgid "Name of the directory where the image and metadata file are stored (*.SAF
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -60673,6 +60680,7 @@ msgstr "Vektorová mapa '%s' již existuje a bude přepsána."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -60705,6 +60713,8 @@ msgstr "Vektorová mapa '%s' již existuje a bude přepsána."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -60721,6 +60731,7 @@ msgstr "Vektorová mapa '%s' již existuje a bude přepsána."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -60753,6 +60764,8 @@ msgstr "Vektorová mapa '%s' již existuje a bude přepsána."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -61041,6 +61054,7 @@ msgstr[3] "%d záznamů vybráno z tabulky"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -61087,6 +61101,9 @@ msgstr[3] "%d záznamů vybráno z tabulky"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr "Vektorová mapa <%s> již existuje"
@@ -73845,6 +73862,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -73895,6 +73913,9 @@ msgstr ""
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "<%s> does not exist. Skipping."
 msgstr ""
@@ -73913,6 +73934,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -73950,6 +73972,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "<%s> does not exist. Skipping."
 msgstr ""
@@ -73976,6 +74000,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -75305,6 +75330,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../general/g.copy/main.c:79
 #, c-format
@@ -86373,6 +86400,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Scale for color rule values"
 msgstr ""
 =======
@@ -86444,6 +86472,10 @@ msgstr ""
 msgid "Scale for color rule values"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Scale for color rule values"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.colors/edit_colors.c:284 ../raster/r.colors/edit_colors.c:318
 #, c-format
@@ -86547,6 +86579,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Unable to open color rule"
 msgstr ""
 =======
@@ -86618,6 +86651,10 @@ msgstr ""
 msgid "Unable to open color rule"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Unable to open color rule"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.colors/rules.c:179
 #, c-format
@@ -88351,6 +88388,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -88373,6 +88411,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Coordinates to profile"
 msgstr ""
 
@@ -88403,6 +88443,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -88512,6 +88553,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:302
 #, c-format
@@ -88534,6 +88577,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -88556,6 +88600,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -88573,6 +88619,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -88643,6 +88690,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -88696,6 +88745,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Internal error in %s()"
 msgstr ""
@@ -88781,6 +88831,11 @@ msgstr ""
 msgid "Internal error in %s()"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Internal error in %s()"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/bordwalk.c:92 ../raster/r.proj/bordwalk.c:139
 #, c-format
@@ -92700,6 +92755,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -92732,6 +92788,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Classification of a vector maps based on the values in attribute tables"
diff --git a/locale/po/grassmods_de.po b/locale/po/grassmods_de.po
index b1ad48a4679..94ed7b93c0b 100644
--- a/locale/po/grassmods_de.po
+++ b/locale/po/grassmods_de.po
@@ -23,6 +23,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -95,6 +96,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+"POT-Creation-Date: 2024-05-23 03:37-0600\n"
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 "PO-Revision-Date: 2023-08-12 13:08+0000\n"
@@ -118,6 +124,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -209,6 +216,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Last-Translator: Markus \n"
 "Language-Team: German \n"
@@ -234,6 +246,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "X-Generator: Weblate 4.12.2\n"
 =======
 <<<<<<< HEAD
@@ -276,6 +289,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "X-Generator: Weblate 4.16.4\n"
 =======
 "X-Generator: Weblate 4.12.2\n"
@@ -294,6 +309,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "X-Generator: Weblate 4.12.2\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -377,6 +393,11 @@ msgstr ""
 "X-Generator: Weblate 4.12.2\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"X-Generator: Weblate 4.12.2\n"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../temporal/t.connect/main.c:34
 #: ../locale/scriptstrings/t.merge_to_translate.c:2
@@ -497,6 +518,7 @@ msgstr "Metadaten"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -588,6 +610,11 @@ msgstr "Metadaten"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Prints/sets general temporal GIS database connection for current mapset."
 msgstr ""
@@ -1385,6 +1412,7 @@ msgstr "Kann das vorherbestimmte Vektoröffnungslevel nicht setzen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1422,6 +1450,8 @@ msgstr "Kann das vorherbestimmte Vektoröffnungslevel nicht setzen."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to open vector map <%s>"
 msgstr "Kann die Vektorkarte <%s> nicht öffnen."
 
@@ -1525,6 +1555,7 @@ msgstr "Kann den Treiber <%s> nicht starten."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1594,6 +1625,10 @@ msgstr "Kann den Treiber <%s> nicht starten."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Input raster map <%s> is not floating point (process DN using i.landsat.toar "
 "to radiance first)"
@@ -1623,6 +1658,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1714,6 +1750,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../doc/vector/v.example/main.c:138 ../raster/r.to.vect/main.c:189
 #: ../raster/r.contour/main.c:170 ../raster/r.volume/main.c:248
@@ -1900,6 +1941,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1991,6 +2033,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../raster/r.external/link.c:248
 #, c-format
@@ -26531,6 +26578,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26622,6 +26670,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../imagery/i.smap/write_img.c:15
 msgid "Writing output raster map(s)..."
@@ -27006,6 +27059,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27097,6 +27151,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Uses red and nir bands mostly, and some indices require additional bands."
 msgstr ""
@@ -27253,6 +27312,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27344,6 +27404,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "If data is in Digital Numbers (i.e. integer type), give the max bits (i.e. 8 "
 "for Landsat -> [0-255])"
@@ -27407,6 +27472,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27498,6 +27564,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "msavi index requires red and nir maps, and 3 parameters related to soil line"
 msgstr ""
@@ -28509,6 +28580,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Segmentation processes stopped at %d due to reaching max iteration limit, "
 "more merges may be possible"
@@ -28553,6 +28625,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Negative value %s for option '%s': disabling"
 =======
 msgid ""
@@ -28573,6 +28647,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -28602,6 +28677,8 @@ msgid ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid ""
 "Segmentation processes stopped at %d due to reaching max iteration limit, "
 "more merges may be possible"
@@ -28620,6 +28697,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28662,6 +28740,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.segment/parse_args.c:247
@@ -28999,6 +29079,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29090,6 +29171,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Name of the difference map of temperature from surface skin to about 2 m "
 "height [K]"
@@ -29398,6 +29484,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29489,6 +29576,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Calculates Top of Atmosphere Radiance/Reflectance/Brightness Temperature "
 "from ASTER DN."
@@ -32417,6 +32509,7 @@ msgid "Apriori Phi (roll) standard deviation"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -32467,6 +32560,9 @@ msgid "Apriori Phi (roll) standard deviation"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:117
@@ -32484,6 +32580,7 @@ msgid "Apriori Kappa (yaw) standard deviation"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32521,6 +32618,8 @@ msgid "Apriori Kappa (yaw) standard deviation"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -34758,6 +34857,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -34849,6 +34949,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:24
 #, fuzzy
@@ -34893,6 +34998,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34965,6 +35071,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:36
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:34
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Threshold for cleaning small areas from shadow mask (in square meters)"
@@ -34990,6 +35101,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -35081,6 +35193,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/i.sentinel.mask_to_translate.c:38
@@ -35219,6 +35336,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -35310,6 +35428,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/t.snap_to_translate.c:1
@@ -37586,6 +37709,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -37677,6 +37801,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "nearest;nearest neighbor;bilinear;bilinear interpolation;bicubic;bicubic "
 "interpolation;lanczos;lanczos filter;bilinear_f;bilinear interpolation with "
@@ -38040,6 +38169,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -38131,6 +38261,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/t.sample_to_translate.c:5
@@ -38281,6 +38416,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -38372,6 +38508,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.out.maxent_swd_to_translate.c:19
@@ -38476,6 +38617,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -38567,6 +38709,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.divergence_to_translate.c:3
@@ -38883,6 +39030,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -38974,6 +39122,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.mapcalc.tiled_to_translate.c:16
@@ -39057,6 +39210,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -39148,6 +39302,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/db.join_to_translate.c:6
@@ -39840,6 +39999,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -39931,6 +40091,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.in.wms_to_translate.c:48
@@ -40384,6 +40549,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -40475,6 +40641,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/g.extension_to_translate.c:1
@@ -41510,6 +41681,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -41601,6 +41773,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.net.curvedarcs_to_translate.c:10
@@ -45259,6 +45436,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -45350,6 +45528,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:16
@@ -45925,6 +46108,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -46016,6 +46200,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:1
 #, fuzzy
@@ -46075,6 +46264,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -46166,6 +46356,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:8
 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:10
@@ -46255,6 +46450,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -46307,6 +46503,9 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/v.vect.stats.multi_to_translate.c:22
 msgid "areas_where,count_column,stats_column"
@@ -46412,6 +46611,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -46503,6 +46703,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.green.hydro.recommended_to_translate.c:3
@@ -46525,6 +46730,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -46566,6 +46772,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Name of vector map with interesting segments of rivers"
 msgstr "Name existierender Vektorkarte mit Punkten"
 
@@ -46586,6 +46794,7 @@ msgstr "Name existierender Vektorkarte mit Punkten"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -46655,6 +46864,10 @@ msgstr "Name existierender Vektorkarte mit Punkten"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Output ground reflected irradiation raster map [Wh.m-2] (mode 2) integrated "
 "over specified time period"
@@ -47892,6 +48105,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -47983,6 +48197,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.popgrowth_to_translate.c:2
@@ -48172,6 +48391,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -48263,6 +48483,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/wxpyimgview_to_translate.c:5
@@ -49003,6 +49228,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -49094,6 +49320,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/v.rast.bufferstats_to_translate.c:18
 #, fuzzy
@@ -51882,6 +52113,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -51973,6 +52205,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/g.proj.identify_to_translate.c:8
 #, fuzzy
@@ -51998,6 +52235,7 @@ msgstr "Unbekannter EPSG-Code %s"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -52033,6 +52271,8 @@ msgstr "Unbekannter EPSG-Code %s"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Print projection info in Proj4 format"
 msgstr "Gebe die Projektionsinformationen im PROJ.4-Format aus."
 =======
@@ -52052,6 +52292,7 @@ msgstr "Gebe die Projektionsinformationen im PROJ.4-Format aus."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -52103,6 +52344,8 @@ msgstr "Gebe die Projektionsinformationen im PROJ.4-Format aus."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Uploads values of multiple rasters at positions of vector points to the "
 "table."
@@ -52126,6 +52369,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -52217,6 +52461,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/g.proj.identify_to_translate.c:10
 #, fuzzy
@@ -52343,6 +52592,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -52434,6 +52684,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.plane_to_translate.c:6
@@ -52465,6 +52720,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -52556,6 +52812,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.plane_to_translate.c:8
@@ -52614,6 +52875,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -52705,6 +52967,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.import_to_translate.c:5
@@ -53913,6 +54180,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -54016,6 +54284,11 @@ msgid "(default: unlimited)"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.in.wfs_to_translate.c:10
@@ -54352,6 +54625,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -54443,6 +54717,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/v.centroids_to_translate.c:1
 msgid "Adds missing centroids to closed boundaries."
@@ -54596,6 +54875,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -54687,6 +54967,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.estimap.recreation_to_translate.c:16
@@ -54732,6 +55017,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -54823,6 +55109,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.estimap.recreation_to_translate.c:21
@@ -54857,6 +55148,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -54948,6 +55240,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.estimap.recreation_to_translate.c:24
@@ -55327,6 +55624,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55362,6 +55660,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Output vector points map of vertical deflections [m]"
 msgstr "Ausgabe-Vektorkarte, in die die Fehlern geschrieben werden."
 =======
@@ -55381,6 +55681,7 @@ msgstr "Ausgabe-Vektorkarte, in die die Fehlern geschrieben werden."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -55432,6 +55733,8 @@ msgstr "Ausgabe-Vektorkarte, in die die Fehlern geschrieben werden."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "where conditions of SQL statement without 'where' keyword. (example: "
 "cf_mst_ud = 1 or cf_eb_ud > 100)"
@@ -55454,6 +55757,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -55545,6 +55849,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:1
 msgid "Lists registered maps of a space time raster dataset."
@@ -55701,6 +56010,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -55792,6 +56102,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.learn.train_to_translate.c:1
@@ -56479,6 +56794,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56570,6 +56886,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:1
@@ -56672,6 +56993,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56763,6 +57085,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/t.rast.extract_to_translate.c:6
@@ -58737,6 +59064,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58828,6 +59156,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.viewshed.exposure_to_translate.c:10
 #, fuzzy
@@ -58876,6 +59209,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58967,6 +59301,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.viewshed.exposure_to_translate.c:16
@@ -64040,6 +64379,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "Export categories and corresponding colors as QGIS colour file or csv file. "
 "Non-existing categories and their colour definitions will be removed."
 =======
@@ -64083,6 +64423,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Export categories and corresponding colors as QGIS color file or csv file. "
 "Non-existing categories and their color definitions will be removed."
 =======
@@ -64103,6 +64445,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -64132,6 +64475,8 @@ msgid ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 "Export categories and corresponding colors as QGIS colour file or csv file. "
 "Non-existing categories and their colour definitions will be removed."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -64149,6 +64494,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -64191,6 +64537,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.category.trim_to_translate.c:6
@@ -65083,6 +65431,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -65174,6 +65523,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.green.biomassfor.financial_to_translate.c:52
@@ -65342,6 +65696,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -65433,6 +65788,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/g.isis3mt_to_translate.c:8
@@ -65560,6 +65920,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -65651,6 +66012,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.random.weight_to_translate.c:9
@@ -65779,6 +66145,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -65870,6 +66237,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.civil_to_translate.c:1
@@ -66220,6 +66592,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -66311,6 +66684,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.futures.devpressure_to_translate.c:5
@@ -67000,6 +67378,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -67091,6 +67470,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.sun.hourly_to_translate.c:34
 #, fuzzy
@@ -67124,6 +67508,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -67215,6 +67600,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 "Ausgabe-Rasterkarte der diffusen Sonneneinstrahlung [W.m-2] (Modus 1) oder "
 "der Abstrahlung [Wh.m-2.day-1] (Modus 2)."
@@ -67553,6 +67943,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -67644,6 +68035,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.terrain.texture_to_translate.c:9
@@ -67704,6 +68100,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -67795,6 +68192,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.series.diversity_to_translate.c:4
@@ -67988,6 +68390,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -68079,6 +68482,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:39
 #, fuzzy
@@ -68099,6 +68507,7 @@ msgstr "Habe %d Linien beschriftet"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -68131,6 +68540,8 @@ msgstr "Habe %d Linien beschriftet"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:41
 #, fuzzy
 msgid "Boxplot color"
@@ -68155,6 +68566,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -68187,6 +68599,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:51
 msgid "Set flier size"
 =======
@@ -68265,6 +68679,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -68356,6 +68771,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/t.unregister_to_translate.c:1
@@ -68389,6 +68809,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -68480,6 +68901,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/t.unregister_to_translate.c:8
@@ -69238,6 +69664,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -69329,6 +69756,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:10
@@ -71220,6 +71652,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -71311,6 +71744,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.area.createweight_to_translate.c:16
 #, fuzzy
@@ -71336,6 +71774,7 @@ msgstr "Name der Spalte mit den X-Koordinaten."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -71371,6 +71810,8 @@ msgstr "Name der Spalte mit den X-Koordinaten."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Format: All values must be >0"
 msgstr "Der Schwellwert muss >=0 sein."
 =======
@@ -71390,6 +71831,7 @@ msgstr "Der Schwellwert muss >=0 sein."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -71441,6 +71883,8 @@ msgstr "Der Schwellwert muss >=0 sein."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "E.g.: 'x double precision, y double precision, cat int, name varchar(10)'"
 msgstr ""
@@ -71463,6 +71907,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -71554,6 +71999,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.area.createweight_to_translate.c:19
 #, fuzzy
@@ -71641,6 +72091,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -71732,6 +72183,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.area.createweight_to_translate.c:28
 #, fuzzy
@@ -71775,6 +72231,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -71866,6 +72323,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.area.createweight_to_translate.c:35
 #, fuzzy
@@ -72121,6 +72583,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -72212,6 +72675,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.valley.bottom_to_translate.c:8
 msgid "Threshold (t) for transformation of Elevation Percentile (Lowness)"
@@ -72327,6 +72795,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -72418,6 +72887,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/i.sentinel.coverage_to_translate.c:9
 #, fuzzy
@@ -72438,6 +72912,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -72479,6 +72954,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Area input vector maps"
 msgstr "Keine Eingabe-Vektorkarten!"
 
@@ -72545,6 +73022,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -72614,6 +73092,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Minor ellipsoid axis of the transformation grid's destination coordinate "
 "system"
@@ -72660,6 +73142,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -72751,6 +73234,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.fidimo_to_translate.c:1
 msgid ""
@@ -72915,6 +73403,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -73006,6 +73495,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/i.landsat.qa_to_translate.c:3
@@ -73242,6 +73736,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -73333,6 +73828,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/g.gui.cswbrowser_to_translate.c:1
@@ -73830,6 +74330,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -73921,6 +74422,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:1
@@ -80361,6 +80867,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -80393,6 +80900,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.in.ahn_to_translate.c:1
 msgid ""
@@ -80476,6 +80985,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -80567,6 +81077,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:4
 #, fuzzy
@@ -85650,6 +86165,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -85741,6 +86257,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.net.salesman/main.c:182 ../vector/v.net.iso/main.c:149
@@ -87437,6 +87958,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -87472,6 +87994,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to open file '%s' for writing"
 =======
 =======
@@ -87490,6 +88014,7 @@ msgid "Unable to open file '%s' for writing"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -87538,6 +88063,8 @@ msgid "Unable to open file '%s' for writing"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Input layer must be set to a particular layer, not <%s>, when using <%s> "
 "option or <-%c> flag"
@@ -87572,6 +88099,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -87663,6 +88191,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.decimate/copy_tab.c:84 ../vector/v.extract/copy_tab.c:89
@@ -88967,6 +89500,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -89058,6 +89592,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Density is computed using a moving kernel. Optionally generates a vector "
 "density map on a vector network."
@@ -89143,6 +89682,7 @@ msgstr "Kernel Funktion"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -89234,6 +89774,11 @@ msgstr "Kernel Funktion"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Try to calculate an optimal radius with given 'radius' taken as maximum "
 "(experimental)"
@@ -89264,6 +89809,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -89355,6 +89901,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "In network mode, normalize values by sum of density multiplied by length of "
 "each segment. Integral over the output map then gives 1.0 * multiplier"
@@ -89385,6 +89936,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -89476,6 +90028,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Use option net_output if you compute network density. Name provided in "
 "option output will be used for net_output."
@@ -89510,6 +90067,7 @@ msgstr "Unbekannte Kernelfunktion"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -89601,6 +90159,11 @@ msgstr "Unbekannte Kernelfunktion"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Optimal standard deviation calculation is supported only for node method "
 "'none' and kernel function 'gaussian'."
@@ -90933,6 +91496,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -91024,6 +91588,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 "Keine Koordinaten um Ausgabe zu erzeugen. Vielleicht wurde ein leerer Vektor-"
 "Typ ausgewählt."
@@ -91094,6 +91663,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -91185,6 +91755,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 "Kann Felder der Attributtabelle für Layer < 1 nicht exportieren. Überspringe "
 "den Export."
@@ -91596,6 +92171,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -91687,6 +92263,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.external/args.c:44
@@ -91743,6 +92324,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -91778,6 +92360,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Layer <%s> not available"
 msgstr "Layer <%s> ist nicht vorhanden."
 =======
@@ -91797,6 +92381,7 @@ msgstr "Layer <%s> ist nicht vorhanden."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -91848,6 +92433,8 @@ msgstr "Layer <%s> ist nicht vorhanden."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Direct read access to OGR layers is not supported by this module. Run %s to "
 "create a link as GRASS vector map in the current mapset."
@@ -93871,6 +94458,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -93962,6 +94550,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../vector/v.net.steiner/main.c:393
 msgid "Categories of points on terminals (layer is specified by nlayer)"
@@ -95413,6 +96006,7 @@ msgstr "Erzeugung"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -95458,6 +96052,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Name for output vector map defined as a link to the PostGIS feature table"
 msgstr ""
@@ -96640,6 +97236,7 @@ msgstr "Kann die Layer-Informationen für die Punkte nicht erhalten."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -96675,6 +97272,8 @@ msgstr "Kann die Layer-Informationen für die Punkte nicht erhalten."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to drop table: %s"
 msgstr "Kann die Tabelle <%s> nicht löschen."
 =======
@@ -96694,6 +97293,7 @@ msgstr "Kann die Tabelle <%s> nicht löschen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -96745,6 +97345,8 @@ msgstr "Kann die Tabelle <%s> nicht löschen."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Invalid FID column (%s). FID column must be integer. Please specify "
 "different FID column by 'options=\"FID=\"'."
@@ -96770,6 +97372,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -96805,6 +97408,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to select line id values from %s.%s."
 msgstr "Kann die Linien IDs nicht selektieren von %s.%s."
 =======
@@ -96824,6 +97429,7 @@ msgstr "Kann die Linien IDs nicht selektieren von %s.%s."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -96875,6 +97481,8 @@ msgstr "Kann die Linien IDs nicht selektieren von %s.%s."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Column (%s) already exists in the table. Please specify different geometry "
 "column by 'options=\"GEOMETRY_NAME=\"'."
@@ -97233,6 +97841,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -97324,6 +97933,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../vector/v.lrs/v.lrs.create/main.c:805
 #, c-format
@@ -98055,6 +98669,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -98146,6 +98761,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.patch/main.c:99
@@ -98185,6 +98805,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -98225,6 +98846,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 msgstr ""
 "Hänge Dateien an eine existierende Datei an. Das Überschreiben von "
@@ -98249,6 +98872,7 @@ msgid "Missing attribute table for vector map <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -98285,6 +98909,8 @@ msgid "Missing attribute table for vector map <%s>"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.patch/main.c:252
@@ -98333,6 +98959,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -98424,6 +99051,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.patch/main.c:256
@@ -100570,6 +101202,7 @@ msgstr "Name der Hintergrund-Vektorkarte(n)."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -100661,6 +101294,11 @@ msgstr "Name der Hintergrund-Vektorkarte(n)."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Snap added or modified features in the given threshold to the nearest "
 "existing feature"
@@ -101707,6 +102345,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -101798,6 +102437,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Makes each cell value a function of the attribute values assigned to the "
 "vector points or centroids in a radius around it, and stores new cell values "
@@ -101825,6 +102469,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -101916,6 +102561,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Method for aggregate statistics (count if non given)"
 msgstr ""
 
@@ -102664,6 +103314,7 @@ msgstr "Art des Vektorobjekts"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -102755,6 +103406,11 @@ msgstr "Art des Vektorobjekts"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Combination of types is not supported by all output formats. Default is to "
 "use first type found in input vector map."
@@ -102834,6 +103490,7 @@ msgstr "Überspringe den Export der GRASS-Kategorie-ID ('cat')-Spalte"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -102925,6 +103582,11 @@ msgstr "Überspringe den Export der GRASS-Kategorie-ID ('cat')-Spalte"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Also export features without category (not labeled). Otherwise only features "
 "with category are exported."
@@ -102964,6 +103626,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -103055,6 +103718,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Create a new empty layer in defined OGR datasource and exit. Nothing is read "
 "from input."
@@ -103147,6 +103815,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -103238,6 +103907,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The map contains islands. With the -c flag, islands will appear as filled "
 "areas, not holes in the output map."
@@ -103295,6 +103969,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -103336,6 +104011,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "%d centroid found, but not requested to be exported. Verify 'type' parameter."
 msgid_plural ""
 "%d centroids found, but not requested to be exported. Verify 'type' "
@@ -103381,6 +104058,7 @@ msgid_plural ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -103450,6 +104128,10 @@ msgid_plural ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "%d boundary found, but not requested to be exported. Verify 'type' parameter."
 msgid_plural ""
 "%d boundaries found, but not requested to be exported. Verify 'type' "
@@ -103471,6 +104153,7 @@ msgid_plural ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -103562,6 +104245,11 @@ msgid_plural ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr[0] ""
 msgstr[1] ""
 
@@ -103585,6 +104273,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -103626,6 +104315,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "%d volume found, but not requested to be exported. Verify 'type' parameter."
 msgid_plural ""
 "%d volumes found, but not requested to be exported. Verify 'type' parameter."
@@ -103648,6 +104339,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -103717,6 +104409,10 @@ msgstr[1] ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "%d centroid found, but not requested to be exported. Verify 'type' parameter."
 msgid_plural ""
 "%d centroids found, but not requested to be exported. Verify 'type' "
@@ -103769,6 +104465,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -103860,6 +104557,11 @@ msgstr[1] ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "No points found, but requested to be exported. Will skip this feature type."
 msgstr ""
@@ -103885,6 +104587,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -103976,6 +104679,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "No lines found, but requested to be exported. Will skip this feature type."
 msgstr ""
@@ -104001,6 +104709,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -104092,6 +104801,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "No boundaries found, but requested to be exported. Will skip this feature "
 "type."
@@ -104118,6 +104832,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -104209,6 +104924,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "No areas found, but requested to be exported. Will skip this feature type."
 msgstr ""
@@ -104234,6 +104954,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -104325,6 +105046,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "No centroids found, but requested to be exported. Will skip this feature "
 "type."
@@ -104351,6 +105077,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -104442,6 +105169,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "No faces found, but requested to be exported. Will skip this feature type."
 msgstr ""
@@ -104467,6 +105199,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -104558,6 +105291,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "No kernels found, but requested to be exported. Will skip this feature type."
 msgstr ""
@@ -104583,6 +105321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -104674,6 +105413,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "No volumes found, but requested to be exported. Will skip this feature type."
 msgstr ""
@@ -104728,6 +105472,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "(parameter 'lco') or '-z' flag to export in 3D rather than 2D (default)"
 =======
 <<<<<<< HEAD
@@ -104770,6 +105515,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "(parameter 'lco') to export in 3D rather than 2D (default)"
 =======
 "(parameter 'lco') or '-z' flag to export in 3D rather than 2D (default)"
@@ -104788,6 +105535,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "(parameter 'lco') or '-z' flag to export in 3D rather than 2D (default)"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -104871,6 +105619,11 @@ msgid ""
 "(parameter 'lco') or '-z' flag to export in 3D rather than 2D (default)"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"(parameter 'lco') or '-z' flag to export in 3D rather than 2D (default)"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.out.ogr/main.c:644
@@ -105420,6 +106173,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -105452,6 +106206,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.surf.rst/main.c:440 ../vector/v.surf.rst/main.c:445
 #: ../vector/v.surf.rst/main.c:450 ../vector/v.surf.rst/main.c:456
 =======
@@ -105468,6 +106224,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -105500,6 +106257,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.surf.rst/main.c:437 ../vector/v.surf.rst/main.c:442
 #: ../vector/v.surf.rst/main.c:447 ../vector/v.surf.rst/main.c:453
 =======
@@ -105551,6 +106310,7 @@ msgstr "Ändere Spaltenname zu Kleinbuchstaben"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -105597,6 +106357,9 @@ msgstr "Ändere Spaltenname zu Kleinbuchstaben"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Output vector map name <%s> is not valid map name"
 msgstr "Name der Ausgabe-Vektorkarte <%s> ist kein gültiger Kartenname."
@@ -105719,6 +106482,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)."
 =======
@@ -105762,6 +106526,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "No features for %s selected. Please check options '%s', '%s'."
 =======
 msgid ""
@@ -105781,6 +106547,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -105810,6 +106577,8 @@ msgid ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid ""
 "Option <%s> will be ignored. OGR doesn't support it for selected format (%s)."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -105827,6 +106596,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -105869,6 +106639,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.net.connectivity/main.c:163
@@ -105891,6 +106663,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Option <%s> will be ignored. Multiple geometry fields are supported by GDAL "
 ">= 1.11"
@@ -105935,6 +106708,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%s is empty"
 msgstr "%s ist leer"
 
@@ -105961,6 +106736,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -105990,6 +106766,8 @@ msgid ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid ""
 "Option <%s> will be ignored. Multiple geometry fields are supported by GDAL "
 ">= 1.11"
@@ -106008,6 +106786,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -106050,6 +106829,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.lidar.correction/main.c:86
@@ -106128,6 +106909,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -106219,6 +107001,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.mkgrid/write_grid.c:70
@@ -106302,6 +107089,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -106393,6 +107181,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.mkgrid/main.c:140
@@ -107634,6 +108427,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -107725,6 +108519,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "connect still unconnected points to vector network by inserting new line(s)"
 msgstr ""
@@ -107754,6 +108553,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -107845,6 +108645,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "print to standard output {line_category start_point_category "
 "end_point_category}"
@@ -107871,6 +108676,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -107962,6 +108768,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "print to standard output {point_category line_category[,line_category...]}"
 msgstr ""
@@ -108017,6 +108828,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -108108,6 +108920,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "For operation 'connect'. By default, a new line from the point to the "
 "network is created."
@@ -108138,6 +108955,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -108229,6 +109047,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Layer where turntable will be attached. Format: layer number[/layer name]."
 "Required for operation 'turntable'."
@@ -108255,6 +109078,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -108346,6 +109170,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Layer with unique categories for every line in arc_layer and point on every "
 "node.  The categories are used in turntable. Format: layer number[/layer "
@@ -108622,6 +109451,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -108713,6 +109543,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../vector/v.info/print.c:155
 #, c-format
@@ -108819,6 +109654,7 @@ msgstr "Topology Spalte:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -108891,6 +109727,11 @@ msgstr "Topology Spalte:"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../vector/v.info/print.c:404
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../vector/v.info/print.c:403
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Type of map"
@@ -108918,6 +109759,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -109009,6 +109851,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../vector/v.info/print.c:405
 msgid "level"
@@ -109548,6 +110395,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -109639,6 +110487,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "By default only features with category are exported. To export all features "
 "use 'layer=-1'."
@@ -109760,6 +110613,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -109832,6 +110686,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../vector/v.in.pdal/main.cpp:429
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../vector/v.in.pdal/main.cpp:428
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid ""
@@ -109859,6 +110718,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -109950,6 +110810,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../vector/v.in.pdal/main.cpp:446
 #, c-format
@@ -110117,6 +110982,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110148,6 +111014,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.extrude/main.c:74
@@ -110177,6 +111045,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110220,6 +111089,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 <<<<<<< HEAD
 msgid "Check if OGR layer <%s> contains polygons..."
@@ -110244,6 +111116,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
@@ -110321,6 +111194,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 msgstr ""
 
@@ -110339,6 +111214,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110371,6 +111247,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Boundary splitting distance in map units: %G"
 msgstr "Distanz der Grenz-Aufteilung in Karteneinheiten: %G"
 =======
@@ -110407,6 +111285,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110446,6 +111325,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Key column '%s' in input layer <%s> is not integer"
 =======
 msgid ""
@@ -110465,6 +111346,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110501,6 +111383,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.in.ogr/main.c:952
@@ -110530,6 +111414,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110569,6 +111454,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Column name <%s> renamed to <%s>"
 =======
 msgid ""
@@ -110588,6 +111475,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110624,6 +111512,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.in.ogr/main.c:1051
@@ -110657,6 +111547,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110729,6 +111620,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../vector/v.in.ogr/main.c:1085
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../vector/v.in.ogr/main.c:1084
 =======
 #: ../vector/v.in.region/main.c:43
@@ -110775,6 +111671,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110821,6 +111718,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Width for column %s set to 255 (was not specified by OGR), some strings may "
@@ -110843,6 +111743,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110915,6 +111816,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../vector/v.in.ogr/main.c:1103
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../vector/v.in.ogr/main.c:1102
 =======
 #: ../vector/v.univar/main.c:195
@@ -110950,6 +111856,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -110996,6 +111903,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Writing column %s with fixed length %d chars (may be truncated)"
 msgstr ""
@@ -111051,6 +111961,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111123,6 +112034,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../vector/v.in.ogr/main.c:1353
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../vector/v.in.ogr/main.c:1352
 =======
 #: ../vector/v.vol.rst/main.c:482
@@ -111150,6 +112066,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111196,6 +112113,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Cannot insert new row for input layer <%s>: %s"
 msgstr ""
@@ -111223,6 +112143,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111295,6 +112216,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../vector/v.in.ogr/main.c:1393
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../vector/v.in.ogr/main.c:1392
 =======
 #: ../vector/v.vol.rst/main.c:642
@@ -111322,6 +112248,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111368,6 +112295,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to drop table: '%s'"
 msgstr "Kann Tabelle <%s> nicht löschen."
@@ -111403,6 +112333,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111475,6 +112406,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../vector/v.in.ogr/main.c:1593
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../vector/v.in.ogr/main.c:1592
 =======
 #: ../vector/v.vol.rst/main.c:911
@@ -111540,6 +112476,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111586,6 +112523,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "The order of features in input layer <%s> has changed"
 msgstr ""
@@ -111609,6 +112549,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -111642,6 +112583,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%d input polygons\n"
 msgstr "%d Eingabepolygone\n"
 =======
@@ -111660,6 +112603,7 @@ msgstr "%d Eingabepolygone\n"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111732,6 +112676,8 @@ msgstr "%d Eingabepolygone\n"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "There are points outside specified 2D/3D region--ignored %d points (total "
 "points: %d)"
@@ -111755,6 +112701,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
@@ -111785,6 +112732,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%d input polygons"
 msgstr "%d Eingabepolygone"
 =======
@@ -111804,6 +112753,7 @@ msgstr "%d Eingabepolygone"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111855,6 +112805,8 @@ msgstr "%d Eingabepolygone"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Points are more dense than specified 'DMIN'--ignored %d points (remain %d)"
 msgstr ""
@@ -111872,6 +112824,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -111964,6 +112917,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../vector/v.in.ogr/main.c:1674
 #, c-format
@@ -111982,6 +112937,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -112010,6 +112966,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Total area: %G (%d areas)\n"
 msgstr "Gesamtfläche: %G (%d Flächen)\n"
 =======
@@ -112025,6 +112983,7 @@ msgstr "Gesamtfläche: %G (%d Flächen)\n"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgid "Total area: %G (%d areas)\n"
 msgstr "Gesamtfläche: %G (%d Flächen)\n"
@@ -112062,6 +113021,8 @@ msgstr "Gesamtfläche: %G (%d Flächen)\n"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "%d points given for interpolation (after thinning) is less than given NPMIN="
 "%d"
@@ -112081,6 +113042,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -112162,6 +113124,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../vector/v.in.ogr/main.c:1675
 #, c-format
@@ -112180,6 +113147,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
@@ -112210,6 +113178,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Total area: %G (%d areas)"
 msgstr "Gesamtfläche: %G (%d Flächen)"
 =======
@@ -112229,6 +113199,7 @@ msgstr "Gesamtfläche: %G (%d Flächen)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -112280,6 +113251,8 @@ msgstr "Gesamtfläche: %G (%d Flächen)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "There is less than %d points for interpolation, no segmentation is "
 "necessary, to run the program faster, set segmax=%d (see manual)"
@@ -112360,6 +113333,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -112472,6 +113446,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.extract/main.c:84
@@ -112548,6 +113524,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
@@ -112594,6 +113571,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.in.ogr/main.c:1859 ../vector/v.in.ogr/main.c:1870
@@ -112704,6 +113683,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -112802,6 +113782,8 @@ msgid "Replace command line instead of appending it"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.extract/main.c:414
@@ -112904,6 +113886,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -112995,6 +113978,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.in.ogr/main.c:2196
@@ -114415,6 +115403,7 @@ msgstr "Operator bestimmt das erforderte Verhältnis zwischen den Objekten"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -114506,6 +115495,11 @@ msgstr "Operator bestimmt das erforderte Verhältnis zwischen den Objekten"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "A feature is written to output if the result of operation 'ainput operator "
 "binput' is true. An input feature is considered to be true, if category of "
@@ -114572,6 +115566,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -114663,6 +115658,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "feature A is spatially related to feature B (using GEOS, requires 'relate' "
 "option)"
@@ -115417,6 +116417,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -115458,6 +116459,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to copy table for layer %d"
 msgstr ""
 
@@ -115482,6 +116485,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -115551,6 +116555,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "'%s' option not used with <%s> because a coordinate would become invalid"
 msgstr ""
@@ -120168,6 +121176,7 @@ msgid_plural ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -120259,6 +121268,11 @@ msgid_plural ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr[0] ""
 msgstr[1] ""
 
@@ -120513,6 +121527,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -120604,6 +121619,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../display/d.title/main.c:74
 msgid "Draw title on current display"
@@ -127784,6 +128804,7 @@ msgstr "Maximale Differenz zwischen diesem und dem letzten Schritt: %g"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -127825,6 +128846,8 @@ msgstr "Maximale Differenz zwischen diesem und dem letzten Schritt: %g"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Label file <%s> not found"
 msgstr "Label-Datei <%s> nicht gefunden."
 
@@ -127845,6 +128868,7 @@ msgid "Region size is lower than minreg, nothing displayed."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -127914,6 +128938,10 @@ msgid "Region size is lower than minreg, nothing displayed."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "%d are too many cells, recommended are < 100 cells. The cross validation "
 "would take too much time."
@@ -128045,6 +129073,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -128136,6 +129165,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 "Region-Größe ist kleiner als die Minimal-Region; es wird nichts angezeigt."
 
@@ -128224,6 +129258,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -128315,6 +129350,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../display/d.rast/main.c:77 ../display/d.rast/main.c:82
 #: ../display/d.rgb/main.c:65
@@ -129545,6 +130585,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -129636,6 +130677,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../display/d.legend/main.c:98 ../display/d.legend/main.c:107
@@ -129658,6 +130704,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -129697,6 +130744,8 @@ msgid "Offset for color rule values"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.legend/main.c:105 ../display/d.legend.vect/main.c:135
 msgid "Title font size"
 msgstr ""
@@ -129871,6 +130920,7 @@ msgid "Offset for color rule values"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -129919,6 +130969,9 @@ msgid "Offset for color rule values"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.colors/edit_colors.c:139 ../raster/r.colors/edit_colors.c:148
@@ -129936,6 +130989,7 @@ msgid "New value = (old value + offset) * scale"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -129973,6 +131027,8 @@ msgid "New value = (old value + offset) * scale"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -130010,6 +131066,7 @@ msgid "Scale for color rule values"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -130060,6 +131117,9 @@ msgid "Scale for color rule values"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.colors/edit_colors.c:284 ../raster/r.colors/edit_colors.c:318
@@ -130083,6 +131143,7 @@ msgid "No %s map name found in input file <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -130120,6 +131181,8 @@ msgid "No %s map name found in input file <%s>"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -130224,6 +131287,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -130265,6 +131329,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "\n"
 "Bitte geben Sie Anweisungen ein.  Um dies zu beenden geben Sie in der "
 "letzten Zeile EOF (Strg-d) ein.\n"
@@ -131368,6 +132434,7 @@ msgstr "Kann Farbe nicht lesen."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -131437,6 +132504,10 @@ msgstr "Kann Farbe nicht lesen."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Die ausgewählten Farbregeln erstrecken sich nicht über den gesamten "
 "Wertebereich!\n"
 "(Regelsatz: %f - %f aber Daten: %f - %f)"
@@ -131461,6 +132532,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -131552,6 +132624,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../display/d.graph/do_graph.c:372
 msgid "Cannot read symbol, cannot display points"
@@ -132800,6 +133877,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -132891,6 +133969,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "%s"
 msgstr ""
 
@@ -133672,6 +134755,7 @@ msgstr "Der Schalter '-z' wird nur für Punkte unterstützt."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -133700,6 +134784,8 @@ msgstr "Der Schalter '-z' wird nur für Punkte unterstützt."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Raster is not CELL, '-v' flag ignored, raster values will be written to the "
 "table."
@@ -133718,6 +134804,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -133741,6 +134828,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.to.vect/main.c:144
 msgid ""
@@ -133755,6 +134844,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -133812,6 +134902,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.to.vect/main.c:146
@@ -133850,6 +134942,7 @@ msgstr "Extrahiere Punkte ... "
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -133878,6 +134971,8 @@ msgstr "Extrahiere Punkte ... "
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Creates a composite raster map layer by using known category values from one "
 "(or more) map layer(s) to fill in areas of \"no data\" in another map layer."
@@ -133897,6 +134992,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -133940,6 +135036,8 @@ msgstr "Erstellt eine Komposit-Karte, indem bekannte Kategorie-Werte einer (oder
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.patch/main.c:73
 msgid "Name of raster maps to be patched together"
@@ -133999,6 +135097,7 @@ msgid "Overwrite seed map with result (lake) map"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -134021,6 +135120,8 @@ msgid "Overwrite seed map with result (lake) map"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Überschreibe die Karte mit Startpunkten mit der resultierenden Seekarte."
 
@@ -134045,6 +135146,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgstr "Überschreibe die Karte mit Startpunkten mit der resultierenden Seekarte."
 =======
@@ -134136,6 +135238,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.lake/main.c:207
 msgid "Seed coordinates and output map lake= must be set!"
@@ -134158,6 +135262,7 @@ msgid "Both lake and overwrite cannot be specified"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -134180,6 +135285,8 @@ msgid "Both lake and overwrite cannot be specified"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Die Einstellungen 'lake' und 'overwrite' können nicht zugleich verwendet "
 "werden."
@@ -134199,6 +135306,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -134271,6 +135379,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.lake/main.c:240
 msgid "Seed point outside the current region"
@@ -134295,6 +135405,7 @@ msgstr "G_malloc: Kein Speicher mehr da."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -134323,6 +135434,8 @@ msgstr "G_malloc: Kein Speicher mehr da."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Given water level at seed point is below earth surface. Increase water level "
 "or move seed point."
@@ -134342,6 +135455,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -134385,6 +135499,8 @@ msgstr "Der angegebene Wasserstand am Startpunkt befindet sich unter der Erdober
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.lake/main.c:355
 #, c-format
@@ -134418,6 +135534,7 @@ msgid "Volume is correct only if lake depth (terrain raster map) is in meters"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -134440,6 +135557,8 @@ msgid "Volume is correct only if lake depth (terrain raster map) is in meters"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Das Volumen ist nur korrekt, wenn die Seetiefe (Terrain-Rasterkarte) in "
 "Metern angegeben wurde."
@@ -134463,6 +135582,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -134537,6 +135657,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.cost/main.c:176
 msgid "Name of input raster map containing grid cell cost information"
@@ -134563,6 +135685,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -134591,6 +135714,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Negative cell value found at row %d, col %d. Setting negative value to "
 "null_cost value"
@@ -134609,6 +135734,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -134632,6 +135758,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.his/main.c:73
 msgid ""
@@ -134648,6 +135776,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -134709,6 +135838,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.his/main.c:103
@@ -134744,6 +135875,7 @@ msgid "Allows creation and/or modification of raster map layer support files."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Erlaubt das Erzeugen und/oder das Modifizieren von Rasterkarten-Support-"
 "Dateien."
@@ -134823,6 +135955,11 @@ msgstr ""
 "Erlaubt das Erzeugen und/oder das Modifizieren von Rasterkarten-Support-"
 "Dateien."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Erlaubt das Erzeugen und/oder das Modifizieren von Rasterkarten-Support-"
+"Dateien."
+>>>>>>> osgeo-main
 
 #: ../raster/r.support/main.c:80
 msgid "Text to use for map data units"
@@ -134909,6 +136046,7 @@ msgstr "%s: Schritt 3 ... "
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -134937,6 +136075,8 @@ msgstr "%s: Schritt 3 ... "
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Creates a cross product of the category values from multiple raster map "
 "layers."
@@ -134954,6 +136094,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -134997,6 +136138,8 @@ msgstr "Erzeugt ein Kreuzprodukt von Kategoriewerten auf Basis mehrerer Rasterka
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.cross/main.c:80
 #, c-format
@@ -135070,6 +136213,7 @@ msgid "ignoring type filed in header, type is set on command line"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Ignoriere Feldtypen des Headers, da der Typ auf der Kommandozeile gesetzt "
 "wurde."
@@ -135149,6 +136293,11 @@ msgstr ""
 "Ignoriere Feldtypen des Headers, da der Typ auf der Kommandozeile gesetzt "
 "wurde."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Ignoriere Feldtypen des Headers, da der Typ auf der Kommandozeile gesetzt "
+"wurde."
+>>>>>>> osgeo-main
 
 #: ../raster/r.in.ascii/gethead.c:176
 msgid "illegal multiplier field: using 1.0"
@@ -135171,6 +136320,7 @@ msgid "ignoring multiplier filed in header, multiplier is set on command line"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -135193,6 +136343,8 @@ msgid "ignoring multiplier filed in header, multiplier is set on command line"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Ignoriere Multiplikator-Feld im Header, da der Multiplikator auf der "
 "Kommandozeile gesetzt wurde."
@@ -135212,6 +136364,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -135284,6 +136437,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.in.ascii/gethead.c:218
 msgid "error in ascii data format"
@@ -135374,6 +136529,7 @@ msgstr "Name der Ausgabe ASCII-Grid Datei (verwende out=- für stdout)."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -135402,6 +136558,8 @@ msgstr "Name der Ausgabe ASCII-Grid Datei (verwende out=- für stdout)."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Number of values printed before wrapping a line (only SURFER or MODFLOW "
 "format)"
@@ -135420,6 +136578,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -135443,6 +136602,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.out.ascii/main.c:92
 msgid "String to represent null cell (GRASS grid only)"
@@ -135458,6 +136619,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -135519,6 +136681,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.out.ascii/main.c:100
 msgid "Write SURFER (Golden Software) ASCII grid"
@@ -135731,6 +136895,7 @@ msgstr "%ld Bytes nach '%s' geschrieben."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -135759,6 +136924,8 @@ msgstr "%ld Bytes nach '%s' geschrieben."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Makes each output cell value a function of the values assigned to the "
 "corresponding cells in the input raster map layers."
@@ -135777,6 +136944,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -135800,6 +136968,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.series/main.c:151
 msgid ""
@@ -135820,6 +136990,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgid "Makes each output cell value a function of the values assigned to the corresponding cells in the input raster map layers."
 msgstr "Macht aus jeder Ausgabezelle eine Funktion der Werte, die einer korrespondierenden Zelle einer Eingabekarte zugewiesen ist."
@@ -135902,6 +137073,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.series/main.c:253 ../raster/r.series/main.c:325
@@ -135948,6 +137121,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -135970,6 +137144,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Region resolution shoudn't be lesser than map %s resolution. Run g.region "
 "raster=%s to set proper resolution"
@@ -135989,6 +137165,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -136061,6 +137238,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.geomorphon/main.c:165
@@ -136119,6 +137298,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -136141,6 +137321,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Coordinates to profile"
 msgstr ""
 
@@ -136171,6 +137353,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -136280,6 +137463,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:302
 #, c-format
@@ -136302,6 +137487,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -136324,6 +137510,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -136341,6 +137529,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -136411,6 +137600,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -136439,6 +137630,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Flatness distance should be between skip and search radius. Otherwise ignored"
 =======
@@ -136504,6 +137696,10 @@ msgid ""
 msgid ""
 "Flatness distance should be between skip and search radius. Otherwise ignored"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Flatness distance should be between skip and search radius. Otherwise ignored"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.geomorphon/main.c:431
@@ -136522,6 +137718,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "There may be a notable processing delay because the computational region is "
 "%lu times larger than necessary"
@@ -136601,6 +137798,11 @@ msgid ""
 "There may be a notable processing delay because the computational region is "
 "%lu times larger than necessary"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"There may be a notable processing delay because the computational region is "
+"%lu times larger than necessary"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.geomorphon/main.c:520
@@ -136626,6 +137828,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Failed writing profile data"
 msgstr ""
 =======
@@ -136697,6 +137900,10 @@ msgstr ""
 msgid "Failed writing profile data"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Failed writing profile data"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:751
 msgid "Failed to profile the computation, please check the parameters"
@@ -136717,6 +137924,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Internal error in %s()"
 msgstr ""
@@ -136802,6 +138010,11 @@ msgstr ""
 msgid "Internal error in %s()"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Internal error in %s()"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/bordwalk.c:92 ../raster/r.proj/bordwalk.c:139
 #, c-format
@@ -136854,6 +138067,7 @@ msgid "Print input map's bounds in the current projection and exit"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -136876,6 +138090,8 @@ msgid "Print input map's bounds in the current projection and exit"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Gibt die Grenzen der Eingabekarte in der aktuellen Projektion aus und "
 "beendet sich."
@@ -136896,6 +138112,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -136967,6 +138184,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/main.c:259
 msgid "Input and output locations are the same"
@@ -136988,6 +138207,7 @@ msgid "Unable to get projection info of output raster map"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Kann die Projektionsinformation der Ausgabe-Rasterkarte nicht ermitteln."
 =======
@@ -137053,6 +138273,10 @@ msgstr ""
 msgstr ""
 "Kann die Projektionsinformation der Ausgabe-Rasterkarte nicht ermitteln."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Kann die Projektionsinformation der Ausgabe-Rasterkarte nicht ermitteln."
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/main.c:272
 msgid "Unable to get projection units of output raster map"
@@ -137074,6 +138298,7 @@ msgid "Unable to get projection key values of output raster map"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Kann die Kennzahlen der Projektion der Ausgabe-Rasterkarte nicht ermitteln."
 =======
@@ -137139,6 +138364,10 @@ msgstr ""
 msgstr ""
 "Kann die Kennzahlen der Projektion der Ausgabe-Rasterkarte nicht ermitteln."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Kann die Kennzahlen der Projektion der Ausgabe-Rasterkarte nicht ermitteln."
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/main.c:288
 #, c-format
@@ -137260,6 +138489,7 @@ msgstr "Reklassifizieren"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -137288,6 +138518,8 @@ msgstr "Reklassifizieren"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Recategorizes data in a raster map by grouping cells that form physically "
 "discrete areas into unique categories."
@@ -137306,6 +138538,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -137349,6 +138582,8 @@ msgstr "Re-Kategorisiert Daten einer Rasterkarte, indem Zellen physikalisch disk
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.clump/main.c:82
 msgid "Threshold to identify similar cells"
@@ -137428,6 +138663,7 @@ msgstr "End-Koordinate: %.15g, %.15g"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -137456,6 +138692,8 @@ msgstr "End-Koordinate: %.15g, %.15g"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Outputs raster map layer values lying along user defined transect line(s)."
 msgstr ""
@@ -137473,6 +138711,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -137516,6 +138755,8 @@ msgstr "Gibt die Werte einer Rasterkarte aus, die entlang einer/mehrerer durch d
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.transect/main.c:111
 msgid "Raster map to be queried"
@@ -137677,6 +138918,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated "
 "values (IDW)."
@@ -137756,6 +138998,11 @@ msgid ""
 "Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated "
 "values (IDW)."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Rapidly fills 'no data' cells (NULLs) of a raster map with interpolated "
+"values (IDW)."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.fill.stats/main.c:789
@@ -137869,6 +139116,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Maximum distance too large. Adjusted to '%.6f' (diagonal of current region)."
 =======
@@ -137934,6 +139182,10 @@ msgid ""
 msgid ""
 "Maximum distance too large. Adjusted to '%.6f' (diagonal of current region)."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Maximum distance too large. Adjusted to '%.6f' (diagonal of current region)."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.fill.stats/main.c:948
@@ -137956,6 +139208,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Maximum distance too large. Adjusted to '%lu' cells (diagonal of current "
 "region)."
@@ -138035,6 +139288,11 @@ msgid ""
 "Maximum distance too large. Adjusted to '%lu' cells (diagonal of current "
 "region)."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Maximum distance too large. Adjusted to '%lu' cells (diagonal of current "
+"region)."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.fill.stats/main.c:961
@@ -138112,6 +139370,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Input data type is '%s' (%i bytes) and output data type is '%s' (%i bytes)."
 =======
@@ -138177,6 +139436,10 @@ msgid ""
 msgid ""
 "Input data type is '%s' (%i bytes) and output data type is '%s' (%i bytes)."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Input data type is '%s' (%i bytes) and output data type is '%s' (%i bytes)."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.fill.stats/main.c:1252
@@ -138232,6 +139495,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -138260,6 +139524,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Filters and generates a depressionless elevation map and a flow direction "
 "map from a given elevation raster map."
@@ -138278,6 +139544,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -138321,6 +139588,8 @@ msgstr "Filtert und generiert ein depressionsloses Höhenmodell und eine Fließr
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.fill.dir/main.c:101
 msgid "Name for output depressionless elevation raster map"
@@ -138341,6 +139610,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Name for output flow direction map for depressionless elevation raster map"
 =======
@@ -138406,6 +139676,10 @@ msgid ""
 msgid ""
 "Name for output flow direction map for depressionless elevation raster map"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Name for output flow direction map for depressionless elevation raster map"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.fill.dir/main.c:110
@@ -138470,6 +139744,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -138492,6 +139767,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Optionally produces a GRASS vector points map containing the calculated "
 "centroids of these clumps."
@@ -138510,6 +139787,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 44b23be1c2 (Dockerfile: fix broken lib link (#1625))
@@ -138579,6 +139857,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.volume/main.c:92
@@ -138600,6 +139880,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Preferably the output of r.clump. If no clump map is given than MASK is used."
 =======
@@ -138665,6 +139946,10 @@ msgid ""
 msgid ""
 "Preferably the output of r.clump. If no clump map is given than MASK is used."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"Preferably the output of r.clump. If no clump map is given than MASK is used."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.volume/main.c:99
@@ -138698,6 +139983,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "No MASK found. If no clump map is given than the MASK is required. You need "
 "to define a clump raster map or create a MASK by r.mask command."
@@ -138777,6 +140063,11 @@ msgid ""
 "No MASK found. If no clump map is given than the MASK is required. You need "
 "to define a clump raster map or create a MASK by r.mask command."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"No MASK found. If no clump map is given than the MASK is required. You need "
+"to define a clump raster map or create a MASK by r.mask command."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../raster/r.volume/main.c:145
@@ -138861,6 +140152,7 @@ msgid "Produces a vector map of specified contours from a raster map."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr ""
 "Erzeugt eine Vektorkarte mit bestimmten Kontourlinien aus einer Rasterkarte."
 =======
@@ -138926,6 +140218,10 @@ msgstr ""
 msgstr ""
 "Erzeugt eine Vektorkarte mit bestimmten Kontourlinien aus einer Rasterkarte."
 >>>>>>> osgeo-main
+=======
+msgstr ""
+"Erzeugt eine Vektorkarte mit bestimmten Kontourlinien aus einer Rasterkarte."
+>>>>>>> osgeo-main
 
 #: ../raster/r.contour/main.c:103 ../raster/r.contour/main.c:111
 #: ../raster/r.contour/main.c:118 ../raster/r.contour/main.c:125
@@ -139140,6 +140436,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "The input vector map contains both polygons and points, cannot handle mixed "
 "types"
@@ -139219,6 +140516,11 @@ msgid ""
 "The input vector map contains both polygons and points, cannot handle mixed "
 "types"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"The input vector map contains both polygons and points, cannot handle mixed "
+"types"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/v.to.lines/v.to.lines.py:78
@@ -139299,6 +140601,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "The raster map <%s> must be integer (CELL type)  in order to use the "
 "'maskcats' parameter"
@@ -139378,6 +140681,11 @@ msgid ""
 "The raster map <%s> must be integer (CELL type)  in order to use the "
 "'maskcats' parameter"
 >>>>>>> osgeo-main
+=======
+msgid ""
+"The raster map <%s> must be integer (CELL type)  in order to use the "
+"'maskcats' parameter"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/r.mask/r.mask.py:159
@@ -139417,6 +140725,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "All subsequent raster operations will be limited to the MASK area. Removing "
 "or renaming raster map named 'MASK' will restore raster operations to normal."
@@ -139496,6 +140805,11 @@ msgid ""
 "All subsequent raster operations will be limited to the MASK area. Removing "
 "or renaming raster map named 'MASK' will restore raster operations to normal."
 >>>>>>> osgeo-main
+=======
+msgid ""
+"All subsequent raster operations will be limited to the MASK area. Removing "
+"or renaming raster map named 'MASK' will restore raster operations to normal."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/r.unpack/r.unpack.py:65
@@ -139617,6 +140931,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -139708,6 +141023,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/v.dissolve/v.dissolve.py:349
@@ -139730,6 +141050,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "Statistics calculated from raster map <{raster}> and uploaded to attribute "
 "table of vector map <{vector}>."
 =======
@@ -139773,6 +141094,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "The number of result columns ({result_columns}) needs to be the same as the "
 "number of aggregation methods ({methods})"
 =======
@@ -139793,6 +141116,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -139822,6 +141146,8 @@ msgid ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 "Statistics calculated from raster map <{raster}> and uploaded to attribute "
 "table of vector map <{vector}>."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -139839,6 +141165,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -139881,6 +141208,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/v.dissolve/v.dissolve.py:362
@@ -139903,6 +141232,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "Not all vector categories converted to raster.                         "
 "Converted {0} of {1}."
 =======
@@ -139946,6 +141276,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Result column '{column}' needs a type specified (using the syntax: 'name "
 "type') when no methods are provided with the {option_name} option and "
 "aggregation backend is '{backend}'"
@@ -139967,6 +141299,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -139996,6 +141329,8 @@ msgid ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 "Not all vector categories converted to raster.                         "
 "Converted {0} of {1}."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -140013,6 +141348,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -140055,6 +141391,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/v.dissolve/v.dissolve.py:376
@@ -140137,6 +141475,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -140253,6 +141592,11 @@ msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+#: ../scripts/v.dissolve/v.dissolve.py:84
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Key column must be of type integer or string"
 msgstr ""
 
@@ -140334,6 +141678,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -140369,6 +141714,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "It is not possible to set 'maxcols=%s' and 'overlap=%s'. Please set "
 "maxcols>overlap"
 =======
@@ -140388,6 +141735,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -140439,6 +141787,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Final extraction steps failed. Check above error messages and see following "
 "details:\n"
 "%s"
@@ -140465,6 +141815,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -140506,6 +141857,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "It is not possible to set 'maxrows=%s' and 'overlap=%s'. Please set "
 "maxrows>overlap"
 msgstr ""
@@ -140526,6 +141879,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -140595,6 +141949,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Deleting of temporary layer failed. Check above error messages and see "
 "following details:\n"
 "%s"
@@ -140739,6 +142097,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -140830,6 +142189,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "There are no tiles available. Probably the output projection system it is "
 "not compatible with the projection of the current location"
@@ -141440,6 +142804,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -141531,6 +142896,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Since DBF driver is used, the content of the 'alternatenames' column might "
 "be cut with respect to the original Geonames.org column content"
@@ -142213,6 +143583,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -142304,6 +143675,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/v.db.update/v.db.update.py:112
@@ -143887,6 +145263,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -143919,6 +145296,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Classification of a vector maps based on the values in attribute tables"
@@ -145870,6 +147249,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -145920,6 +147300,9 @@ msgid ""
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/g.extension/g.extension.py:2112
@@ -145970,6 +147353,7 @@ msgid "Imported table <%s> with %d rows"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -146007,6 +147391,8 @@ msgid "Imported table <%s> with %d rows"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -146097,6 +147483,7 @@ msgid "Maximum memory to be used with -m flag (in MB)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -146147,6 +147534,9 @@ msgid "Maximum memory to be used with -m flag (in MB)"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Maximal zu verwendender Speicher in Verbindung mit dem Schalter -m (in MB)."
 
@@ -146194,6 +147584,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -146231,6 +147622,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Maximal zu verwendender Speicher in Verbindung mit dem Schalter -m (in MB)."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -146266,6 +147659,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -146303,6 +147697,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Generate points also for NULL category"
 #~ msgstr "Erzeuge Punkte auch für die NULL-Kategorie."
 
@@ -146331,6 +147727,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -146367,6 +147764,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Unable to convert input raster map projection information to GRASS format "
 "for checking"
@@ -146388,6 +147787,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -146440,6 +147840,9 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #, fuzzy
 #~ msgid "Unable to assign/dissociate band reference. {}"
@@ -146511,6 +147914,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -146602,6 +148006,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid ""
 #~ "Control Z Point file for group [%s] in [%s] \n"
@@ -146665,6 +148074,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -146756,6 +148166,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Allocating memory for bicubic interpolation"
 #~ msgstr "Allokiere Speicher für bikubische Interpolation."
@@ -146849,6 +148264,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -146890,6 +148306,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Number of vertical pieces must be at least 1. Default value will be "
 #~ "used..."
@@ -146909,6 +148327,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -146978,6 +148397,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Number of vertical pieces must be at least 1. Default value will be used..."
 msgstr "Anzahl der Klassen muss < 256 sein."
@@ -147059,6 +148482,7 @@ msgid "File in which to save d.graph instructions for legend display"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -147109,6 +148533,9 @@ msgid "File in which to save d.graph instructions for legend display"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Datei in der die d.grap-Anweisungen für die Darstellung der Legende "
 "gespeichert werden."
@@ -147129,6 +148556,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -147166,6 +148594,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Datei in der die d.grap-Anweisungen für die Darstellung der Legende "
 "gespeichert werden."
@@ -147199,6 +148629,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid ""
 "Data types depend on database backend, but all support VARCHAR(), INT, "
 "DOUBLE PRECISION and DATE"
@@ -147248,6 +148679,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Data types depend on database backend, but all support VARCHAR(), INT, "
 #~ "DOUBLE PRECISION and DATE"
@@ -147269,6 +148702,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -147317,6 +148751,9 @@ msgstr ""
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Data types depend on database backend, but all support VARCHAR(), INT, "
 "DOUBLE PRECISION and DATE"
@@ -147338,6 +148775,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -147375,6 +148813,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Data types depend on database backend, but all support VARCHAR(), INT, "
 "DOUBLE PRECISION and DATE"
@@ -147443,6 +148883,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -147534,6 +148975,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Location: %s\n"
 #~ msgstr "Location: %s\n"
@@ -147612,6 +149058,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -147646,6 +149093,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "\n"
 #~ "You can use the -o flag to %s to override this projection check.\n"
@@ -147731,6 +149180,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -147822,6 +149272,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #, fuzzy
 #~ msgid "-%c/-%c and %s= are mutually exclusive"
@@ -147903,6 +149358,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -147944,6 +149400,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Correction of the v.lidar.growing output. It is the last of the three "
 #~ "algorithms for LIDAR filtering."
@@ -147965,6 +149423,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -148034,6 +149493,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Correction of the v.lidar.growing output. It is the last of the three "
 "algorithms for LIDAR filtering."
@@ -148057,6 +149520,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -148148,6 +149612,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Interpolation spline step value in east direction"
 #~ msgstr "Spline-Interpolations-Schrittweite in Ost-Richtung."
@@ -148186,6 +149655,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -148227,6 +149697,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Displays a thematic vector area map in the active frame on the graphics "
 #~ "monitor."
@@ -148246,6 +149718,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -148315,6 +149788,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Displays a thematic vector area map in the active frame on the graphics "
 "monitor."
@@ -148350,6 +149827,7 @@ msgstr "Stellt eine thematische Vektorkarte im aktiven Grafikfenster dar."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -148391,6 +149869,8 @@ msgstr "Stellt eine thematische Vektorkarte im aktiven Grafikfenster dar."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Allows creation and/or modification of raster3d map layer support files."
 #~ msgstr ""
@@ -148411,6 +149891,7 @@ msgstr "Stellt eine thematische Vektorkarte im aktiven Grafikfenster dar."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -148480,6 +149961,10 @@ msgstr "Stellt eine thematische Vektorkarte im aktiven Grafikfenster dar."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Allows creation and/or modification of raster3d map layer support files."
 msgstr ""
@@ -148502,6 +149987,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -148593,6 +150079,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Failed opening input dig file."
 #~ msgstr "Kann input dig Datei nicht öffnen."
@@ -148633,6 +150124,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -148724,6 +150216,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Line %d label: %d matched another label: %d."
 #~ msgstr "Linie %d Beschriftung: %d passt zu einer anderen Beschriftung: %d."
@@ -148762,6 +150259,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -148853,6 +150351,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Unable to open dig_cats file"
 #~ msgstr "Kann die dig_cats Datei nicht öffnen."
@@ -148883,6 +150386,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -148924,6 +150428,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Input file is not portable. We will attempt to convert anyway but "
 #~ "conversion may fail. Please read manual for detail information."
@@ -148946,6 +150452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -149015,6 +150522,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Input file is not portable. We will attempt to convert anyway but conversion "
 "may fail. Please read manual for detail information."
@@ -149039,6 +150550,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -149130,6 +150642,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "[%d] points read to memory"
 #~ msgstr "[%d] Punkte sind in den Speicher gelesen worden."
@@ -149168,6 +150685,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -149259,6 +150777,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "[%d] dead points skipped"
 #~ msgstr "[%d] tote Punkte (dead points) übersprungen."
@@ -149342,6 +150865,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -149433,6 +150957,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Unknown metric: [%s]."
 #~ msgstr "Unbekannte Maßzahl: [%s]."
@@ -149464,6 +150993,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -149505,6 +151035,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Computes anisotropic cumulative cost of moving between different "
 #~ "geographic locations on an input elevation raster map whose cell category "
@@ -149538,6 +151070,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -149607,6 +151140,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Computes anisotropic cumulative cost of moving between different geographic "
 "locations on an input elevation raster map whose cell category values "
@@ -149642,6 +151179,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -149733,6 +151271,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Name of output layer to be used for GREEN"
 #~ msgstr "Name der Ausgabe-Karte, die den GRÜNEN Kanal enthalten soll"
@@ -149760,6 +151303,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -149801,6 +151345,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Lat/long databases not supported by r.surf.idw2. Use r.surf.idw instead!"
 #~ msgstr ""
@@ -149821,6 +151367,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -149890,6 +151437,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Lat/long databases not supported by r.surf.idw2. Use r.surf.idw instead!"
 msgstr ""
@@ -149912,6 +151463,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -150003,6 +151555,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "%s=%s - illegal number of interpolation points"
 #~ msgstr "%s=%s - Ungültige Anzahl von Interpolationspunkten."
@@ -150090,6 +151647,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -150173,6 +151731,11 @@ msgstr ""
 #~ msgstr "Farbe des zu zeichnenden Gitters, oder \"none\" für nichts."
 =======
 >>>>>>> osgeo-main
+=======
+#~ msgid "Color in GRASS format for drawing grid or \"none\" not drawing"
+#~ msgstr "Farbe des zu zeichnenden Gitters, oder \"none\" für nichts."
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Calculates univariate statistics from the non-null cells for each registered "
 "raster3d map of a space time raster3d dataset."
@@ -150212,6 +151775,7 @@ msgstr "Farbe des zu zeichnenden Gitters, oder \"none\" für nichts."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -150249,6 +151813,8 @@ msgstr "Farbe des zu zeichnenden Gitters, oder \"none\" für nichts."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Color for showing unknown information or \"none\""
 #~ msgstr "Farbe für unbekannte Information."
 
@@ -150273,6 +151839,7 @@ msgstr "Farbe des zu zeichnenden Gitters, oder \"none\" für nichts."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -150321,6 +151888,9 @@ msgstr "Farbe des zu zeichnenden Gitters, oder \"none\" für nichts."
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Color in GRASS format for drawing null values (X symbol) or \"none\" not "
 "drawing"
@@ -150346,6 +151916,7 @@ msgstr "Farbe für unbekannte Information."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -150405,6 +151976,9 @@ msgstr "Farbe für unbekannte Information."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Color in GRASS format for showing unknown information (? symbol) or \"none\" "
 "not showing"
@@ -150588,6 +152162,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -150679,6 +152254,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "%d sites written."
 #~ msgstr "%d Sites geschrieben."
@@ -150902,6 +152482,7 @@ msgstr "Start des 1. MP >= Ende des 2. MP für Punkte der cats %[d], [%d]."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -150931,6 +152512,8 @@ msgstr "Start des 1. MP >= Ende des 2. MP für Punkte der cats %[d], [%d]."
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "No function defined to perform ``point %c point''"
 msgstr "Es wurde keine Funktion definiert, um \"Punkt %c Punkt\" auszuführen."
 
@@ -151094,6 +152677,7 @@ msgstr "Start des 1. MP >= Ende des 2. MP für Punkte der cats %[d], [%d]."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -151153,5 +152737,8 @@ msgstr "Start des 1. MP >= Ende des 2. MP für Punkte der cats %[d], [%d]."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "%s=%s,%s: files are the same, no copy required"
 msgstr "%s=%s,%s: Dateien sind identisch, kein Kopieren nötig."
diff --git a/locale/po/grassmods_el.po b/locale/po/grassmods_el.po
index 70cd47e7dfc..1654af291d5 100644
--- a/locale/po/grassmods_el.po
+++ b/locale/po/grassmods_el.po
@@ -56507,6 +56507,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -56539,6 +56540,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -56555,6 +56558,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -56587,6 +56591,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -56864,6 +56870,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -56910,6 +56917,9 @@ msgstr[1] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr ""
@@ -71882,6 +71892,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -71953,6 +71964,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -71978,6 +71993,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Profile output format"
 msgstr ""
 =======
@@ -72049,6 +72065,10 @@ msgstr ""
 msgid "Profile output format"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Profile output format"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -76134,6 +76154,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -76166,6 +76187,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "layer name or number to use for data"
 #~ msgstr "Νούμερο επιπέδου"
diff --git a/locale/po/grassmods_es.po b/locale/po/grassmods_es.po
index 4d6ac3fce42..138e73209eb 100644
--- a/locale/po/grassmods_es.po
+++ b/locale/po/grassmods_es.po
@@ -28606,6 +28606,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -28656,6 +28657,9 @@ msgstr ""
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to access target location/mapset %s/%s"
 msgstr ""
@@ -28682,6 +28686,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28719,6 +28724,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to access target location/mapset %s/%s"
 msgstr ""
@@ -42576,6 +42583,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -42667,6 +42675,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/g.copyall_to_translate.c:9
 #, fuzzy
@@ -53078,6 +53091,7 @@ msgstr "tabla de colores"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -53150,6 +53164,11 @@ msgstr "tabla de colores"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../locale/scriptstrings/v.scatterplot_to_translate.c:59
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:60
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -53176,6 +53195,7 @@ msgstr "dato nulo"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -53233,6 +53253,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.null.all_to_translate.c:5
 #: ../locale/scriptstrings/r.mask_to_translate.c:5
@@ -53254,6 +53276,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
@@ -53300,6 +53323,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:61
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62
@@ -77438,6 +77463,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -77529,6 +77555,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../display/d.text/main.c:181
 msgid "Line spacing"
@@ -82900,6 +82931,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -82922,6 +82954,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "DONE: uncompressed file is %lu %s (%.2f%%) smaller"
 msgstr ""
@@ -82950,6 +82984,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy, c-format
 =======
@@ -83053,6 +83088,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.compress/main.c:228
 msgid "same size"
@@ -87936,6 +87973,7 @@ msgstr "\"-\" para leer reglas desde entrada estándar (stdin)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Offset for color rule values"
 msgstr ""
 =======
@@ -88007,6 +88045,10 @@ msgstr ""
 msgid "Offset for color rule values"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Offset for color rule values"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.colors/edit_colors.c:139 ../raster/r.colors/edit_colors.c:148
 msgid "New value = (old value + offset) * scale"
@@ -88027,6 +88069,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Scale for color rule values"
 msgstr ""
 =======
@@ -88098,6 +88141,10 @@ msgstr ""
 msgid "Scale for color rule values"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Scale for color rule values"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.colors/edit_colors.c:284 ../raster/r.colors/edit_colors.c:318
 #, c-format
@@ -88201,6 +88248,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Unable to open color rule"
 msgstr ""
 =======
@@ -88272,6 +88320,10 @@ msgstr ""
 msgid "Unable to open color rule"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Unable to open color rule"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.colors/rules.c:179
 #, c-format
@@ -90003,6 +90055,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -90025,6 +90078,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Coordinates to profile"
 msgstr ""
 
@@ -90055,6 +90110,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -90164,6 +90220,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:302
 #, c-format
@@ -90186,6 +90244,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -90208,6 +90267,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -90225,6 +90286,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -90295,6 +90357,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -90337,6 +90401,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -90359,6 +90424,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile data has been written"
 msgstr ""
 
@@ -90375,6 +90442,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -90442,6 +90510,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:751
 msgid "Failed to profile the computation, please check the parameters"
@@ -90462,6 +90532,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Internal error in %s()"
 msgstr ""
@@ -90547,6 +90618,11 @@ msgstr ""
 msgid "Internal error in %s()"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Internal error in %s()"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/bordwalk.c:92 ../raster/r.proj/bordwalk.c:139
 #, c-format
@@ -94480,6 +94556,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -94512,6 +94589,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 #~ msgid "Unable to create new location <%s>"
 #~ msgstr "No se puede crear nueva Localización <%s>"
@@ -94743,6 +94822,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -94775,6 +94855,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Remove all registered maps from the temporal and also from the spatial "
 #~ "database"
@@ -98203,6 +98285,7 @@ msgstr "No hay un controlador de bases de datos (DB) definido"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -100998,6 +101081,8 @@ msgstr "leyendo mapa de entrada -%s y -%s- y creando algunos archivos temporales
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "OGR datasource name"
 msgstr "Nombre de fuente de datos OGR"
@@ -101955,6 +102040,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -101968,6 +102054,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Key columns differ"
 msgstr "Diferencia de columnas clave"
@@ -102009,6 +102097,7 @@ msgstr "Grados Phi iniciales de Cámara (cabeceo, pitch)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
 msgid "<%s> not found"
@@ -102305,6 +102394,9 @@ msgstr "Grados Phi iniciales de Cámara (cabeceo, pitch)"
 >>>>>>> osgeo-main
 =======
 
+>>>>>>> osgeo-main
+=======
+
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 #~ msgid "Key columns differ"
@@ -102392,6 +102484,7 @@ msgstr "El número de banda de entrada debería ser 15"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -102421,6 +102514,8 @@ msgstr "El número de banda de entrada debería ser 15"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "The input band number should be 15"
 msgstr "El número de banda de entrada debería ser 15"
 
@@ -102439,6 +102534,7 @@ msgstr "El número de banda de entrada debería ser 15"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -102481,6 +102577,8 @@ msgstr "El número de banda de entrada debería ser 15"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%s=%s,%s: files are the same, no copy required"
 msgstr "%s=%s,%s: los archivos son los mismos, no se requiere ninguna copia"
 
@@ -102503,6 +102601,7 @@ msgstr "El mapa vectorial <%s> es 3D. Use opciones de creación de capa específ
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -102594,3 +102693,8 @@ msgstr "El mapa vectorial <%s> es 3D. Use opciones de creación de capa específ
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grassmods_fi.po b/locale/po/grassmods_fi.po
index bb76e9e2623..17b2878db6d 100644
--- a/locale/po/grassmods_fi.po
+++ b/locale/po/grassmods_fi.po
@@ -39270,6 +39270,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -39361,6 +39362,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.vif_to_translate.c:19
 msgid "Only print selected variables to screen"
diff --git a/locale/po/grassmods_fr.po b/locale/po/grassmods_fr.po
index 0d49be4b435..c64b3798f20 100644
--- a/locale/po/grassmods_fr.po
+++ b/locale/po/grassmods_fr.po
@@ -28081,6 +28081,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -28131,6 +28132,9 @@ msgstr ""
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to access target location/mapset %s/%s"
 msgstr ""
@@ -28157,6 +28161,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28194,6 +28199,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to access target location/mapset %s/%s"
 msgstr ""
@@ -52109,6 +52116,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -52141,6 +52149,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:61
 =======
 <<<<<<< HEAD
@@ -52157,6 +52167,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -52189,6 +52200,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:62
 #, fuzzy
 msgid "Line style trendline"
@@ -52217,6 +52230,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -52308,6 +52322,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/v.scatterplot_to_translate.c:64
 #, fuzzy
@@ -64047,6 +64066,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -64079,6 +64099,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -64095,6 +64117,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -64127,6 +64150,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -64404,6 +64429,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -64450,6 +64476,9 @@ msgstr[1] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr ""
@@ -73842,6 +73871,7 @@ msgid "Makes each cell value a function of the attribute values assigned to the
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -73933,6 +73963,11 @@ msgid "Makes each cell value a function of the attribute values assigned to the
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.neighbors/main.c:152
@@ -73977,6 +74012,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -74068,6 +74104,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "All points fall outside of the current computational region"
 msgstr ""
 
@@ -74432,6 +74473,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Vector map <%s> is 3D. Use format specific layer creation options (parameter 'lco') to export in 3D rather than 2D (default)."
 =======
 <<<<<<< HEAD
@@ -74474,6 +74516,8 @@ msgid "Vector map <%s> is 3D. Use format specific layer creation options (parame
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Vector map <%s> is 3D. Use format specific layer creation options (parameter "
 "'lco') to export in 3D rather than 2D (default)."
@@ -74494,6 +74538,7 @@ msgid "Vector map <%s> is 3D. Use format specific layer creation options (parame
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgid "Vector map <%s> is 3D. Use format specific layer creation options (parameter 'lco') to export in 3D rather than 2D (default)."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -74577,6 +74622,11 @@ msgid "Vector map <%s> is 3D. Use format specific layer creation options (parame
 msgid "Vector map <%s> is 3D. Use format specific layer creation options (parameter 'lco') to export in 3D rather than 2D (default)."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+msgid "Vector map <%s> is 3D. Use format specific layer creation options (parameter 'lco') to export in 3D rather than 2D (default)."
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../vector/v.out.ogr/main.c:672
@@ -77986,6 +78036,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -78077,6 +78128,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../display/d.text/main.c:181
 msgid "Line spacing"
@@ -81129,6 +81185,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -81170,6 +81227,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:409
 #, c-format
 msgid "%d error in cat option"
@@ -81527,6 +81586,7 @@ msgid "Manage"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -81596,6 +81656,10 @@ msgid "Manage"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../raster/r.compress/main.c:219
 #, c-format
 msgid "DONE: uncompressed file is %lu %s (%.2f%%) smaller"
@@ -81631,6 +81695,7 @@ msgid "DONE: compressed file is %lu %s (%.2f%%) larger"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -81722,6 +81787,11 @@ msgid "DONE: compressed file is %lu %s (%.2f%%) larger"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../display/d.mon/main.c:65
@@ -87021,6 +87091,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -87043,6 +87114,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Coordinates to profile"
 msgstr ""
 
@@ -87073,6 +87146,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -87182,6 +87256,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:302
 #, c-format
@@ -87204,6 +87280,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -87226,6 +87303,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -87243,6 +87322,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -87313,6 +87393,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -87355,6 +87437,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -87377,6 +87460,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile data has been written"
 msgstr ""
 
@@ -87393,6 +87478,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -87460,6 +87546,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:751
 msgid "Failed to profile the computation, please check the parameters"
@@ -91503,6 +91591,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -91535,6 +91624,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Overwrite font configuration file if already existing"
 #~ msgstr "Écraser le fichier de configuration des polices s'il existe déjà"
 
@@ -91712,6 +91803,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -91744,6 +91836,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Creates a raster map from LAS LiDAR points using univariate statistics "
@@ -94401,6 +94495,7 @@ msgstr "Table manquante"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Missing table"
 msgstr "Table manquante"
 
@@ -94582,6 +94677,18 @@ msgstr "FAIT : le fichier compressé est %lu %s (%.2f%) plus petit"
 msgid "DONE: uncompressed file is %lu %s (%.2f%) larger"
 msgstr "FAIT : le fichier décompressé est %lu %s (%.2f%) plus grand"
 
+=======
+>>>>>>> osgeo-main
+=======
+msgid "DONE: uncompressed file is %lu %s (%.2f%) smaller"
+msgstr "FAIT : le fichier décompressé est %lu %s (%.2f%) plus petit"
+
+msgid "DONE: compressed file is %lu %s (%.2f%) smaller"
+msgstr "FAIT : le fichier compressé est %lu %s (%.2f%) plus petit"
+
+msgid "DONE: uncompressed file is %lu %s (%.2f%) larger"
+msgstr "FAIT : le fichier décompressé est %lu %s (%.2f%) plus grand"
+
 =======
 >>>>>>> osgeo-main
 msgid "Missing table"
@@ -94611,6 +94718,7 @@ msgstr "FAIT : le fichier décompressé est %lu %s (%.2f%) plus grand"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -94680,5 +94788,7 @@ msgstr "FAIT : le fichier décompressé est %lu %s (%.2f%) plus grand"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "DONE: compressed file is %lu %s (%.2f%) larger"
 msgstr "FAIT : le fichier compressé est %lu %s (%.2f%) plus grand"
diff --git a/locale/po/grassmods_hu.po b/locale/po/grassmods_hu.po
index 5218604dafa..589a690a0ee 100644
--- a/locale/po/grassmods_hu.po
+++ b/locale/po/grassmods_hu.po
@@ -56829,6 +56829,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -56861,6 +56862,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -56877,6 +56880,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -56909,6 +56913,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -57191,6 +57197,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -57237,6 +57244,9 @@ msgstr[1] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr ""
@@ -75656,6 +75666,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -75688,6 +75699,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Input raster 1"
 #~ msgstr "Input szín trékép neve"
diff --git a/locale/po/grassmods_it.po b/locale/po/grassmods_it.po
index a3926999daf..1902d1336d0 100644
--- a/locale/po/grassmods_it.po
+++ b/locale/po/grassmods_it.po
@@ -28164,6 +28164,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -28255,6 +28256,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../imagery/i.atcorr/geomcond.cpp:232
 msgid "No possibility to compute lat. and long."
@@ -40670,6 +40676,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -40761,6 +40768,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/g.proj.identify_to_translate.c:8
 #, fuzzy
@@ -50194,6 +50206,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -50285,6 +50298,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:39
 #, fuzzy
@@ -79831,6 +79849,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../raster/r.colors/rules.c:81
 msgid "Unable to open color rule"
 msgstr ""
@@ -79875,6 +79894,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.graph/do_graph.c:98
 msgid "Unable to read color"
 msgstr "Non è possibile leggere il colore"
@@ -79897,6 +79918,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -79926,6 +79948,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../raster/r.colors/rules.c:81
 msgid "Unable to open color rule"
 msgstr ""
@@ -79944,6 +79968,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -79986,6 +80011,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../display/d.graph/do_graph.c:372
 msgid "Cannot read symbol, cannot display points"
@@ -81651,6 +81678,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -81673,6 +81701,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Coordinates to profile"
 msgstr ""
 
@@ -81703,6 +81733,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -81812,6 +81843,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:302
 #, c-format
@@ -81834,6 +81867,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -81856,6 +81890,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -81873,6 +81909,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -81943,6 +81980,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -81988,6 +82027,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Failed writing profile data"
 msgstr ""
 =======
@@ -82059,6 +82099,10 @@ msgstr ""
 msgid "Failed writing profile data"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Failed writing profile data"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:751
 msgid "Failed to profile the computation, please check the parameters"
@@ -86098,6 +86142,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -86130,6 +86175,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Classification of a vector maps based on the values in attribute tables"
@@ -88716,6 +88763,7 @@ msgstr "I tipi di colonna sono differenti"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "<%s> not found"
 msgstr "<%s> non trovato"
 
@@ -88861,6 +88909,15 @@ msgstr "Tabella mancante"
 msgid "Number of columns differ"
 msgstr "Il numero di colonne è differente"
 
+=======
+>>>>>>> osgeo-main
+=======
+msgid "Missing table"
+msgstr "Tabella mancante"
+
+msgid "Number of columns differ"
+msgstr "Il numero di colonne è differente"
+
 =======
 >>>>>>> osgeo-main
 msgid "<%s> not found"
@@ -88893,6 +88950,7 @@ msgstr "Il numero di colonne è differente"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -88953,5 +89011,7 @@ msgstr "Il numero di colonne è differente"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%s=%s,%s: files are the same, no copy required"
 msgstr "%s=%s,%s: sono gli stessi file, non è richiesto copiarli"
diff --git a/locale/po/grassmods_ja.po b/locale/po/grassmods_ja.po
index e3d02d35862..06dc7b4e609 100644
--- a/locale/po/grassmods_ja.po
+++ b/locale/po/grassmods_ja.po
@@ -27720,6 +27720,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27811,6 +27812,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../imagery/i.atcorr/geomcond.cpp:232
 msgid "No possibility to compute lat. and long."
@@ -40104,6 +40110,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -40195,6 +40202,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/g.proj.identify_to_translate.c:8
 #, fuzzy
@@ -49925,6 +49937,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -50016,6 +50029,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.series.boxplot_to_translate.c:39
 #, fuzzy
@@ -59678,6 +59696,7 @@ msgstr "ベクトルマップ <%s> は既に存在し上書きされます"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59710,6 +59729,8 @@ msgstr "ベクトルマップ <%s> は既に存在し上書きされます"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -59726,6 +59747,7 @@ msgstr "ベクトルマップ <%s> は既に存在し上書きされます"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59758,6 +59780,8 @@ msgstr "ベクトルマップ <%s> は既に存在し上書きされます"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -60037,6 +60061,7 @@ msgstr[0] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -60083,6 +60108,9 @@ msgstr[0] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr "ベクトルマップ <%s> は既に存在"
@@ -77400,6 +77428,7 @@ msgstr "座標 [%s] を横文解析できません"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -77434,6 +77463,8 @@ msgstr "座標 [%s] を横文解析できません"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.graph/do_graph.c:98
 msgid "Unable to read color"
 msgstr "色を読み込めません"
@@ -77456,6 +77487,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -77485,6 +77517,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../raster/r.colors/edit_colors.c:426
 #, c-format
 msgid "Color table 'grey.eq' is not supported for floating point %s map"
@@ -77558,6 +77592,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -77617,6 +77652,9 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../display/d.graph/do_graph.c:372
 msgid "Cannot read symbol, cannot display points"
@@ -79272,6 +79310,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79294,6 +79333,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Coordinates to profile"
 msgstr ""
 
@@ -79319,6 +79360,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79413,6 +79455,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -79440,6 +79484,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79462,6 +79507,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -79479,6 +79526,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79549,6 +79597,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -79591,6 +79641,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79613,6 +79664,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile data has been written"
 msgstr ""
 
@@ -79629,6 +79682,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79696,6 +79750,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:751
 msgid "Failed to profile the computation, please check the parameters"
@@ -79716,6 +79772,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Internal error in %s()"
 msgstr ""
@@ -79801,6 +79858,11 @@ msgstr ""
 msgid "Internal error in %s()"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Internal error in %s()"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/bordwalk.c:92 ../raster/r.proj/bordwalk.c:139
 #, c-format
@@ -83827,6 +83889,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -83859,6 +83922,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Classification of a vector maps based on the values in attribute tables"
@@ -85754,6 +85819,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -85801,6 +85867,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Text color, either a standard GRASS color or R:G:B triplet"
 #~ msgstr "テキストカラー, 標準GRASSカラーまたはR:G:B triplet"
 
@@ -86690,6 +86758,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -86719,6 +86788,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "<%s> not found"
 msgstr "<%s>は見つかりません"
 
@@ -86744,6 +86815,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -86786,5 +86858,7 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%s=%s,%s: files are the same, no copy required"
 msgstr "%s=%s,%s: ファイルは同じです、 コピーは必要ありません"
diff --git a/locale/po/grassmods_ko.po b/locale/po/grassmods_ko.po
index 833c97c7dab..2efd8a31349 100644
--- a/locale/po/grassmods_ko.po
+++ b/locale/po/grassmods_ko.po
@@ -27352,6 +27352,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27443,6 +27444,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../imagery/i.atcorr/computations.cpp:178
 msgid "Check aerosol measurements or plane altitude"
@@ -39497,6 +39503,7 @@ msgid "image collections"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -39547,6 +39554,9 @@ msgid "image collections"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/i.band_to_translate.c:6
@@ -39564,6 +39574,7 @@ msgid "Name of band reference identifier (example: S2_1)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39601,6 +39612,8 @@ msgid "Name of band reference identifier (example: S2_1)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -49058,6 +49071,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -49149,6 +49163,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/r.series.diversity_to_translate.c:12
 #, fuzzy
@@ -58831,6 +58850,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58863,6 +58883,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -58879,6 +58901,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58911,6 +58934,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -59190,6 +59215,7 @@ msgstr[0] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59236,6 +59262,9 @@ msgstr[0] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr ""
@@ -78896,6 +78925,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -78967,6 +78997,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -78989,6 +79023,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79011,6 +79046,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile output file name (\"-\" for stdout)"
 msgstr ""
 
@@ -79027,6 +79064,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79094,6 +79132,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -79124,6 +79164,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Failed to open output file <%s>: %d (%s)"
 msgstr ""
@@ -79209,6 +79250,11 @@ msgstr ""
 msgid "Failed to open output file <%s>: %d (%s)"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Failed to open output file <%s>: %d (%s)"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -79251,6 +79297,7 @@ msgstr "알려지지 않은 출력 자료형"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79273,6 +79320,8 @@ msgstr "알려지지 않은 출력 자료형"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile data has been written"
 msgstr ""
 
@@ -79289,6 +79338,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79356,6 +79406,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:751
 msgid "Failed to profile the computation, please check the parameters"
@@ -79376,6 +79428,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Internal error in %s()"
 msgstr ""
@@ -79461,6 +79514,11 @@ msgstr ""
 msgid "Internal error in %s()"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Internal error in %s()"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/bordwalk.c:92 ../raster/r.proj/bordwalk.c:139
 #, c-format
@@ -83518,6 +83576,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -83550,6 +83609,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Name of training vector map"
 #~ msgstr "벡터 지도의 이름"
@@ -83688,6 +83749,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -83720,6 +83782,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Remove all registered maps from the temporal and also from the spatial "
 #~ "database"
@@ -85821,6 +85885,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Can not read control points for group <%s>"
 msgstr "그룹 <%s>를 위한 제어점을 읽을 수 없습니다"
 
@@ -85871,6 +85936,8 @@ msgstr "각 셀의 값은 그 주변 벡터 점 또는 도심에 할당된 속
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Error in pj_do_proj3"
 #~ msgstr "pj_do_proj3 내에 오류"
 
@@ -85939,6 +86006,7 @@ msgstr "각 셀의 값은 그 주변 벡터 점 또는 도심에 할당된 속
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -85968,6 +86036,8 @@ msgstr "각 셀의 값은 그 주변 벡터 점 또는 도심에 할당된 속
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Can not read control points for group <%s>"
 msgstr "그룹 <%s>를 위한 제어점을 읽을 수 없습니다"
 
@@ -85992,6 +86062,7 @@ msgstr "각 셀의 값은 그 주변 벡터 점 또는 도심에 할당된 속
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -86034,5 +86105,7 @@ msgstr "각 셀의 값은 그 주변 벡터 점 또는 도심에 할당된 속
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%s=%s,%s: files are the same, no copy required"
 msgstr "%s=%s,%s: 파일이 똑같아서 복사할 필요가 없습니다"
diff --git a/locale/po/grassmods_lv.po b/locale/po/grassmods_lv.po
index 812a8b239d3..b1e20315868 100644
--- a/locale/po/grassmods_lv.po
+++ b/locale/po/grassmods_lv.po
@@ -92712,6 +92712,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -92744,6 +92745,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Name of training vector map"
 #~ msgstr "Vektorkartes nosaukums"
diff --git a/locale/po/grassmods_pl.po b/locale/po/grassmods_pl.po
index d1749e08283..25bc6599820 100644
--- a/locale/po/grassmods_pl.po
+++ b/locale/po/grassmods_pl.po
@@ -27807,6 +27807,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27898,6 +27899,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../imagery/i.atcorr/geomcond.cpp:232
 msgid "No possibility to compute lat. and long."
@@ -40209,6 +40215,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -40300,6 +40307,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/g.proj.identify_to_translate.c:8
 msgid "Input EPSG code"
@@ -59264,6 +59276,7 @@ msgstr "Mapa wektorowa <%s> już istnieje i zostanie nadpisana"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59296,6 +59309,8 @@ msgstr "Mapa wektorowa <%s> już istnieje i zostanie nadpisana"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -59312,6 +59327,7 @@ msgstr "Mapa wektorowa <%s> już istnieje i zostanie nadpisana"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59344,6 +59360,8 @@ msgstr "Mapa wektorowa <%s> już istnieje i zostanie nadpisana"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -59632,6 +59650,7 @@ msgstr[3] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59678,6 +59697,9 @@ msgstr[3] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr ""
@@ -77616,6 +77638,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -77707,6 +77730,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../display/d.graph/do_graph.c:372
 msgid "Cannot read symbol, cannot display points"
@@ -79379,6 +79407,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -79450,6 +79479,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -79472,6 +79505,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79494,6 +79528,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile output file name (\"-\" for stdout)"
 msgstr ""
 
@@ -79515,6 +79551,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79597,6 +79634,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:302
 #, c-format
@@ -79619,6 +79658,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79641,6 +79681,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -79658,6 +79700,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79728,6 +79771,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -79773,6 +79818,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Failed writing profile data"
 msgstr ""
 =======
@@ -79844,6 +79890,10 @@ msgstr ""
 msgid "Failed writing profile data"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Failed writing profile data"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:751
 msgid "Failed to profile the computation, please check the parameters"
@@ -83890,6 +83940,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -83922,6 +83973,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Classification of a vector maps based on the values in attribute tables"
diff --git a/locale/po/grassmods_pt.po b/locale/po/grassmods_pt.po
index 7a39c880db6..e733dfae24f 100644
--- a/locale/po/grassmods_pt.po
+++ b/locale/po/grassmods_pt.po
@@ -27660,6 +27660,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27751,6 +27752,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../imagery/i.atcorr/geomcond.cpp:91
 msgid "The sun is not raised"
@@ -57823,6 +57829,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -57855,6 +57862,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -57871,6 +57880,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -57903,6 +57913,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -58185,6 +58197,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58231,6 +58244,9 @@ msgstr[1] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr ""
@@ -81542,6 +81558,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -81613,6 +81630,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -81635,6 +81656,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -81657,6 +81679,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile output file name (\"-\" for stdout)"
 msgstr ""
 
@@ -81673,6 +81697,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -81740,6 +81765,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -85828,6 +85855,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -85860,6 +85888,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "layer name or number to use for data"
 #~ msgstr "Camada número"
diff --git a/locale/po/grassmods_pt_BR.po b/locale/po/grassmods_pt_BR.po
index 20f055bd41f..4d9aba4c00b 100644
--- a/locale/po/grassmods_pt_BR.po
+++ b/locale/po/grassmods_pt_BR.po
@@ -30011,6 +30011,7 @@ msgid "Apriori Phi (roll) standard deviation"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -30061,6 +30062,9 @@ msgid "Apriori Phi (roll) standard deviation"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:117
@@ -30902,6 +30906,7 @@ msgid "Name of the directory where the image and metadata file are stored (*.SAF
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30939,6 +30944,8 @@ msgid "Name of the directory where the image and metadata file are stored (*.SAF
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -46526,6 +46533,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -46617,6 +46625,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/g.proj.identify_to_translate.c:8
 msgid "Input EPSG code"
@@ -60362,6 +60375,7 @@ msgstr "Nome da coluna que contém a coordenada y"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -60415,6 +60429,9 @@ msgstr "A primeira coluna é 1"
 =======
 #: ../locale/scriptstrings/r.area.createweight_to_translate.c:17
 >>>>>>> osgeo-main
+=======
+#: ../locale/scriptstrings/r.area.createweight_to_translate.c:17
+>>>>>>> osgeo-main
 #, fuzzy
 msgid "Format: All values must be >0"
 msgstr "O valor limiar deve ser >= 0"
@@ -60437,6 +60454,7 @@ msgstr "Arquivo de entrada"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -60519,6 +60537,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.area.createweight_to_translate.c:20
 #: ../locale/scriptstrings/r.area.createweight_to_translate.c:23
 msgid "E.g. Land cover, Land use, morphological areas..."
@@ -60537,6 +60557,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -60569,6 +60590,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 msgid "Input raster 2 (optional)"
 msgstr "Gera arquivo com a direção da encosta"
@@ -63140,6 +63163,7 @@ msgstr "Título do mapa vetorial"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Vector points map where each point is used as training sample. Handling of missing values in training data can be chosen later."
 =======
 msgid "Vector points map where each point is used as training sample. Handling of missing values in training data can be choosen later."
@@ -63191,6 +63215,9 @@ msgid "Vector points map where each point is used as training sample. Handling o
 =======
 msgid "Vector points map where each point is used as training sample. Handling of missing values in training data can be chosen later."
 >>>>>>> osgeo-main
+=======
+msgid "Vector points map where each point is used as training sample. Handling of missing values in training data can be chosen later."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.learn.ml_to_translate.c:15
@@ -64918,6 +64945,7 @@ msgstr "Interpolando %d pontos"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Additional settings for chosen interpolation (see manual)"
 =======
 msgid "Additional settings for choosen interpolation (see manual)"
@@ -64969,6 +64997,9 @@ msgid "Additional settings for chosen interpolation (see manual)"
 =======
 msgid "Additional settings for chosen interpolation (see manual)"
 >>>>>>> osgeo-main
+=======
+msgid "Additional settings for chosen interpolation (see manual)"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.mwprecip_to_translate.c:38
@@ -66816,6 +66847,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Print extended metadata information"
 msgstr ""
 =======
@@ -66887,6 +66919,10 @@ msgstr ""
 msgid "Print extended metadata information"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Print extended metadata information"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/v.in.csv_to_translate.c:1
 msgid "Import a CSV file using pyproj for CRS transformation"
@@ -72181,299 +72217,1284 @@ msgstr "Não foi possível ler o nome do banco de dados"
 msgid "Unable to read name of driver"
 msgstr "Não foi possível ler o nome do driver"
 
-#: ../vector/v.lidar.edgedetection/main.c:227
-#: ../vector/v.lidar.edgedetection/main.c:239
-#: ../vector/v.lidar.edgedetection/main.c:261
-#: ../vector/v.lidar.correction/main.c:199
-#: ../vector/v.lidar.correction/main.c:235 ../vector/v.surf.bspline/main.c:246
-#: ../vector/v.surf.bspline/main.c:406 ../vector/v.outlier/main.c:193
-#: ../vector/v.outlier/main.c:261 ../vector/v.lidar.growing/main.c:163
+#: ../vector/v.lidar.edgedetection/main.c:227
+#: ../vector/v.lidar.edgedetection/main.c:239
+#: ../vector/v.lidar.edgedetection/main.c:261
+#: ../vector/v.lidar.correction/main.c:199
+#: ../vector/v.lidar.correction/main.c:235 ../vector/v.surf.bspline/main.c:246
+#: ../vector/v.surf.bspline/main.c:406 ../vector/v.outlier/main.c:193
+#: ../vector/v.outlier/main.c:261 ../vector/v.lidar.growing/main.c:163
+#, c-format
+msgid "No database connection for driver <%s> is defined. Run db.connect."
+msgstr "Nenhuma conexão de banco de dados para o driver <%s> está definida. Execute db.connect."
+
+#: ../vector/v.lidar.edgedetection/main.c:230
+#: ../vector/v.lidar.edgedetection/main.c:242
+#: ../vector/v.lidar.correction/main.c:204 ../vector/v.surf.bspline/main.c:251
+#: ../vector/v.outlier/main.c:198
+msgid "Old auxiliary table could not be dropped"
+msgstr "A tabela auxiliar antiga não pode ser descartada"
+
+#: ../vector/v.lidar.edgedetection/main.c:267
+#, c-format
+msgid "It was impossible to create <%s>."
+msgstr "Foi impossível criar <%s>."
+
+#: ../vector/v.lidar.edgedetection/main.c:270
+#, c-format
+msgid "It was impossible to create <%s> interpolation table in database."
+msgstr "Foi impossível criar <%s> tabela de interpolação na base de dados"
+
+#: ../vector/v.lidar.edgedetection/main.c:304
+#: ../vector/v.surf.bspline/main.c:537 ../vector/v.outlier/main.c:300
+#, c-format
+msgid "Adjusted EW splines %d"
+msgstr "Splines EW %dajustadas"
+
+#: ../vector/v.lidar.edgedetection/main.c:305
+#: ../vector/v.surf.bspline/main.c:538 ../vector/v.outlier/main.c:301
+#, c-format
+msgid "Adjusted NS splines %d"
+msgstr "Splines NS %dajustadas"
+
+#: ../vector/v.lidar.edgedetection/main.c:360
+#: ../vector/v.lidar.correction/main.c:338 ../vector/v.lidar.growing/main.c:246
+#, c-format
+msgid "Subregion %d of %d"
+msgstr "Sub-região %d de %d"
+
+#: ../vector/v.lidar.edgedetection/main.c:423
+msgid "Performing bilinear interpolation..."
+msgstr "Executando interpolação bilinear..."
+
+#: ../vector/v.lidar.edgedetection/main.c:440
+msgid "Performing bicubic interpolation..."
+msgstr "Executando interpolação bicúbica..."
+
+#: ../vector/v.lidar.edgedetection/main.c:452
+msgid "Point classification..."
+msgstr "Classificação de pontos..."
+
+#: ../vector/v.lidar.edgedetection/main.c:466
+#: ../vector/v.lidar.correction/main.c:433
+msgid "No data within this subregion. Consider changing the spline step."
+msgstr "Não há dados nesta sub-região. Considere alterar o passo da spline."
+
+#: ../vector/v.lidar.edgedetection/main.c:476
+#: ../vector/v.lidar.correction/main.c:444 ../vector/v.surf.bspline/main.c:925
+#: ../vector/v.outlier/main.c:460
+msgid "Auxiliary table could not be dropped"
+msgstr "A tabela auxiliar não pode ser descartada"
+
+#: ../vector/v.to.rast3/main.c:51
+msgid "Converts a vector map (only points) into a 3D raster map."
+msgstr "Converte um mapa vetorial (apenas pontos) em um mapa raster 3D."
+
+#: ../vector/v.to.rast3/main.c:62
+msgid "Name of attribute column (data type must be numeric)"
+msgstr "Nome da coluna de atributo (o tipo de dados deve ser numérico)"
+
+#: ../vector/v.to.rast3/main.c:80 ../vector/v.db.select/main.c:209
+#: ../vector/v.to.rast/vect2rast.c:55 ../vector/v.info/print.c:155
+#: ../vector/v.random/main.c:271 ../vector/v.distance/main.c:526
+#: ../vector/v.distance/main.c:607 ../vector/v.db.connect/main.c:214
+#: ../vector/v.colors.out/make_colors.c:31 ../vector/v.to.3d/trans2.c:49
+#: ../vector/v.to.3d/trans3.c:51 ../vector/v.extract/main.c:217
+#: ../vector/v.extract/main.c:315
+#, c-format
+msgid "Database connection not defined for layer <%s>"
+msgstr "Conexão de banco de dados não definida para camada <%s>"
+
+#: ../vector/v.to.rast3/main.c:99 ../vector/v.what.rast/main.c:183
+#: ../vector/v.sample/main.c:240 ../vector/v.buffer/main.c:448
+#: ../vector/v.class/main.c:129 ../vector/v.surf.bspline/crosscorr.c:133
+#: ../vector/v.surf.bspline/main.c:389 ../vector/v.surf.idw/read_sites.c:65
+msgid "Column type not supported"
+msgstr "Tipo de coluna não suportado"
+
+#: ../vector/v.to.rast3/main.c:107
+msgid "Unable to create output map"
+msgstr "Não foi possível criar mapa de saída"
+
+#: ../vector/v.to.rast3/main.c:145 ../vector/v.to.rast/do_lines.c:68
+#: ../vector/v.to.rast/do_lines.c:76
+#, c-format
+msgid "No record for line (cat = %d)"
+msgstr "Sem registros para a linha (cat = %d)"
+
+#: ../vector/v.to.rast3/main.c:157
+msgid "Unable to close new 3d raster map"
+msgstr "Não foi possível fechar o novo mapa raster 3D"
+
+#: ../vector/v.net.iso/main.c:78 ../vector/v.net.alloc/main.c:66
+#: ../raster/r.walk/main.c:209 ../raster/r.cost/main.c:167
+msgid "cost allocation"
+msgstr "alocação de custos"
+
+#: ../vector/v.net.iso/main.c:79
+msgid "isolines"
+msgstr "isolinhas"
+
+#: ../vector/v.net.iso/main.c:80
+msgid "Splits subnets for nearest centers by cost isolines."
+msgstr "Divide sub-redes para centros mais próximos por isolinhas de custo."
+
+#: ../vector/v.net.iso/main.c:82
+msgid "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 a rede em bandas entre as isolinhas de custo (direção do centro). O nó central deve ser aberto (costs > = 0). Os custos do nó central são usados ​​no cálculo."
+
+#: ../vector/v.net.iso/main.c:95 ../vector/v.net.alloc/main.c:81
+msgid "Use costs from centers or costs to centers"
+msgstr "Use custos de centros ou custos para centros"
+
+#: ../vector/v.net.iso/main.c:96 ../vector/v.net.iso/main.c:136
+#: ../vector/v.net.iso/main.c:141 ../vector/v.net.iso/main.c:146
+#: ../vector/v.net.connectivity/main.c:65
+#: ../vector/v.net.connectivity/main.c:71
+#: ../vector/v.net.connectivity/main.c:78
+#: ../vector/v.net.connectivity/main.c:84
+#: ../vector/v.net.connectivity/main.c:92 ../vector/v.net.flow/main.c:71
+#: ../vector/v.net.flow/main.c:77 ../vector/v.net.flow/main.c:91
+#: ../vector/v.net.flow/main.c:97 ../vector/v.net.flow/main.c:103
+#: ../vector/v.net.bridge/main.c:61 ../vector/v.net.bridge/main.c:67
+#: ../vector/v.net.bridge/main.c:74 ../vector/v.net.bridge/main.c:80
+#: ../vector/v.net.bridge/main.c:87 ../vector/v.net.alloc/main.c:82
+#: ../vector/v.net.alloc/main.c:115 ../vector/v.net.alloc/main.c:120
+#: ../vector/v.net.alloc/main.c:125 ../vector/v.net.salesman/main.c:169
+#: ../vector/v.net.salesman/main.c:177 ../vector/v.net.path/main.c:80
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+#: ../vector/v.net.path/main.c:87 ../vector/v.net.path/main.c:94
+#: ../vector/v.net.flow/main.c:70 ../vector/v.net.flow/main.c:76
+#: ../vector/v.net.flow/main.c:90 ../vector/v.net.flow/main.c:96
+#: ../vector/v.net.flow/main.c:102 ../vector/v.net.alloc/main.c:79
+#: ../vector/v.net.alloc/main.c:112 ../vector/v.net.alloc/main.c:117
+#: ../vector/v.net.alloc/main.c:122 ../vector/v.net.centrality/main.c:110
+#: ../vector/v.net.centrality/main.c:116 ../vector/v.net.centrality/main.c:130
+#: ../vector/v.net.centrality/main.c:136 ../vector/v.net.centrality/main.c:143
+#: ../vector/v.net.spanningtree/main.c:59
+#: ../vector/v.net.spanningtree/main.c:65
+#: ../vector/v.net.spanningtree/main.c:72
+#: ../vector/v.net.spanningtree/main.c:78 ../vector/v.net.allpairs/main.c:94
+#: ../vector/v.net.allpairs/main.c:100 ../vector/v.net.allpairs/main.c:107
+#: ../vector/v.net.connectivity/main.c:64
+#: ../vector/v.net.connectivity/main.c:70
+#: ../vector/v.net.connectivity/main.c:77
+#: ../vector/v.net.connectivity/main.c:83
+#: ../vector/v.net.connectivity/main.c:91
+msgid "Cost"
+msgstr "Custo"
+
+<<<<<<< HEAD
+#: ../vector/v.net.iso/main.c:102 ../vector/v.net.alloc/main.c:88
+msgid "Categories of centers (points on nodes) to which net will be allocated, layer for this categories is given by nlayer option"
+msgstr "Categorias de centros (pontos em nós) para os quais a rede será alocada, a camada para essas categorias é fornecida pela opção nlayer"
+
+#: ../vector/v.net.iso/main.c:111
+msgid "Costs for isolines"
+msgstr "Custos para isolinhas"
+
+#: ../vector/v.net.iso/main.c:145 ../vector/v.net.connectivity/main.c:91
+#: ../vector/v.net.flow/main.c:102 ../vector/v.net.bridge/main.c:86
+#: ../vector/v.net.alloc/main.c:124 ../vector/v.net.path/main.c:93
+#: ../vector/v.net.centrality/main.c:142 ../vector/v.net.spanningtree/main.c:78
+#: ../vector/v.net.timetable/main.c:302 ../vector/v.net.components/main.c:110
+#: ../vector/v.net.allpairs/main.c:106 ../vector/v.net.distance/main.c:153
+msgid "Node cost column (number)"
+msgstr "Coluna de custo do nó (número)"
+
+#: ../vector/v.net.iso/main.c:150 ../vector/v.net.alloc/main.c:129
+#: ../vector/v.net.salesman/main.c:181 ../vector/v.net.path/main.c:110
+=======
+#: ../vector/v.net.salesman/main.c:177
+msgid "EXPERIMENTAL: Arc backward direction cost column (number)"
+msgstr ""
+
+#: ../vector/v.net.salesman/main.c:182 ../vector/v.net.iso/main.c:149
+#: ../vector/v.net.path/main.c:111 ../vector/v.net.alloc/main.c:126
+>>>>>>> osgeo-main
+msgid "Use turntable"
+msgstr ""
+
+#: ../vector/v.net.salesman/main.c:183 ../vector/v.net.salesman/main.c:190
+#: ../vector/v.net.salesman/main.c:197 ../vector/v.net.iso/main.c:150
+#: ../vector/v.net.iso/main.c:157 ../vector/v.net.iso/main.c:164
+#: ../vector/v.net.path/main.c:112 ../vector/v.net.path/main.c:119
+#: ../vector/v.net.path/main.c:126 ../vector/v.net.alloc/main.c:127
+#: ../vector/v.net.alloc/main.c:134 ../vector/v.net.alloc/main.c:141
+#: ../vector/v.net/args.c:63 ../vector/v.net/args.c:110
+#: ../vector/v.net/args.c:122
+msgid "Turntable"
+msgstr ""
+
+#: ../vector/v.net.salesman/main.c:188 ../vector/v.net.iso/main.c:155
+#: ../vector/v.net.path/main.c:117 ../vector/v.net.alloc/main.c:132
+msgid "Layer with turntable"
+msgstr ""
+
+#: ../vector/v.net.salesman/main.c:189 ../vector/v.net.salesman/main.c:196
+#: ../vector/v.net.iso/main.c:156 ../vector/v.net.iso/main.c:163
+#: ../vector/v.net.path/main.c:118 ../vector/v.net.path/main.c:125
+#: ../vector/v.net.alloc/main.c:133 ../vector/v.net.alloc/main.c:140
+msgid "Relevant only with -t flag"
+msgstr "Relevante apenas com a flag -t"
+
+#: ../vector/v.net.salesman/main.c:195 ../vector/v.net.iso/main.c:162
+#: ../vector/v.net.path/main.c:124 ../vector/v.net.alloc/main.c:139
+#: ../vector/v.net/args.c:113
+msgid "Layer with unique categories used in turntable"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../vector/v.net.salesman/main.c:204
+msgid "Name for output file holding node sequence (\"-\" for stdout)"
+msgstr ""
+"Nome para o arquivo de saída que contém a sequência de nós (\"-\" para "
+"stdout)"
+
+#: ../vector/v.net.salesman/main.c:209 ../vector/v.net.distance/main.c:161
+#: ../vector/v.net.iso/main.c:169 ../vector/v.net.steiner/main.c:406
+#: ../vector/v.net.path/main.c:131 ../vector/v.net.alloc/main.c:146
+#: ../vector/v.net.centrality/main.c:188 ../vector/v.net.spanningtree/main.c:83
+#: ../vector/v.net.allpairs/main.c:112
+#, fuzzy
+msgid "Use geodesic calculation for longitude-latitude projects"
+msgstr "Use o cálculo geodésico para locations longitude-latitude"
+
+#: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276
+#: ../vector/v.net.alloc/main.c:216
+msgid "Point is not connected to the network"
+msgstr "O ponto não está conectado à rede"
+
+#: ../vector/v.net.salesman/main.c:284
+=======
+#: ../vector/v.net.iso/main.c:177 ../vector/v.net.alloc/main.c:156
+msgid "Create unique categories and attribute table"
+msgstr "Crie categorias e tabela de atributos exclusivas"
+
+#: ../vector/v.net.iso/main.c:179
+msgid "Default: one category for each iso-band"
+msgstr "Padrão: uma categoria para cada banda iso"
+
+#: ../vector/v.net.iso/main.c:215
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> main
+=======
+=======
+=======
+=======
+=======
+=======
+=======
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> main
+=======
+=======
+=======
+=======
+=======
+=======
+=======
+#, c-format
+msgid "Wrong iso cost: %f"
+msgstr "Custo da iso errado: %f"
+
+#: ../vector/v.net.iso/main.c:218
+#, c-format
+msgid "Iso cost: %f less than previous"
+msgstr "Custo da iso: %f menor que o anterior"
+
+#: ../vector/v.net.iso/main.c:223
+#, c-format
+msgid "Iso cost %d: %f"
+msgstr "Custo da iso %d: %f"
+
+#: ../vector/v.net.iso/main.c:231
+msgid "Not enough costs, everything reachable falls to first band"
+msgstr "Custos insuficientes, tudo o que é alcançável cai para a primeira faixa"
+
+#: ../vector/v.net.iso/main.c:282 ../vector/v.net.alloc/main.c:224
+#: ../vector/v.net.salesman/main.c:277
+msgid "Point is not connected to the network"
+msgstr "O ponto não está conectado à rede"
+
+#: ../vector/v.net.iso/main.c:290 ../vector/v.net.alloc/main.c:232
+msgid "Center at closed node (costs = -1) ignored"
+msgstr "Centro no nó fechado (custos = -1) ignorado"
+
+#: ../vector/v.net.iso/main.c:308 ../vector/v.net.alloc/main.c:250
+#, c-format
+msgid "Number of centers: %d (nlayer %d)"
+msgstr "Número de centros: %d (nlayer %d)"
+
+#: ../vector/v.net.iso/main.c:311 ../vector/v.net.alloc/main.c:253
+msgid "Not enough centers for selected nlayer. Nothing will be allocated."
+msgstr "Centros insuficientes para a camada selecionada. Nada será alocado."
+
+#: ../vector/v.net.iso/main.c:333 ../vector/v.net.iso/main.c:345
+#: ../vector/v.net.alloc/main.c:275 ../vector/v.net.alloc/main.c:287
+msgid "Calculating costs from centers ..."
+msgstr "Calculando custos dos centros..."
+
+#: ../vector/v.net.iso/main.c:338 ../vector/v.net.iso/main.c:349
+#: ../vector/v.net.alloc/main.c:280 ../vector/v.net.alloc/main.c:291
+msgid "Calculating costs to centers ..."
+msgstr "Calculando custos para centros..."
+
+#: ../vector/v.net.iso/main.c:394 ../vector/v.sample/main.c:193
+#: ../vector/v.net.flow/main.c:185 ../vector/v.net.alloc/main.c:333
+#: ../vector/v.net.path/path.c:113 ../vector/v.net.centrality/main.c:270
+#: ../vector/v.db.connect/main.c:338 ../vector/v.net.timetable/main.c:107
+#: ../vector/v.net.components/main.c:194 ../vector/v.kcv/main.c:176
+#: ../vector/v.net.allpairs/main.c:183 ../vector/v.net.distance/main.c:295
+msgid "Cannot create index"
+msgstr "Não consegui criar índice"
+
+#: ../vector/v.net.iso/main.c:398 ../vector/v.net.flow/main.c:189
+#: ../vector/v.net.alloc/main.c:337 ../vector/v.net.path/path.c:117
+#: ../vector/v.net.centrality/main.c:274 ../vector/v.net.timetable/main.c:112
+#: ../vector/v.net.components/main.c:198 ../vector/v.net.allpairs/main.c:187
+#: ../vector/v.net.distance/main.c:299
+#, c-format
+msgid "Cannot grant privileges on table <%s>"
+msgstr "Não é possível conceder privilégios na tabela <%s>"
+
+#: ../vector/v.net.iso/main.c:403
+msgid "Generating isolines..."
+msgstr "Gerando isolinhas..."
+
+#: ../vector/v.net.iso/main.c:704 ../vector/v.net.alloc/main.c:592
+#: ../vector/v.net.alloc/main.c:627
+msgid "Cannot get line segment, segment out of line"
+msgstr "Não é possível obter segmento de linha, segmento fora da linha"
+
+#: ../vector/v.net.iso/main.c:724 ../vector/v.net.iso/main.c:754
+#: ../vector/v.net.flow/main.c:262 ../vector/v.net.alloc/main.c:432
+#: ../vector/v.net.alloc/main.c:464 ../vector/v.net.alloc/main.c:495
+#: ../vector/v.net.alloc/main.c:533 ../vector/v.net.alloc/main.c:561
+#: ../vector/v.net.alloc/main.c:612 ../vector/v.net.alloc/main.c:648
+#: ../vector/v.net.alloc/main.c:679 ../vector/v.net.path/path.c:350
+#: ../vector/v.net.centrality/main.c:69 ../vector/v.net.timetable/main.c:134
+#: ../vector/v.net.timetable/main.c:156 ../vector/v.net.components/main.c:39
+#: ../vector/v.net.allpairs/main.c:271 ../vector/v.net.distance/main.c:363
+#: ../raster/r.random/random.c:189
+#, c-format
+msgid "Cannot insert new record: %s"
+msgstr "Não é possível inserir novo registro: %s"
+
+#: ../vector/v.parallel/main.c:53
+msgid "Creates parallel line to input vector lines."
+msgstr "Cria uma linha paralela para inserir linhas de vetor."
+
+#: ../vector/v.parallel/main.c:68
+msgid "Offset along major axis in map units"
+msgstr "Deslocamento ao longo do eixo principal em unidades de mapa"
+
+#: ../vector/v.parallel/main.c:76
+msgid "Offset along minor axis in map units"
+msgstr "Deslocamento ao longo do eixo secundário em unidades de mapa"
+
+#: ../vector/v.parallel/main.c:84 ../vector/v.buffer/main.c:271
+msgid "Angle of major axis in degrees"
+msgstr "Ângulo do eixo principal em graus"
+
+#: ../vector/v.parallel/main.c:93
+msgid "Side"
+msgstr "Lado"
+
+#: ../vector/v.parallel/main.c:97
+msgid "Parallel line is on the left"
+msgstr "A linha paralela está à esquerda"
+
+#: ../vector/v.parallel/main.c:98
+msgid "Parallel line is on the right"
+msgstr "A linha paralela está à direita"
+
+#: ../vector/v.parallel/main.c:99
+msgid "Parallel lines on both sides"
+msgstr "As linhas paralelas estão dos dois lados"
+
+#: ../vector/v.parallel/main.c:108
+msgid "Tolerance of arc polylines in map units"
+msgstr "Tolerância de polilinhas de arco em unidades de mapa"
+
+#: ../vector/v.parallel/main.c:112
+msgid "Make outside corners round"
+msgstr "Fazer os cantos externos arredondados"
+
+#: ../vector/v.parallel/main.c:116
+msgid "Create buffer-like parallel lines"
+msgstr "Criar linhas paralelas semelhantes a buffer"
+
+#: ../vector/v.net.visibility/main.c:48
+msgid "visibility"
+msgstr "visibility"
+
+#: ../vector/v.net.visibility/main.c:49
+msgid "Performs visibility graph construction."
+msgstr "Executa a construção do gráfico de visibilidade."
+
+#: ../vector/v.net.visibility/main.c:60
+msgid "Name of input vector map containing visible points"
+msgstr "Nome do mapa vetorial de entrada contendo pontos visíveis"
+
+#: ../vector/v.net.visibility/main.c:61
+msgid "Add points after computing the visibility graph"
+msgstr "Adicionar pontos após calcular o gráfico de visibilidade"
+
+#: ../vector/v.net.visibility/main.c:85
+#, c-format
+msgid "Unable to copy elements from vector map <%s>"
+msgstr "Não foi possível copiar elementos do mapa vetorial <%s>"
+
+#: ../vector/v.net.visibility/main.c:90
+msgid "Lat-long projection"
+msgstr "Projeção lat-long"
+
+#: ../vector/v.out.dxf/main.c:59
+msgid "DXF"
+msgstr "DXF"
+
+#: ../vector/v.out.dxf/main.c:61
+msgid "Exports vector map to DXF file format."
+msgstr "Exporta o mapa vetorial para o formato de arquivo DXF."
+
+#: ../vector/v.out.dxf/main.c:69
+msgid "Name for DXF output file"
+msgstr "Nome para o arquivo de saída DXF"
+
+#: ../vector/v.out.dxf/main.c:94
+#, c-format
+msgid "%d features written to '%s'."
+msgstr "%d feições escritas para '%s'."
+
+#: ../vector/v.out.dxf/write_dxf.c:21
+#, c-format
+msgid "The file '%s' already exists."
+msgstr "O arquivo '%s' já existe."
+
+#: ../vector/v.out.dxf/write_dxf.c:23
+#, c-format
+msgid "The file '%s' already exists and will be overwritten."
+msgstr "O arquivo '%s' já existe e será substituído."
+
+#: ../vector/v.out.dxf/write_dxf.c:27
+#, c-format
+msgid "%s: Cannot write dxf file."
+msgstr "%s: Não é possível escrever o arquivo dxf."
+
+#: ../vector/v.external/list.c:94 ../vector/v.external.out/list.c:102
+#: ../vector/v.out.ogr/list.c:116 ../vector/v.in.ogr/main.c:442
+#: ../raster/r.in.gdal/main.c:314 ../raster/r.external/list.c:23
+msgid "Supported formats:"
+msgstr "Formatos suportados:"
+
+#: ../vector/v.external/list.c:111
+msgid "GRASS is not compiled with PostgreSQL support"
+msgstr "GRASS não é compilado com suporte PostgreSQL"
+
+#: ../vector/v.external/list.c:117
+msgid "GRASS is not compiled with OGR support"
+msgstr "GRASS não é compilado com suporte OGR"
+
+#: ../vector/v.external/list.c:158
+msgid "Connection to PostgreSQL database failed."
+msgstr "A conexão com o banco de dados PostgreSQL falhou."
+
+#: ../vector/v.external/list.c:168
+msgid "No feature tables found in database."
+msgstr "Nenhuma tabela de feição encontrada no banco de dados."
+
+#: ../vector/v.external/list.c:179
+#, c-format
+msgid "PostGIS database <%s> contains %d feature table:"
+msgid_plural "PostGIS database <%s> contains %d feature tables:"
+msgstr[0] "O banco de dados PostGIS <%s> contém %d tabela de feição:"
+msgstr[1] "O banco de dados PostGIS <%s> contém %d tabelas de feições:"
+
+#: ../vector/v.external/list.c:260
+#, c-format
+msgid "Unable to open data source '%s'"
+msgstr "Não foi possível abrir a fonte de dados '%s'"
+
+#: ../vector/v.external/list.c:267
+#, c-format
+msgid "Data source <%s> (format '%s') contains %d layer:"
+msgid_plural "Data source <%s> (format '%s') contains %d layers:"
+msgstr[0] "A fonte de dados <%s> (formato '%s') contém %d camada:"
+msgstr[1] "A fonte de dados <%s> (formato '%s') contém %d camadas:"
+
+#: ../vector/v.external/list.c:310
+#, c-format
+msgid "Unable to convert input map projection to GRASS format. Projection check cannot be provided for OGR layer <%s>"
+msgstr "Não foi possível converter a projeção do mapa de entrada para o formato GRASS. A verificação de projeção não pode ser fornecida para a camada OGR <%s>"
+
+#: ../vector/v.external/list.c:326
+#, c-format
+msgid "Invalid geometry column %d"
+msgstr "Coluna de geometria inválida %d"
+
+#: ../vector/v.external/args.c:15 ../vector/v.external.out/args.c:15
+msgid ""
+"Examples:\n"
+"\t\tESRI Shapefile: directory containing a shapefile\n"
+"\t\tMapInfo File: directory containing a mapinfo file\n"
+"\t\tPostGIS database: connection string, eg. 'PG:dbname=db user=grass'"
+msgstr ""
+"Exemplos:\n"
+"\t\tESRI Shapefile: diretório contendo um shapefile\n"
+"\t\tArquivo MapInfo: diretório contendo um arquivo mapinfo\n"
+"\t\tBanco de dados PostGIS: string de conexão, por exemplo. 'PG:dbname=db user=grass'"
+
+#: ../vector/v.external/args.c:27
+msgid "Name of OGR layer or PostGIS feature table to be linked"
+msgstr "Nome da camada OGR ou tabela de feição PostGIS a ser vinculada"
+
+#: ../vector/v.external/args.c:28
+msgid ""
+"Examples:\n"
+"\t\tESRI Shapefile: shapefile name\n"
+"\t\tMapInfo File: mapinfo file name\n"
+"\t\tPostGIS database: table name"
+msgstr ""
+"Exemplos:\n"
+"\t\tESRI Shapefile: nome do shapefile\n"
+"\t\tArquivo MapInfo: nome do arquivo mapinfo\n"
+"\t\tBanco de dados PostGIS: nome da tabela"
+
+#: ../vector/v.external/args.c:40
+msgid "Name for output GRASS vector map (default: input layer)"
+msgstr "Nome para o mapa vetorial GRASS de saída (padrão: camada de entrada)"
+
+#: ../vector/v.external/args.c:52 ../vector/v.in.ogr/main.c:393
+#: ../raster/r.in.gdal/main.c:235 ../raster/r.external/main.c:109
+msgid "Perform projection check only and exit"
+msgstr "Executar apenas a verificação de projeção e sair"
+
+#: ../vector/v.external/args.c:56 ../vector/v.external.out/args.c:62
+#: ../raster/r.in.gdal/main.c:249 ../raster/r.external.out/main.c:271
+#: ../raster/r.external/main.c:95
+msgid "List supported formats and exit"
+msgstr "Mostra os formatos suportados e encerra"
+
+#: ../vector/v.external/args.c:68
+msgid "List available layers including feature type in data source and exit"
+msgstr "Listar as camadas disponíveis, incluindo o tipo de feição na fonte de dados e sair"
+
+#: ../vector/v.external/args.c:70
+msgid "Format: layer name,type,projection check,geometry"
+msgstr "Formato: layer name,type,projection check,geometry"
+
+#: ../vector/v.external/proj.c:36 ../vector/v.in.ogr/proj.c:37
+#: ../vector/v.in.ogr/main.c:798
+#, c-format
+msgid "Geometry column <%s> not found in input layer <%s>"
+msgstr "Coluna de geometria <%s> não encontrada na camada de entrada <%s>"
+
+#: ../vector/v.external/proj.c:54 ../vector/v.in.ogr/proj.c:55
+msgid "Unable to convert input layer projection information to GRASS format for checking"
+msgstr "Não foi possível converter as informações de projeção da camada de entrada para o formato GRASS para verificação"
+
+#: ../vector/v.external/proj.c:60 ../vector/v.external/proj.c:88
+#: ../vector/v.in.ogr/proj.c:61 ../vector/v.in.ogr/proj.c:89
+msgid "Can't get WKT parameter string"
+msgstr "Não é possível obter string de parâmetro WKT"
+
+#: ../vector/v.external/proj.c:63 ../vector/v.external/proj.c:91
+#: ../vector/v.in.ogr/proj.c:64 ../vector/v.in.ogr/proj.c:92
+#, c-format
+msgid ""
+"WKT definition:\n"
+"%s"
+msgstr ""
+"Definição WKT:\n"
+"%s"
+
+#: ../vector/v.external/proj.c:73 ../vector/v.in.ogr/proj.c:74
+#, c-format
+msgid "No projection information available for layer <%s>"
+msgstr "Nenhuma informação de projeção disponível para a camada <%s>"
+
+#: ../vector/v.external/proj.c:81 ../vector/v.in.ogr/proj.c:82
+#, c-format
+msgid "Projection for layer <%s> does not contain a valid SRS"
+msgstr "A projeção para a camada <%s> não contém um SRS válido"
+
+#: ../vector/v.external/proj.c:201 ../vector/v.in.ogr/proj.c:335
+#: ../raster/r.in.gdal/proj.c:165 ../raster/r.external/proj.c:165
+msgid "Unable to convert input map projection information to GRASS format."
+msgstr "Não foi possível converter as informações de projeção do mapa de entrada para o formato GRASS."
+
+#: ../vector/v.external/proj.c:246 ../vector/v.external/proj.c:255
+#: ../vector/v.in.ogr/proj.c:380 ../vector/v.in.ogr/proj.c:389
+#: ../raster/r.in.gdal/proj.c:209 ../raster/r.in.gdal/proj.c:218
+#: ../raster/r.external/proj.c:209 ../raster/r.external/proj.c:218
+msgid "Location PROJ_INFO is:\n"
+msgstr "Locação PROJ_INFO é:\n"
+
+#: ../vector/v.external/proj.c:275 ../vector/v.external/proj.c:282
+#: ../vector/v.in.ogr/proj.c:409 ../vector/v.in.ogr/proj.c:416
+#: ../raster/r.in.gdal/proj.c:238 ../raster/r.in.gdal/proj.c:245
+#: ../raster/r.external/proj.c:238 ../raster/r.external/proj.c:245
+msgid "Dataset PROJ_INFO is:\n"
+msgstr "PROJ_INFO do conjunto de dados é:\n"
+
+#: ../vector/v.external/proj.c:368 ../vector/v.in.ogr/proj.c:502
+#: ../raster/r.in.gdal/proj.c:331 ../raster/r.external/proj.c:331
+msgid "Consider generating a new location from the input dataset using the 'location' parameter.\n"
+msgstr "Considere gerar uma nova locação a partir do conjunto de dados de entrada usando o parâmetro 'location'.\n"
+
+#: ../vector/v.external/main.c:59
+msgid "Creates a new pseudo-vector map as a link to an OGR-supported layer or a PostGIS feature table."
+msgstr "Cria um novo mapa pseudo-vetorial como um link para uma camada suportada por OGR ou uma tabela de feição PostGIS."
+
+#: ../vector/v.external/main.c:78 ../vector/v.external.out/format.c:22
+msgid "Environment variable GRASS_VECTOR_OGR defined, but GRASS is compiled with OGR support. Using GRASS-PostGIS data driver instead."
+msgstr "Variável de ambiente GRASS_VECTOR_OGR definida, mas GRASS é compilado com suporte OGR. Usando o driver de dados GRASS-PostGIS."
+
+#: ../vector/v.external/main.c:83 ../vector/v.external.out/format.c:27
+msgid "GRASS is not compiled with PostgreSQL support. Using OGR-PostgreSQL driver instead of native GRASS-PostGIS data driver."
+msgstr "GRASS não é compilado com suporte PostgreSQL. Usando o driver OGR-PostgreSQL em vez do driver de dados GRASS-PostGIS nativo."
+
+#: ../vector/v.external/main.c:110 ../vector/v.what.rast/main.c:121
+#: ../vector/v.edit/main.c:90 ../vector/v.in.ogr/main.c:483
+#: ../vector/v.proj/main.c:249 ../vector/v.net/args.c:152
+#: ../vector/v.net/args.c:159 ../vector/v.net/args.c:165
+#: ../vector/v.net/args.c:169 ../vector/v.net/args.c:179
+#: ../vector/v.select/main.c:91 ../raster/r.proj/main.c:309
+#: ../scripts/d.frame/d.frame.py:284
+#, c-format, python-format
+msgid "Required parameter <%s> not set"
+msgstr "parâmetro <%s> necessário não configurado"
+
+#: ../vector/v.external/main.c:124 ../vector/v.in.ogr/main.c:693
+#, c-format
+msgid "Layer <%s> not available"
+msgstr "Camada <%s> não disponível"
+
+#: ../vector/v.external/main.c:126
+msgid "No layer defined"
+msgstr "Nenhuma camada definida"
+
+#: ../vector/v.external/main.c:151 ../vector/v.in.ogr/main.c:584
+#, c-format
+msgid "Unable to open data source <%s>"
+msgstr "Não foi possível abrir a fonte de dados  <%s>"
+
+#: ../vector/v.external/main.c:192
+#, c-format
+msgid "Unable to delete '%s'"
+msgstr "Não foi possível excluir '%s'"
+
+#: ../vector/v.external/main.c:199
+#, c-format
+msgid "Unable to create file '%s/%s'"
+msgstr "Não foi possível criar o arquivo '%s/%s'"
+
+#: ../vector/v.external/main.c:233
+#, c-format
+msgid "Link to vector map <%s> created."
+msgstr "Link para o mapa vetorial <%s> criado."
+
+#: ../vector/v.external/dsn.c:21 ../vector/v.out.ogr/dsn.c:27
+#: ../vector/v.in.ogr/dsn.c:28
+msgid "Invalid connection string (dbname missing)"
+msgstr "String de conexão inválida (dbname ausente)"
+
+#: ../vector/v.what.rast/main.c:79
+msgid "Uploads raster values at positions of vector points to the table."
+msgstr "Carrega valores raster em posições de pontos vetoriais para a tabela."
+
+#: ../vector/v.what.rast/main.c:110
+msgid "Print categories and values instead of updating the database"
+msgstr "Imprimir categorias e valores em vez de atualizar o banco de dados"
+
+#: ../vector/v.what.rast/main.c:170
+#, c-format
+msgid "Column <%s> not found in the table <%s>. Creating..."
+msgstr "Coluna <%s> não encontrada na tabela <%s>. Criando ..."
+
+#: ../vector/v.what.rast/main.c:177 ../vector/v.colors/write_rgb.c:37
+#, c-format
+msgid "Unable to add column <%s> to table <%s>"
+msgstr "Não é possível adicionar coluna <%s> à tabela <%s>"
+
+#: ../vector/v.what.rast/main.c:186
+msgid "Raster type is integer and column type is float"
+msgstr "Tipo do raster é inteiro e o tipo da coluna é 'float'"
+
+#: ../vector/v.what.rast/main.c:189
+msgid "Raster type is float and column type is integer, some data lost!!"
+msgstr "Tipo do raster é 'float' e tipo da coluna é inteiro, alguns dados foram perdidos !!"
+
+#: ../vector/v.what.rast/main.c:206 ../vector/v.what.rast3/main.c:158
+msgid "Reading features from vector map..."
+msgstr "Lendo feições do mapa vetorial..."
+
+#: ../vector/v.what.rast/main.c:266 ../vector/v.to.db/main.c:406
+#, c-format
+msgid "Unable to write history for vector map <%s>"
+msgstr ""
+
+#: ../vector/v.what.rast/main.c:274
+#, c-format
+msgid "No features of type (%s) found in the current computational region"
+msgstr ""
+
+#: ../vector/v.what.rast/main.c:298
+#, c-format
+msgid "%d points outside current region were skipped"
+msgstr "%d pontos fora da região atual foram ignorados"
+
+#: ../vector/v.what.rast/main.c:302
+#, c-format
+msgid "%d points without category were skipped"
+msgstr "%d pontos sem categoria foram ignorados"
+
+#: ../vector/v.what.rast/main.c:573 ../vector/v.what.rast/main.c:613
+#, c-format
+msgid "Multiple points (%d) of category %d, value set to 'NULL'"
+msgstr "Vários pontos (%d) da categoria %d, valor definido como 'NULL'"
+
+#: ../vector/v.what.rast/main.c:626 ../vector/v.sample/main.c:226
+#: ../vector/v.sample/main.c:234 ../vector/v.buffer/main.c:548
+#: ../vector/v.buffer/main.c:658 ../vector/v.what.rast3/main.c:272
+#: ../vector/v.label.sa/labels.c:166 ../vector/v.vol.rst/user1.c:172
+#: ../vector/v.label/main.c:325
+#, c-format
+msgid "No record for category %d in table <%s>"
+msgstr "Não há registro para a categoria %d na tabela <%s>"
+
+#: ../vector/v.what.rast/main.c:681
+#, c-format
+msgid "%d categories loaded from vector"
+msgstr "%d categorias carregadas do vetor"
+
+#: ../vector/v.what.rast/main.c:683
+#, c-format
+msgid "%d duplicate categories in vector map <%s>"
+msgstr "%d categorias duplicadas no mapa vetorial <%s>"
+
+#: ../vector/v.what.rast/main.c:687
+#, c-format
+msgid "%d categories loaded from table"
+msgstr "%d categorias carregadas da tabela"
+
+#: ../vector/v.what.rast/main.c:688
+#, c-format
+msgid "%d categories from vector missing in table"
+msgstr "%d categorias do vetor faltando na tabela"
+
+#: ../vector/v.what.rast/main.c:691 ../vector/v.distance/main.c:1754
+#: ../vector/v.vect.stats/main.c:782
+#, c-format
+msgid "%d update errors"
+msgstr "%d atualizar erros"
+
+#: ../vector/v.what.rast/main.c:693 ../vector/v.distance/main.c:1756
+#, c-format
+msgid "%d records updated."
+msgstr "%d registros atualizados."
+
+#: ../vector/v.lidar.correction/main.c:74
+msgid "Corrects the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering."
+msgstr "Corrige a saída v.lidar.growing. É o último dos três algoritmos de filtragem LIDAR."
+
+#: ../vector/v.lidar.correction/main.c:85
+msgid "Input observation vector map name (v.lidar.growing output)"
+msgstr "Nome do mapa vetorial de observações de entrada (saída v.lidar.growing)"
+
+#: ../vector/v.lidar.correction/main.c:88
+msgid "Output classified vector map name"
+msgstr "Nome do mapa vetorial classificado de saída"
+
+#: ../vector/v.lidar.correction/main.c:93
+msgid "Name for output only 'terrain' points vector map"
+msgstr "Nome para o mapa vetorial de pontos de 'terreno' de saída"
+
+#: ../vector/v.lidar.correction/main.c:101
+msgid "Default: 25 * east-west resolution"
+msgstr "Padrão: 25 * resolução leste-oeste"
+
+#: ../vector/v.lidar.correction/main.c:110
+msgid "Default: 25 * north-south resolution"
+msgstr "Padrão: 25 * resolução norte-sul"
+
+#: ../vector/v.lidar.correction/main.c:118
+msgid "Regularization weight in reclassification evaluation"
+msgstr "Peso de regularização na avaliação de reclassificação"
+
+#: ../vector/v.lidar.correction/main.c:126
+msgid "High threshold for object to terrain reclassification"
+msgstr "Limiar alto para reclassificação de objeto para terreno"
+
+#: ../vector/v.lidar.correction/main.c:134
+msgid "Low threshold for terrain to object reclassification"
+msgstr "Limiar baixo para reclassificação de terreno para objeto"
+
+#: ../vector/v.lidar.correction/main.c:278
+#, c-format
+msgid "Adjusted EW spline %d"
+msgid_plural "Adjusted EW splines %d"
+msgstr[0] "Spline EW ajustada %d"
+msgstr[1] "Splines EW ajustadas %d"
+
+#: ../vector/v.lidar.correction/main.c:281
+#, c-format
+msgid "Adjusted NS spline %d"
+msgid_plural "Adjusted NS splines %d"
+msgstr[0] "Spline NS ajustada %d"
+msgstr[1] "Splines NS ajustadas %d"
+
+#: ../vector/v.lidar.correction/main.c:376
+msgid "Performing mean calculation..."
+msgstr "Fazendo o cálculo da média..."
+
+#: ../vector/v.lidar.correction/main.c:407 ../vector/v.surf.bspline/main.c:170
+#: ../vector/v.outlier/main.c:418 ../raster/r.resamp.bspline/main.c:128
+msgid "Bilinear interpolation"
+msgstr "Interpolação bilinear"
+
+#: ../vector/v.lidar.correction/main.c:420
+msgid "Correction and creation of terrain vector map..."
+msgstr "Correção e criação de mapa vetorial de terreno..."
+
+#: ../vector/v.lidar.correction/correction.c:93
+#: ../vector/v.lidar.correction/correction.c:127
+#: ../vector/v.lidar.correction/correction.c:151
+#: ../vector/v.lidar.correction/correction.c:163
+#: ../vector/v.lidar.correction/correction.c:187
+#: ../vector/v.outlier/outlier.c:86 ../vector/v.outlier/outlier.c:123
+#: ../vector/v.outlier/outlier.c:148 ../vector/v.outlier/outlier.c:161
+#: ../vector/v.outlier/outlier.c:185
+msgid "Impossible to read the database"
+msgstr "Impossível ler o banco de dados"
+
+#: ../vector/v.lidar.correction/correction.c:97
+#: ../vector/v.lidar.correction/correction.c:155
+#: ../vector/v.outlier/outlier.c:90 ../vector/v.outlier/outlier.c:152
+msgid "Impossible to update the database"
+msgstr "Impossível atualizar o banco de dados"
+
+#: ../vector/v.lidar.correction/correction.c:107
+#: ../vector/v.lidar.correction/correction.c:115
+#: ../vector/v.lidar.correction/correction.c:210
+#: ../vector/v.outlier/outlier.c:101 ../vector/v.outlier/outlier.c:110
+#: ../vector/v.outlier/outlier.c:207
+msgid "Impossible to write in the database"
+msgstr "Impossível escrever no banco de dados"
+
+#: ../vector/v.sample/main.c:79
+msgid "Samples a raster map at vector point locations."
+msgstr "Faz a amostragem de um mapa raster em locations de pontos vetoriais."
+
+#: ../vector/v.sample/main.c:82 ../vector/v.surf.bspline/main.c:110
+msgid "Name of input vector point map"
+msgstr "Nome do mapa de pontos do vetor de entrada"
+
+#: ../vector/v.sample/main.c:89
+msgid "Name of attribute column to use for comparison"
+msgstr "Nome da coluna de atributo a ser usada para comparação"
+
+#: ../vector/v.sample/main.c:92
+msgid "Name for output vector map to store differences"
+msgstr "Nome para o mapa vetorial de saída para armazenar diferenças"
+
+#: ../vector/v.sample/main.c:96
+msgid "Name of raster map to be sampled"
+msgstr "Nome do mapa raster a ser amostrado"
+
+#: ../vector/v.sample/main.c:107
+msgid "Scaling factor for values read from raster map"
+msgstr "Fator de escala para valores lidos do mapa raster"
+
+#: ../vector/v.sample/main.c:109
+msgid "Sampled values will be multiplied by this factor"
+msgstr "Os valores amostrados serão multiplicados por este fator"
+
+#: ../vector/v.sample/main.c:133 ../vector/v.surf.idw/read_sites.c:50
+#: ../vector/v.reclass/main.c:128
+#, c-format
+msgid "Database connection not defined for layer %s"
+msgstr "Conexão de banco de dados não definida para camada %s"
+
+#: ../vector/v.sample/main.c:148
+#, c-format
+msgid "Column type <%s> not supported (must be integer or double precision)"
+msgstr "Tipo de coluna <%s> não suportado (deve ser inteiro ou dupla precisão)"
+
+#: ../vector/v.sample/main.c:154
+#, c-format
+msgid "%d record selected from table"
+msgid_plural "%d records selected from table"
+msgstr[0] "%d registros selecionados da tabela"
+msgstr[1] "%d registros selecionados da tabela"
+
+#: ../vector/v.sample/main.c:190 ../vector/v.patch/main.c:385
+#: ../scripts/v.db.addtable/v.db.addtable.py:137
+#, c-format, python-format
+msgid "Unable to create table <%s>"
+msgstr "Não foi possível criar a tabela <%s>"
+
+#: ../vector/v.sample/main.c:200 ../raster3d/r3.in.lidar/main.c:574
+msgid "Reading points..."
+msgstr "Lendo pontos..."
+
+#: ../vector/v.sample/main.c:263 ../vector/v.kcv/main.c:285
+#, c-format
+msgid "Unable to insert row: %s"
+msgstr "Não foi possível inserir linha: %s"
+
+#: ../vector/v.out.svg/main.c:76
+msgid "Exports a vector map to SVG file."
+msgstr "Exporta um mapa vetorial para um arquivo SVG."
+
+#: ../vector/v.out.svg/main.c:86
+msgid "Name for SVG output file"
+msgstr "Nome do arquivo de saída SVG"
+
+#: ../vector/v.out.svg/main.c:95
+msgid "Output type"
+msgstr "Tipo de saída"
+
+#: ../vector/v.out.svg/main.c:96
+msgid "Defines which feature-type will be extracted"
+msgstr "Define qual tipo de feição será extraída"
+
+#: ../vector/v.out.svg/main.c:104
+msgid "Coordinate precision"
+msgstr "Precisão da coordenada"
+
+#: ../vector/v.out.svg/main.c:110
+msgid "Attribute(s) to include in output SVG"
+msgstr "Atributo(s) a incluir na saída SVG"
+
+#: ../vector/v.out.svg/main.c:131
+msgid "Precision must not be negative"
+msgstr "A precisão não deve ser negativa"
+
+#: ../vector/v.out.svg/main.c:134
+msgid "Precision must not be higher than 15"
+msgstr "A precisão não deve ser superior a 15"
+
+#: ../vector/v.out.svg/main.c:202
+#, c-format
+msgid "Unable to create SVG file <%s>"
+msgstr "Não foi possível criar o arquivo SVG <%s>"
+
+#: ../vector/v.out.svg/main.c:219
+#, c-format
+msgid "No areas found, skipping %s"
+msgstr "Nenhuma área encontrada, ignorando %s"
+
+#: ../vector/v.out.svg/main.c:234 ../vector/v.extrude/main.c:275
+#, c-format
+msgid "Skipping area %d without centroid"
+msgstr "Ignorando área %d sem centroide"
+
+#: ../vector/v.out.svg/main.c:260
+#, c-format
+msgid "%d areas extracted"
+msgstr "%d áreas extraídas"
+
+#: ../vector/v.out.svg/main.c:267
+#, c-format
+msgid "No points found, skipping %s"
+msgstr "Nenhum ponto encontrado, ignorando %s"
+
+#: ../vector/v.out.svg/main.c:296
+#, c-format
+msgid "%d points extracted"
+msgstr "%d pontos extraídos"
+
+#: ../vector/v.out.svg/main.c:303
+#, c-format
+msgid "No lines found, skipping %s"
+msgstr "Nenhuma linha encontrada, ignorando %s"
+
+#: ../vector/v.out.svg/main.c:330
+#, c-format
+msgid "%d lines extracted"
+msgstr "%d linhas extraídas"
+
+#: ../vector/v.out.svg/main.c:397
+#, c-format
+msgid "Cannot select attributes for cat=%d"
+msgstr "Não é possível selecionar atributos para cat=%d"
+
+#: ../vector/v.segment/main.c:62 ../vector/v.edit/main.c:59
+#: ../vector/v.to.points/main.c:57 ../vector/v.split/main.c:57
+#: ../vector/v.build.polylines/main.c:114
+msgid "node"
+msgstr "nó"
+
+#: ../vector/v.segment/main.c:65 ../vector/v.edit/main.c:61
+#: ../vector/v.to.points/main.c:58 ../vector/v.split/main.c:59
+#: ../vector/v.build.polylines/main.c:115
+msgid "vertex"
+msgstr "vértice"
+
+#: ../vector/v.segment/main.c:67
+msgid "Creates points/segments from input vector lines and positions."
+msgstr "Cria pontos/segmentos a partir de linhas e posições vetoriais de entrada."
+
+#: ../vector/v.segment/main.c:70
+msgid "Name of input vector lines map"
+msgstr "Nome do mapa de linhas vetoriais de entrada"
+
+#: ../vector/v.segment/main.c:79
+msgid "Name of file containing segment rules"
+msgstr "Nome do arquivo contendo regras de segmento"
+
+#: ../vector/v.segment/main.c:146 ../vector/v.segment/main.c:190
 #, c-format
-msgid "No database connection for driver <%s> is defined. Run db.connect."
-msgstr "Nenhuma conexão de banco de dados para o driver <%s> está definida. Execute db.connect."
+msgid "Unable to read input: %s"
+msgstr "Não foi possível ler entrada: %s"
 
-#: ../vector/v.lidar.edgedetection/main.c:230
-#: ../vector/v.lidar.edgedetection/main.c:242
-#: ../vector/v.lidar.correction/main.c:204 ../vector/v.surf.bspline/main.c:251
-#: ../vector/v.outlier/main.c:198
-msgid "Old auxiliary table could not be dropped"
-msgstr "A tabela auxiliar antiga não pode ser descartada"
+#: ../vector/v.segment/main.c:157 ../vector/v.segment/main.c:201
+#, c-format
+msgid "Unable to find line of cat %d"
+msgstr "Não foi possível encontrar a linha da categoria %d"
 
-#: ../vector/v.lidar.edgedetection/main.c:267
+#: ../vector/v.segment/main.c:172
 #, c-format
-msgid "It was impossible to create <%s>."
-msgstr "Foi impossível criar <%s>."
+msgid ""
+"Unable to get point on line: cat = %d offset = %f (line length = %.15g)\n"
+"%s"
+msgstr "Não foi possível obter o ponto na linha: cat = %d deslocamento = %f (comprimento da linha = %.15g)"
 
-#: ../vector/v.lidar.edgedetection/main.c:270
+#: ../vector/v.segment/main.c:226
+msgid "End of segment > line length -> cut"
+msgstr "Fim do segmento > comprimento da linha  -> corte"
+
+#: ../vector/v.segment/main.c:232
 #, c-format
-msgid "It was impossible to create <%s> interpolation table in database."
-msgstr "Foi impossível criar <%s> tabela de interpolação na base de dados"
+msgid ""
+"Unable to make line segment: cat = %d : %f - %f (line length = %.15g)\n"
+"%s"
+msgstr ""
+"Não é possível fazer segmento de linha: cat = %d: %f - %f(comprimento da linha = %.15g)\n"
+"%s"
 
-#: ../vector/v.lidar.edgedetection/main.c:304
-#: ../vector/v.surf.bspline/main.c:537 ../vector/v.outlier/main.c:300
+#: ../vector/v.segment/main.c:256 ../vector/v.lrs/v.lrs.segment/main.c:337
 #, c-format
-msgid "Adjusted EW splines %d"
-msgstr "Splines EW %dajustadas"
+msgid "Incorrect segment type: %s"
+msgstr "Tipo de segmento incorreto: %s"
 
-#: ../vector/v.lidar.edgedetection/main.c:305
-#: ../vector/v.surf.bspline/main.c:538 ../vector/v.outlier/main.c:301
+#: ../vector/v.segment/main.c:263
 #, c-format
-msgid "Adjusted NS splines %d"
-msgstr "Splines NS %dajustadas"
+msgid "%d point read from input"
+msgid_plural "%d points read from input"
+msgstr[0] "%d ponto lido da entrada"
+msgstr[1] "%d pontos lidos da entrada"
 
-#: ../vector/v.lidar.edgedetection/main.c:360
-#: ../vector/v.lidar.correction/main.c:338 ../vector/v.lidar.growing/main.c:246
+#. GTC Number of lost points
+#. GTC Number of lost lines
+#: ../vector/v.segment/main.c:267 ../vector/v.segment/main.c:278
+#: ../vector/v.lrs/v.lrs.segment/main.c:360
+#: ../vector/v.lrs/v.lrs.segment/main.c:372
 #, c-format
-msgid "Subregion %d of %d"
-msgstr "Sub-região %d de %d"
+msgid "%d lost"
+msgid_plural "%d lost"
+msgstr[0] "%d perdido"
+msgstr[1] "%d perdidos"
 
-#: ../vector/v.lidar.edgedetection/main.c:423
-msgid "Performing bilinear interpolation..."
-msgstr "Executando interpolação bilinear..."
+#. GTC %s is replaced with message indicating number of lost points.
+#: ../vector/v.segment/main.c:269
+#, c-format
+msgid "%d point written to output map (%s)"
+msgid_plural "%d points written to output map (%s)"
+msgstr[0] "%d ponto escrito no mapa de saída (%s)"
+msgstr[1] "%d pontos escritos no mapa de saída (%s)"
 
-#: ../vector/v.lidar.edgedetection/main.c:440
-msgid "Performing bicubic interpolation..."
-msgstr "Executando interpolação bicúbica..."
+#: ../vector/v.segment/main.c:274
+#, c-format
+msgid "%d line read from input"
+msgid_plural "%d lines read from input"
+msgstr[0] "%d linha lida da entrada"
+msgstr[1] "%d linhas lidas da entrada"
 
-#: ../vector/v.lidar.edgedetection/main.c:452
-msgid "Point classification..."
-msgstr "Classificação de pontos..."
+#. GTC %s is replaced with message indicating number of lost lines.
+#: ../vector/v.segment/main.c:280
+#, c-format
+msgid "%d line written to output map (%s)"
+msgid_plural "%d lines written to output map (%s)"
+msgstr[0] "%d linha escrita no mapa de saída (%s)"
+msgstr[1] "%d linhas escritas no mapa de saída (%s)"
 
-#: ../vector/v.lidar.edgedetection/main.c:466
-#: ../vector/v.lidar.correction/main.c:433
-msgid "No data within this subregion. Consider changing the spline step."
-msgstr "Não há dados nesta sub-região. Considere alterar o passo da spline."
+#: ../vector/v.net.connectivity/main.c:56
+msgid "Computes vertex connectivity between two sets of nodes in the network."
+msgstr "Calcula a conectividade de vértice entre dois conjuntos de nós na rede."
 
-#: ../vector/v.lidar.edgedetection/main.c:476
-#: ../vector/v.lidar.correction/main.c:444 ../vector/v.surf.bspline/main.c:925
-#: ../vector/v.outlier/main.c:460
-msgid "Auxiliary table could not be dropped"
-msgstr "A tabela auxiliar não pode ser descartada"
+#: ../vector/v.net.connectivity/main.c:96
+msgid "Set1 category values"
+msgstr "Valores da categoria Set1"
 
-#: ../vector/v.to.rast3/main.c:51
-msgid "Converts a vector map (only points) into a 3D raster map."
-msgstr "Converte um mapa vetorial (apenas pontos) em um mapa raster 3D."
+#: ../vector/v.net.connectivity/main.c:97
+#: ../vector/v.net.connectivity/main.c:103
+msgid "Set1"
+msgstr "Set1"
 
-#: ../vector/v.to.rast3/main.c:62
-msgid "Name of attribute column (data type must be numeric)"
-msgstr "Nome da coluna de atributo (o tipo de dados deve ser numérico)"
+#: ../vector/v.net.connectivity/main.c:102
+msgid "Set1 WHERE conditions of SQL statement without 'where' keyword"
+msgstr "Condições Set1 WHERE da instrução SQL sem a palavra-chave 'where'"
 
-#: ../vector/v.to.rast3/main.c:80 ../vector/v.db.select/main.c:209
-#: ../vector/v.to.rast/vect2rast.c:55 ../vector/v.info/print.c:155
-#: ../vector/v.random/main.c:271 ../vector/v.distance/main.c:526
-#: ../vector/v.distance/main.c:607 ../vector/v.db.connect/main.c:214
-#: ../vector/v.colors.out/make_colors.c:31 ../vector/v.to.3d/trans2.c:49
-#: ../vector/v.to.3d/trans3.c:51 ../vector/v.extract/main.c:217
-#: ../vector/v.extract/main.c:315
-#, c-format
-msgid "Database connection not defined for layer <%s>"
-msgstr "Conexão de banco de dados não definida para camada <%s>"
+#: ../vector/v.net.connectivity/main.c:107
+msgid "Set2 category values"
+msgstr "Valores de categoria Set2"
 
-#: ../vector/v.to.rast3/main.c:99 ../vector/v.what.rast/main.c:183
-#: ../vector/v.sample/main.c:240 ../vector/v.buffer/main.c:448
-#: ../vector/v.class/main.c:129 ../vector/v.surf.bspline/crosscorr.c:133
-#: ../vector/v.surf.bspline/main.c:389 ../vector/v.surf.idw/read_sites.c:65
-msgid "Column type not supported"
-msgstr "Tipo de coluna não suportado"
+#: ../vector/v.net.connectivity/main.c:108
+#: ../vector/v.net.connectivity/main.c:114
+msgid "Set2"
+msgstr "Set2"
 
-#: ../vector/v.to.rast3/main.c:107
-msgid "Unable to create output map"
-msgstr "Não foi possível criar mapa de saída"
+#: ../vector/v.net.connectivity/main.c:113
+msgid "Set2 WHERE conditions of SQL statement without 'where' keyword"
+msgstr "Condições Set2 WHERE da instrução SQL sem a palavra-chave 'where'"
 
-#: ../vector/v.to.rast3/main.c:145 ../vector/v.to.rast/do_lines.c:68
-#: ../vector/v.to.rast/do_lines.c:76
+#: ../vector/v.net.connectivity/main.c:146
+#: ../vector/v.net.connectivity/main.c:153
 #, c-format
-msgid "No record for line (cat = %d)"
-msgstr "Sem registros para a linha (cat = %d)"
-
-#: ../vector/v.to.rast3/main.c:157
-msgid "Unable to close new 3d raster map"
-msgstr "Não foi possível fechar o novo mapa raster 3D"
-
-#: ../vector/v.net.iso/main.c:78 ../vector/v.net.alloc/main.c:66
-#: ../raster/r.walk/main.c:209 ../raster/r.cost/main.c:167
-msgid "cost allocation"
-msgstr "alocação de custos"
-
-#: ../vector/v.net.iso/main.c:79
-msgid "isolines"
-msgstr "isolinhas"
+msgid "No features for %s selected. Please check options '%s', '%s'."
+msgstr "Nenhuma feição para %s selecionada. Verifique as opções '%s', '%s'."
 
-#: ../vector/v.net.iso/main.c:80
-msgid "Splits subnets for nearest centers by cost isolines."
-msgstr "Divide sub-redes para centros mais próximos por isolinhas de custo."
+#: ../vector/v.net.connectivity/main.c:167
+#: ../vector/v.net.connectivity/main.c:170
+#, c-format
+msgid "%s is empty"
+msgstr "%s está vazio"
 
-#: ../vector/v.net.iso/main.c:82
-msgid "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 a rede em bandas entre as isolinhas de custo (direção do centro). O nó central deve ser aberto (costs > = 0). Os custos do nó central são usados ​​no cálculo."
+#: ../vector/v.net.connectivity/main.c:178 ../vector/v.net.flow/main.c:226
+#: ../vector/v.net.bridge/main.c:134 ../vector/v.generalize/network.c:89
+#: ../vector/v.net.centrality/main.c:284
+#: ../vector/v.net.spanningtree/main.c:124 ../vector/v.net.timetable/main.c:405
+#: ../vector/v.net.components/main.c:163 ../vector/v.net.distance/main.c:264
+#, c-format
+msgid "Unable to build graph for vector map <%s>"
+msgstr "Não foi possível construir gráfico para mapa vetorial <%s>"
 
-#: ../vector/v.net.iso/main.c:95 ../vector/v.net.alloc/main.c:81
-msgid "Use costs from centers or costs to centers"
-msgstr "Use custos de centros ou custos para centros"
+#: ../vector/v.what/what.c:45
+msgid "Cannot open driver"
+msgstr "Não é possível abrir driver"
 
-#: ../vector/v.net.iso/main.c:96 ../vector/v.net.iso/main.c:136
-#: ../vector/v.net.iso/main.c:141 ../vector/v.net.iso/main.c:146
-#: ../vector/v.net.connectivity/main.c:65
-#: ../vector/v.net.connectivity/main.c:71
-#: ../vector/v.net.connectivity/main.c:78
-#: ../vector/v.net.connectivity/main.c:84
-#: ../vector/v.net.connectivity/main.c:92 ../vector/v.net.flow/main.c:71
-#: ../vector/v.net.flow/main.c:77 ../vector/v.net.flow/main.c:91
-#: ../vector/v.net.flow/main.c:97 ../vector/v.net.flow/main.c:103
-#: ../vector/v.net.bridge/main.c:61 ../vector/v.net.bridge/main.c:67
-#: ../vector/v.net.bridge/main.c:74 ../vector/v.net.bridge/main.c:80
-#: ../vector/v.net.bridge/main.c:87 ../vector/v.net.alloc/main.c:82
-#: ../vector/v.net.alloc/main.c:115 ../vector/v.net.alloc/main.c:120
-#: ../vector/v.net.alloc/main.c:125 ../vector/v.net.salesman/main.c:169
-#: ../vector/v.net.salesman/main.c:177 ../vector/v.net.path/main.c:80
->>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
-#: ../vector/v.net.path/main.c:87 ../vector/v.net.path/main.c:94
-#: ../vector/v.net.flow/main.c:70 ../vector/v.net.flow/main.c:76
-#: ../vector/v.net.flow/main.c:90 ../vector/v.net.flow/main.c:96
-#: ../vector/v.net.flow/main.c:102 ../vector/v.net.alloc/main.c:79
-#: ../vector/v.net.alloc/main.c:112 ../vector/v.net.alloc/main.c:117
-#: ../vector/v.net.alloc/main.c:122 ../vector/v.net.centrality/main.c:110
-#: ../vector/v.net.centrality/main.c:116 ../vector/v.net.centrality/main.c:130
-#: ../vector/v.net.centrality/main.c:136 ../vector/v.net.centrality/main.c:143
-#: ../vector/v.net.spanningtree/main.c:59
-#: ../vector/v.net.spanningtree/main.c:65
-#: ../vector/v.net.spanningtree/main.c:72
-#: ../vector/v.net.spanningtree/main.c:78 ../vector/v.net.allpairs/main.c:94
-#: ../vector/v.net.allpairs/main.c:100 ../vector/v.net.allpairs/main.c:107
-#: ../vector/v.net.connectivity/main.c:64
-#: ../vector/v.net.connectivity/main.c:70
-#: ../vector/v.net.connectivity/main.c:77
-#: ../vector/v.net.connectivity/main.c:83
-#: ../vector/v.net.connectivity/main.c:91
-msgid "Cost"
-msgstr "Custo"
+#: ../vector/v.what/what.c:53
+msgid "Cannot open database"
+msgstr "Não é possível abrir banco de dados"
 
-<<<<<<< HEAD
-#: ../vector/v.net.iso/main.c:102 ../vector/v.net.alloc/main.c:88
-msgid "Categories of centers (points on nodes) to which net will be allocated, layer for this categories is given by nlayer option"
-msgstr "Categorias de centros (pontos em nós) para os quais a rede será alocada, a camada para essas categorias é fornecida pela opção nlayer"
+#: ../vector/v.what/what.c:66
+msgid "Cannot open select cursor"
+msgstr "Não é possível abrir o cursor de seleção"
 
-#: ../vector/v.net.iso/main.c:111
-msgid "Costs for isolines"
-msgstr "Custos para isolinhas"
+#: ../vector/v.what/what.c:73
+msgid "Cannot fetch next record"
+msgstr "Não é possível buscar o próximo registro"
 
-#: ../vector/v.net.iso/main.c:145 ../vector/v.net.connectivity/main.c:91
-#: ../vector/v.net.flow/main.c:102 ../vector/v.net.bridge/main.c:86
-#: ../vector/v.net.alloc/main.c:124 ../vector/v.net.path/main.c:93
-#: ../vector/v.net.centrality/main.c:142 ../vector/v.net.spanningtree/main.c:78
-#: ../vector/v.net.timetable/main.c:302 ../vector/v.net.components/main.c:110
-#: ../vector/v.net.allpairs/main.c:106 ../vector/v.net.distance/main.c:153
-msgid "Node cost column (number)"
-msgstr "Coluna de custo do nó (número)"
+#: ../vector/v.what/what.c:76
+msgid "No database record"
+msgstr "Nenhum registro de banco de dados"
 
-#: ../vector/v.net.iso/main.c:150 ../vector/v.net.alloc/main.c:129
-#: ../vector/v.net.salesman/main.c:181 ../vector/v.net.path/main.c:110
-=======
-#: ../vector/v.net.salesman/main.c:177
-msgid "EXPERIMENTAL: Arc backward direction cost column (number)"
+#: ../vector/v.what/what.c:178
+#, c-format
+msgid ""
+"Layer: %d\n"
+"Category: %d\n"
 msgstr ""
+"Camada: %d\n"
+"Categoria: %d\n"
 
-#: ../vector/v.net.salesman/main.c:182 ../vector/v.net.iso/main.c:149
-#: ../vector/v.net.path/main.c:111 ../vector/v.net.alloc/main.c:126
->>>>>>> osgeo-main
-msgid "Use turntable"
+#: ../vector/v.what/what.c:202
+#, c-format
+msgid ""
+"\n"
+"Driver: %s\n"
+"Database: %s\n"
+"Table: %s\n"
+"Key column: %s\n"
 msgstr ""
+"\n"
+"Driver: %s\n"
+"Banco de dados: %s\n"
+"Tabela: %s\n"
+"Coluna chave: %s\n"
 
-#: ../vector/v.net.salesman/main.c:183 ../vector/v.net.salesman/main.c:190
-#: ../vector/v.net.salesman/main.c:197 ../vector/v.net.iso/main.c:150
-#: ../vector/v.net.iso/main.c:157 ../vector/v.net.iso/main.c:164
-#: ../vector/v.net.path/main.c:112 ../vector/v.net.path/main.c:119
-#: ../vector/v.net.path/main.c:126 ../vector/v.net.alloc/main.c:127
-#: ../vector/v.net.alloc/main.c:134 ../vector/v.net.alloc/main.c:141
-#: ../vector/v.net/args.c:63 ../vector/v.net/args.c:110
-#: ../vector/v.net/args.c:122
-msgid "Turntable"
-msgstr ""
+#: ../vector/v.what/what.c:381
+#, c-format
+msgid "Nothing found.\n"
+msgstr "Nada encontrado.\n"
 
-#: ../vector/v.net.salesman/main.c:188 ../vector/v.net.iso/main.c:155
-#: ../vector/v.net.path/main.c:117 ../vector/v.net.alloc/main.c:132
-msgid "Layer with turntable"
+#: ../vector/v.what/what.c:476
+#, c-format
+msgid ""
+"Id: %d\n"
+"Type: %s\n"
+"Left: %d\n"
+"Right: %d\n"
 msgstr ""
+"Id: %d\n"
+"Tipo: %s\n"
+"Esquerda: %d\n"
+"Direita: %d\n"
 
-#: ../vector/v.net.salesman/main.c:189 ../vector/v.net.salesman/main.c:196
-#: ../vector/v.net.iso/main.c:156 ../vector/v.net.iso/main.c:163
-#: ../vector/v.net.path/main.c:118 ../vector/v.net.path/main.c:125
-#: ../vector/v.net.alloc/main.c:133 ../vector/v.net.alloc/main.c:140
-msgid "Relevant only with -t flag"
-msgstr "Relevante apenas com a flag -t"
+#: ../vector/v.what/what.c:482 ../vector/v.what/what.c:558
+#, c-format
+msgid "Length: %f\n"
+msgstr "Comprimento: %f\n"
 
-#: ../vector/v.net.salesman/main.c:195 ../vector/v.net.iso/main.c:162
-#: ../vector/v.net.path/main.c:124 ../vector/v.net.alloc/main.c:139
-#: ../vector/v.net/args.c:113
-msgid "Layer with unique categories used in turntable"
+#: ../vector/v.what/what.c:502
+#, c-format
+msgid ""
+"Node[%d]=%d\n"
+"Number_lines=%d\n"
+"Coordinates=%.6f,%.6f,%.6f\n"
 msgstr ""
+"Nó[%d]=%d\n"
+"Number_lines=%d\n"
+"Coordinates=%.6f,%.6f,%.6f\n"
 
-<<<<<<< HEAD
-#: ../vector/v.net.salesman/main.c:204
-msgid "Name for output file holding node sequence (\"-\" for stdout)"
+#: ../vector/v.what/what.c:507
+#, c-format
+msgid ""
+",\n"
+"\"Node[%d]\": %d,\n"
+"\"Number_lines\": %d,\n"
+"\"Coordinates\": %.6f,%.6f,%.6f"
 msgstr ""
-"Nome para o arquivo de saída que contém a sequência de nós (\"-\" para "
-"stdout)"
-
-#: ../vector/v.net.salesman/main.c:209 ../vector/v.net.distance/main.c:161
-#: ../vector/v.net.iso/main.c:169 ../vector/v.net.steiner/main.c:406
-#: ../vector/v.net.path/main.c:131 ../vector/v.net.alloc/main.c:146
-#: ../vector/v.net.centrality/main.c:188 ../vector/v.net.spanningtree/main.c:83
-#: ../vector/v.net.allpairs/main.c:112
-#, fuzzy
-msgid "Use geodesic calculation for longitude-latitude projects"
-msgstr "Use o cálculo geodésico para locations longitude-latitude"
-
-#: ../vector/v.net.salesman/main.c:276 ../vector/v.net.iso/main.c:276
-#: ../vector/v.net.alloc/main.c:216
-msgid "Point is not connected to the network"
-msgstr "O ponto não está conectado à rede"
-
-#: ../vector/v.net.salesman/main.c:284
-=======
-#: ../vector/v.net.iso/main.c:177 ../vector/v.net.alloc/main.c:156
-msgid "Create unique categories and attribute table"
-msgstr "Crie categorias e tabela de atributos exclusivas"
+",\n"
+"\"Node[%d]\": %d,\n"
+"\"Number_lines\": %d,\n"
+"\"Coordinates\": %.6f,%.6f,%.6f"
 
-#: ../vector/v.net.iso/main.c:179
-msgid "Default: one category for each iso-band"
-msgstr "Padrão: uma categoria para cada banda iso"
+#: ../vector/v.what/what.c:512
+#, c-format
+msgid ""
+"Node[%d]: %d\n"
+"Number of lines: %d\n"
+"Coordinates: %.6f, %.6f, %.6f\n"
+msgstr ""
+"Nó[%d]: %d\n"
+"Número de linhas: %d\n"
+"Coordinadas: %.6f, %.6f, %.6f\n"
 
-#: ../vector/v.net.iso/main.c:215
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> main
-=======
-=======
-=======
-=======
-=======
-=======
-=======
-<<<<<<< HEAD
-=======
-=======
->>>>>>> main
-=======
-=======
-=======
-=======
-=======
-=======
+#: ../vector/v.what/what.c:532
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Wrong iso cost: %f"
 msgstr "Custo da iso errado: %f"
@@ -90902,6 +91923,7 @@ msgstr "Mapa de linhas de perfil"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 #: ../vector/v.profile/main.c:248
 msgid "Vector map containing profiling line"
@@ -91009,6 +92031,11 @@ msgid "Failed to interpreter 'dp' parameter as an integer"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../vector/v.out.vtk/main.c:150 ../vector/v.out.ascii/args.c:110
 msgid "Failed to interpret 'dp' parameter as an integer"
@@ -92639,6 +93666,7 @@ msgstr "Fator de anisotropia"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -94061,6 +95089,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Error writing <%s> file"
 msgstr "Erro na escrita do arquivo <%s>"
 =======
@@ -94502,6 +95532,7 @@ msgstr "Detecção de outlier"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -94554,6 +95585,9 @@ msgstr "Detecção de outlier"
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../vector/v.distance/distance.c:48
 #, c-format
@@ -95455,6 +96489,7 @@ msgstr "O mapa vetorial <%s> é 3D. Use opções de criação de camada específ
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Vector map <%s> is 3D. Use format specific layer creation options (parameter 'lco') to export in 3D rather than 2D (default)."
 msgstr ""
 =======
@@ -95523,6 +96558,10 @@ msgstr ""
 msgid "Vector map <%s> is 3D. Use format specific layer creation options (parameter 'lco') to export in 3D rather than 2D (default)."
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Vector map <%s> is 3D. Use format specific layer creation options (parameter 'lco') to export in 3D rather than 2D (default)."
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../vector/v.out.ogr/main.c:713 ../db/drivers/ogr/execute.c:56
 #, c-format
@@ -95686,6 +96725,7 @@ msgstr "Anexar arquivos a um arquivo existente (a substituição de arquivos exi
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Missing table for <%s>"
 msgstr ""
@@ -95771,6 +96811,11 @@ msgstr ""
 msgid "Missing table for <%s>"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Missing table for <%s>"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../vector/v.patch/main.c:253
 #, c-format
@@ -96997,6 +98042,7 @@ msgstr "Número de colunas: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Number of data rows: %d"
 msgstr ""
@@ -97082,6 +98128,11 @@ msgstr ""
 msgid "Number of data rows: %d"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Number of data rows: %d"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../vector/v.in.ascii/main.c:300 ../vector/v.in.ascii/main.c:304
 #: ../vector/v.in.ascii/main.c:309 ../vector/v.in.ascii/main.c:314
@@ -100279,6 +101330,7 @@ msgstr "A validação cruzada não pode ser calculada simultaneamente com grades
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
@@ -100313,6 +101365,8 @@ msgstr "A validação cruzada não pode ser calculada simultaneamente com grades
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../vector/v.what/what.c:562
@@ -110291,6 +111345,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "<%s> does not exist. Skipping."
 msgstr ""
@@ -110376,6 +111431,11 @@ msgstr ""
 msgid "<%s> does not exist. Skipping."
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "<%s> does not exist. Skipping."
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../general/g.copy/main.c:74
 #, c-format
@@ -110398,6 +111458,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -110420,6 +111481,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "<%s> already exists and overwrite is not enabled. Skipping."
 msgstr ""
@@ -110438,6 +111501,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy, c-format
 =======
@@ -110511,6 +111575,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../general/g.copy/main.c:99
 msgid "All inputs had to be skipped. Nothing to copy. See the warning messages above for details."
@@ -123507,6 +124573,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Scale for color rule values"
 msgstr ""
 =======
@@ -123578,6 +124645,10 @@ msgstr ""
 msgid "Scale for color rule values"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Scale for color rule values"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.colors/edit_colors.c:284 ../raster/r.colors/edit_colors.c:318
 #, c-format
@@ -125544,6 +126615,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -125566,6 +126638,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Coordinates to profile"
 msgstr ""
 
@@ -125596,6 +126670,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -125705,6 +126780,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:302
 #, c-format
@@ -125727,6 +126804,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -125749,6 +126827,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -125766,6 +126846,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -125836,6 +126917,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -129934,6 +131017,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -129966,6 +131050,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Name of training vector map"
 #~ msgstr "Nome do mapset de destino"
@@ -132702,6 +133788,7 @@ msgstr "O mapa vetorial <%s> é 3D. Use opções de criação de camada específ
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -132731,6 +133818,8 @@ msgstr "O mapa vetorial <%s> é 3D. Use opções de criação de camada específ
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid ""
 "You can switch the history by commands:\n"
 "history -w; history -r %s/.bash_history; HISTFILE=%s/.bash_history"
@@ -132755,6 +133844,7 @@ msgstr "Tabela faltando"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -132791,6 +133881,8 @@ msgstr "Tabela faltando"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "No features of type (%s) found in vector map <%s>"
 msgstr "Nenhuma feição do tipo (%s) encontrada no mapa vetorial <%s>"
 
@@ -132844,6 +133936,7 @@ msgstr "O mapa vetorial <%s> é 3D. Use opções de criação de camada específ
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -132903,3 +133996,6 @@ msgstr "O mapa vetorial <%s> é 3D. Use opções de criação de camada específ
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grassmods_ro.po b/locale/po/grassmods_ro.po
index a59b6f17288..bbdbbee6737 100644
--- a/locale/po/grassmods_ro.po
+++ b/locale/po/grassmods_ro.po
@@ -27758,6 +27758,7 @@ msgid "Apriori Phi (roll) standard deviation"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -27808,6 +27809,9 @@ msgid "Apriori Phi (roll) standard deviation"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:117
@@ -27825,6 +27829,7 @@ msgid "Apriori Kappa (yaw) standard deviation"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27862,6 +27867,8 @@ msgid "Apriori Kappa (yaw) standard deviation"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -39967,6 +39974,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -40058,6 +40066,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../locale/scriptstrings/g.proj.identify_to_translate.c:8
 msgid "Input EPSG code"
@@ -59140,6 +59153,7 @@ msgstr "Harta vectorială <%s> există deja și va fi scrisă peste"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59172,6 +59186,8 @@ msgstr "Harta vectorială <%s> există deja și va fi scrisă peste"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -59188,6 +59204,7 @@ msgstr "Harta vectorială <%s> există deja și va fi scrisă peste"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59220,6 +59237,8 @@ msgstr "Harta vectorială <%s> există deja și va fi scrisă peste"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -59505,6 +59524,7 @@ msgstr[2] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59551,6 +59571,9 @@ msgstr[2] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr "Harta vectorială <%s> există"
@@ -80231,6 +80254,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Profile output format"
 msgstr ""
 =======
@@ -80302,6 +80326,10 @@ msgstr ""
 msgid "Profile output format"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Profile output format"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -80332,6 +80360,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Failed to open output file <%s>: %d (%s)"
 msgstr ""
@@ -80417,6 +80446,11 @@ msgstr ""
 msgid "Failed to open output file <%s>: %d (%s)"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Failed to open output file <%s>: %d (%s)"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -80470,6 +80504,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Internal error in %s()"
 msgstr ""
@@ -80555,6 +80590,11 @@ msgstr ""
 msgid "Internal error in %s()"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Internal error in %s()"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.proj/bordwalk.c:92 ../raster/r.proj/bordwalk.c:139
 #, c-format
@@ -84585,6 +84625,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -84617,6 +84658,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Classification of a vector maps based on the values in attribute tables"
@@ -86632,6 +86675,7 @@ msgstr "Tip de geometrie necunoscut"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -86672,6 +86716,8 @@ msgstr "<%s> nu a fost găsit"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Not enough memory for ady"
 #~ msgstr "Memorie insuficientă pentru ady"
 
@@ -86726,6 +86772,7 @@ msgstr "<%s> nu a fost găsit"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -86755,6 +86802,8 @@ msgstr "<%s> nu a fost găsit"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "<%s> not found"
 msgstr "<%s> nu a fost găsit"
 
@@ -86773,6 +86822,7 @@ msgstr "<%s> nu a fost găsit"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -86815,5 +86865,7 @@ msgstr "<%s> nu a fost găsit"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%s=%s,%s: files are the same, no copy required"
 msgstr "%s=%s,%s: fișierele sunt la fel, nici o copiere nu este necesară"
diff --git a/locale/po/grassmods_ru.po b/locale/po/grassmods_ru.po
index ca9b5dcdb15..917f2cd277e 100644
--- a/locale/po/grassmods_ru.po
+++ b/locale/po/grassmods_ru.po
@@ -57326,6 +57326,7 @@ msgstr "Векторная карта <%s> уже существует и буд
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -57358,6 +57359,8 @@ msgstr "Векторная карта <%s> уже существует и буд
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -57374,6 +57377,7 @@ msgstr "Векторная карта <%s> уже существует и буд
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -57406,6 +57410,8 @@ msgstr "Векторная карта <%s> уже существует и буд
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -57694,6 +57700,7 @@ msgstr[3] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -57740,6 +57747,9 @@ msgstr[3] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr ""
@@ -72930,6 +72940,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -73001,6 +73012,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -73026,6 +73041,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Profile output format"
 msgstr ""
 =======
@@ -73097,6 +73113,10 @@ msgstr ""
 msgid "Profile output format"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Profile output format"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -77194,6 +77214,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -77226,6 +77247,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "layer name or number to use for data"
 #~ msgstr "Номер слоя (в)"
diff --git a/locale/po/grassmods_sl.po b/locale/po/grassmods_sl.po
index 5d1ef30631b..b226847be92 100644
--- a/locale/po/grassmods_sl.po
+++ b/locale/po/grassmods_sl.po
@@ -88393,6 +88393,7 @@ msgstr "Ime izhodnega rastrskega sloja"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -88425,6 +88426,8 @@ msgstr "Ime izhodnega rastrskega sloja"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy, c-format
 #~ msgid "Unable to create new location <%s>"
 #~ msgstr "Ne morem ustvariti tabele: %s"
@@ -88652,6 +88655,7 @@ msgstr "Ime izhodnega rastrskega sloja"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -88685,6 +88689,8 @@ msgstr "Ime izhodnega rastrskega sloja"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../scripts/r.fillnulls/r.fillnulls.py:161
 msgid "A user raster mask (MASK) is present. Saving it..."
 msgstr ""
@@ -90578,6 +90584,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -90624,6 +90631,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid ""
 #~ "Creates a raster map from LAS LiDAR points using univariate statistics "
diff --git a/locale/po/grassmods_ta.po b/locale/po/grassmods_ta.po
index 0c889366480..270a014dee7 100644
--- a/locale/po/grassmods_ta.po
+++ b/locale/po/grassmods_ta.po
@@ -75183,6 +75183,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -75215,6 +75216,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Input raster 1"
 #~ msgstr "உள்ளீடு"
diff --git a/locale/po/grassmods_th.po b/locale/po/grassmods_th.po
index 7fc7c8ce1e2..131bbd9f43e 100644
--- a/locale/po/grassmods_th.po
+++ b/locale/po/grassmods_th.po
@@ -71297,6 +71297,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -71368,6 +71369,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -71393,6 +71398,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Profile output format"
 msgstr ""
 =======
@@ -71464,6 +71470,10 @@ msgstr ""
 msgid "Profile output format"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Profile output format"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -75544,6 +75554,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -75576,6 +75587,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "layer name or number to use for data"
 #~ msgstr "จำนวนชั้นข้อมูล"
diff --git a/locale/po/grassmods_tr.po b/locale/po/grassmods_tr.po
index 2761bd900da..94b47b26bb3 100644
--- a/locale/po/grassmods_tr.po
+++ b/locale/po/grassmods_tr.po
@@ -27631,6 +27631,7 @@ msgid "Apriori Phi (roll) standard deviation"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -27681,6 +27682,9 @@ msgid "Apriori Phi (roll) standard deviation"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:117
@@ -28522,6 +28526,7 @@ msgid "Name of the directory where the image and metadata file are stored (*.SAF
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28559,6 +28564,8 @@ msgid "Name of the directory where the image and metadata file are stored (*.SAF
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -58856,6 +58863,7 @@ msgstr "<%s> vektör haritası zaten mevcut ve üzerine yazılacak"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58888,6 +58896,8 @@ msgstr "<%s> vektör haritası zaten mevcut ve üzerine yazılacak"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -58904,6 +58914,7 @@ msgstr "<%s> vektör haritası zaten mevcut ve üzerine yazılacak"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58936,6 +58947,8 @@ msgstr "<%s> vektör haritası zaten mevcut ve üzerine yazılacak"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -59218,6 +59231,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59264,6 +59278,9 @@ msgstr[1] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr "<%s> vektör haritası zaten mevcut"
@@ -77601,6 +77618,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -77692,6 +77710,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../display/d.graph/do_graph.c:372
 msgid "Cannot read symbol, cannot display points"
@@ -79349,6 +79372,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -79420,6 +79444,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -79446,6 +79474,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79468,6 +79497,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile output format"
 msgstr ""
 
@@ -79485,6 +79516,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79555,6 +79587,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:302
 #, c-format
@@ -79577,6 +79611,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -79599,6 +79634,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "The coordinates are outside of the computational region"
 msgstr ""
 
@@ -79616,6 +79653,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -79686,6 +79724,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -83755,6 +83795,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -83787,6 +83828,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Name of training vector map"
 #~ msgstr "Vektör haritanın adı"
@@ -86140,6 +86183,7 @@ msgstr "Kategorisiz alan merkezi"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -86192,6 +86236,8 @@ msgstr "Sütun sayısı farklı"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "%d sites written."
 #~ msgstr "%d nokta yazıldı"
 
@@ -86280,6 +86326,7 @@ msgstr "Sütun sayısı farklı"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -86309,6 +86356,8 @@ msgstr "Sütun sayısı farklı"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "<%s> not found"
 msgstr "<%s> bulunamadı"
 
@@ -86339,6 +86388,7 @@ msgstr "Sütun sayısı farklı"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -86381,5 +86431,7 @@ msgstr "Sütun sayısı farklı"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%s=%s,%s: files are the same, no copy required"
 msgstr "%s=%s,%s: dosyaları aynı, kopyalamaya gerek yok"
diff --git a/locale/po/grassmods_vi.po b/locale/po/grassmods_vi.po
index ce89b9a6df9..486ae1a1df2 100644
--- a/locale/po/grassmods_vi.po
+++ b/locale/po/grassmods_vi.po
@@ -71335,6 +71335,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -71406,6 +71407,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -71431,6 +71436,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Profile output format"
 msgstr ""
 =======
@@ -71502,6 +71508,10 @@ msgstr ""
 msgid "Profile output format"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Profile output format"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -75582,6 +75592,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -75614,6 +75625,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "layer name or number to use for data"
 #~ msgstr "Lớp số (to)"
diff --git a/locale/po/grassmods_zh.po b/locale/po/grassmods_zh.po
index 43a88480128..ecc019bd035 100644
--- a/locale/po/grassmods_zh.po
+++ b/locale/po/grassmods_zh.po
@@ -27575,6 +27575,7 @@ msgid "Apriori Phi (roll) standard deviation"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -27625,6 +27626,9 @@ msgid "Apriori Phi (roll) standard deviation"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:117
@@ -28466,6 +28470,7 @@ msgid "Name of the directory where the image and metadata file are stored (*.SAF
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28503,6 +28508,8 @@ msgid "Name of the directory where the image and metadata file are stored (*.SAF
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -58443,6 +58450,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58475,6 +58483,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:556 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:695 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -58491,6 +58501,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58523,6 +58534,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../vector/v.in.lidar/main.c:555 ../vector/v.edit/main.c:99
 #: ../vector/v.in.ogr/main.c:694 ../scripts/v.unpack/v.unpack.py:112
 =======
@@ -58802,6 +58815,7 @@ msgstr[0] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58848,6 +58862,9 @@ msgstr[0] ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Vector map <%s> already exists"
 msgstr ""
@@ -77768,6 +77785,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Coordinates to profile"
 msgstr ""
 =======
@@ -77839,6 +77857,10 @@ msgstr ""
 msgid "Coordinates to profile"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Coordinates to profile"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:251 ../raster/r.geomorphon/main.c:262
 #: ../raster/r.geomorphon/main.c:272
@@ -77861,6 +77883,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -77883,6 +77906,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Profile output file name (\"-\" for stdout)"
 msgstr ""
 
@@ -77899,6 +77924,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -77966,6 +77992,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:292
 #, c-format
@@ -77996,6 +78024,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #, c-format
 msgid "Failed to open output file <%s>: %d (%s)"
 msgstr ""
@@ -78081,6 +78110,11 @@ msgstr ""
 msgid "Failed to open output file <%s>: %d (%s)"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+#, c-format
+msgid "Failed to open output file <%s>: %d (%s)"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../raster/r.geomorphon/main.c:354
 msgid "Search radius size must cover at least 1 cell"
@@ -82144,6 +82178,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -82176,6 +82211,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "layer name or number to use for data"
 #~ msgstr "图层 %d"
diff --git a/locale/po/grasswxpy_ar.po b/locale/po/grasswxpy_ar.po
index 1f742958fea..0c070f0e04d 100644
--- a/locale/po/grasswxpy_ar.po
+++ b/locale/po/grasswxpy_ar.po
@@ -24,6 +24,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 =======
 <<<<<<< HEAD
@@ -52,6 +53,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
 =======
 =======
@@ -67,6 +70,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
@@ -115,6 +119,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
@@ -134,6 +140,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -171,6 +178,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -189,6 +198,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -230,6 +240,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -255,6 +267,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -296,6 +309,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:109 ../gui/wxpython/nviz/preferences.py:65
 #: ../gui/wxpython/nviz/preferences.py:69
 msgid "View"
@@ -2173,6 +2188,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2242,6 +2258,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/toolbars.py:29
 #: ../gui/wxpython/mapswipe/toolbars.py:31
 msgid "Query raster/vector map(s)"
@@ -2773,6 +2793,7 @@ msgid "Status bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2864,6 +2885,11 @@ msgid "Status bar"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/infomanager.py:36
@@ -2904,6 +2930,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:563
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1093
 =======
@@ -2933,6 +2960,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109
 #: ../gui/wxpython/modules/import_export.py:578
 =======
@@ -2949,6 +2978,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109
@@ -3000,6 +3030,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107
 #: ../gui/wxpython/modules/import_export.py:562
 =======
@@ -3021,6 +3053,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -3079,6 +3112,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:563
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1093
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3096,6 +3133,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3155,6 +3193,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Import vector data"
 msgstr ""
 
@@ -3176,6 +3217,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:421
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1060
 =======
@@ -3205,6 +3247,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074
 =======
 =======
@@ -3220,6 +3264,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074
@@ -3268,6 +3313,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/modules/import_export.py:416
@@ -3289,6 +3336,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3318,6 +3366,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:421
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1060
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3335,6 +3385,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3377,6 +3428,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Import raster data"
 msgstr ""
 
@@ -3458,6 +3511,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3499,6 +3553,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/catalog.py:51
 msgid "Data catalog"
 msgstr ""
@@ -3573,6 +3629,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3635,6 +3692,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/g.gui.datacatalog.py:50
 msgid "Data Catalog - GRASS GIS"
 msgstr ""
@@ -3655,6 +3716,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3677,6 +3739,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/tree.py:96
 =======
 =======
@@ -3692,6 +3756,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/datacatalog/tree.py:96
 =======
@@ -3739,6 +3804,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/tree.py:95
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -4064,6 +4131,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4126,6 +4194,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:23
 msgid "Reload GRASS projects"
 msgstr ""
@@ -4191,6 +4263,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4225,6 +4298,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/modules/extensions.py:76
@@ -4246,6 +4321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4275,6 +4351,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/extensions.py:76
 #: ../gui/wxpython/gui_core/menu.py:163
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4290,6 +4368,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4327,6 +4406,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Search"
 msgstr ""
 
@@ -4357,6 +4438,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4391,6 +4473,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:927
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Reprojection"
@@ -4427,6 +4511,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4489,6 +4574,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:924
 msgid "Reprojection"
 msgstr ""
@@ -4522,6 +4611,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -4544,6 +4634,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -4561,6 +4653,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
@@ -4625,6 +4718,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Map layer <{ml}> needs to be reprojected.\n"
@@ -4647,6 +4742,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4669,6 +4765,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/dialogs.py:124
 =======
 =======
@@ -4684,6 +4782,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/datacatalog/dialogs.py:124
 =======
@@ -4731,6 +4830,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/dialogs.py:125
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Estimated resolution:"
@@ -4764,6 +4865,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -4787,6 +4889,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/datacatalog/dialogs.py:126
 msgid "Estimated resolution:"
@@ -5167,6 +5271,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6101,6 +6206,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2007
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -6120,6 +6227,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -6185,6 +6293,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -6209,6 +6319,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -6250,6 +6361,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:87
 msgid "Map Swipe Tool - GRASS GIS"
 msgstr ""
@@ -18320,6 +18433,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -18389,6 +18503,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:186
 #, python-format
 msgid "<%(name)s>: layer type <%(type)s> is not supported"
@@ -18473,6 +18591,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18498,6 +18617,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1119
 =======
 =======
@@ -18512,6 +18633,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
@@ -18621,6 +18743,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1113 ../gui/wxpython/core/render.py:1120
 #: ../gui/wxpython/core/render.py:1127 ../gui/wxpython/core/gcmd.py:421
 msgid "Details:"
@@ -18643,6 +18770,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18734,6 +18862,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1118
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -18764,6 +18897,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18805,6 +18939,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Unable to get current geographic extent. Force quitting wxGUI. Please "
 "manually run g.region to fix the problem."
 msgstr ""
@@ -18825,6 +18961,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -18894,6 +19031,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Unable to get current geographic extent. Force quiting wxGUI. Please "
 "manually run g.region to fix the problem."
 msgstr ""
@@ -19229,6 +19370,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -19320,6 +19462,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to open file <%s> for reading."
 msgstr ""
@@ -19341,6 +19488,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/core/workspace.py:1726
 =======
 <<<<<<< HEAD
@@ -19383,6 +19531,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/workspace.py:1770
 =======
 #: ../gui/wxpython/core/workspace.py:1726
@@ -19401,6 +19551,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/core/workspace.py:1726
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -19484,6 +19635,11 @@ msgstr ""
 #: ../gui/wxpython/core/workspace.py:1726
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/core/workspace.py:1726
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Some lines were skipped when reading settings from file <%(file)s>.\n"
@@ -19509,6 +19665,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/core/workspace.py:1976
 =======
 <<<<<<< HEAD
@@ -19551,6 +19708,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/workspace.py:2019
 =======
 #: ../gui/wxpython/core/workspace.py:1976
@@ -19569,6 +19728,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/core/workspace.py:1976
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -19652,6 +19812,11 @@ msgstr ""
 #: ../gui/wxpython/core/workspace.py:1976
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/core/workspace.py:1976
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid " row %d:"
 msgstr ""
@@ -19673,6 +19838,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -19714,6 +19880,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/main.py:190
 #, python-format
 msgid "Unsupported command %s."
@@ -20313,6 +20481,7 @@ msgid "Thematic mapping for vector map in 3D view"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -20382,6 +20551,10 @@ msgid "Thematic mapping for vector map in 3D view"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/menutree.py:162
 #, python-format
 msgid "Unknow tag %s"
@@ -26290,6 +26463,7 @@ msgid "Map <%s> not found. "
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26381,6 +26555,11 @@ msgid "Map <%s> not found. "
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/import_export.py:50
@@ -26418,6 +26597,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26445,6 +26625,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:985
 =======
 =======
@@ -26460,6 +26642,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/modules/import_export.py:985
@@ -26508,6 +26691,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:968
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "right click to (un)select all"
@@ -26528,6 +26713,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26597,6 +26783,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:965
 msgid "right click to (un)select all"
 msgstr ""
@@ -26629,6 +26819,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26720,6 +26911,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:82
 msgid "Name for output GRASS map (editable)"
 msgstr ""
@@ -26740,6 +26936,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -26832,6 +27029,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:85
 #: ../gui/wxpython/gui_core/forms.py:2248 ../gui/wxpython/psmap/dialogs.py:2216
 msgid "Feature type"
@@ -26860,6 +27062,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26951,6 +27154,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:96
 msgid "Override projection check (use current location's projection)"
 msgstr ""
@@ -26972,6 +27180,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27013,6 +27222,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:127
 #: ../gui/wxpython/modules/import_export.py:435
 <<<<<<< HEAD
@@ -27034,6 +27245,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -27103,6 +27315,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:113
 #: ../gui/wxpython/gui_core/forms.py:705
 msgid "Close dialog on finish"
@@ -27128,6 +27344,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27160,6 +27377,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -27177,6 +27396,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -27242,6 +27462,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "&Import"
 msgstr ""
 
@@ -27263,6 +27485,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:441
 #: ../gui/wxpython/modules/import_export.py:583
 =======
@@ -27306,6 +27529,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:436
 <<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:598
@@ -27330,6 +27555,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -27388,6 +27614,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:441
 #: ../gui/wxpython/modules/import_export.py:583
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -27405,6 +27635,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27464,6 +27695,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Import selected layers"
 msgstr ""
 
@@ -27488,6 +27722,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27529,6 +27764,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:160
 msgid "Import settings"
 msgstr ""
@@ -27549,6 +27786,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -27618,6 +27856,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:161
 msgid "Import settings"
 msgstr ""
@@ -27640,6 +27882,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27731,6 +27974,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map names %(names)s exist. "
 msgstr ""
@@ -27752,6 +28000,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:259
 =======
 <<<<<<< HEAD
@@ -27794,6 +28043,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:258
 =======
 #: ../gui/wxpython/modules/import_export.py:259
@@ -27812,6 +28063,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/modules/import_export.py:259
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -27895,6 +28147,11 @@ msgstr ""
 #: ../gui/wxpython/modules/import_export.py:259
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/modules/import_export.py:259
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map name <%(name)s> exist. "
 msgstr ""
@@ -27916,6 +28173,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27957,6 +28215,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:423
 #: ../gui/wxpython/modules/import_export.py:585
 msgid "Add linked layers into layer tree"
@@ -28038,6 +28298,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -28107,6 +28368,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:419
 #: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1189
 msgid "Link external raster data"
@@ -28197,6 +28462,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -28229,6 +28495,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -28246,6 +28514,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -28311,6 +28580,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Projection of following layers do not match with projection of current "
 "location. "
@@ -28333,6 +28604,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -28360,6 +28632,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:983
 =======
 =======
@@ -28375,6 +28649,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/modules/import_export.py:983
@@ -28423,6 +28698,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:966
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Layers to be reprojected"
@@ -28557,6 +28834,7 @@ msgid "Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -28626,6 +28904,10 @@ msgid "Raster Map Calculator"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:963
 msgid "Layers to be reprojected"
 msgstr ""
@@ -29099,6 +29381,7 @@ msgid "Thematic mapping for vector map in 3D view"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29190,6 +29473,11 @@ msgid "Thematic mapping for vector map in 3D view"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
@@ -29232,6 +29520,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -29324,6 +29613,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:174
 #: ../gui/wxpython/gui_core/forms.py:2054
 msgid "&Load"
@@ -29346,6 +29640,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29437,6 +29732,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:175
 msgid "Load expression from file"
 msgstr ""
@@ -29457,6 +29757,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -29549,6 +29850,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:176
 #: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1198
 #: ../gui/wxpython/gui_core/forms.py:634
@@ -29577,6 +29883,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29668,6 +29975,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:181
 msgid "exponent"
 msgstr ""
@@ -29843,6 +30155,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -29870,6 +30183,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iscatt/plots.py:45
 =======
 =======
@@ -29885,6 +30200,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/iscatt/plots.py:45
@@ -29933,6 +30249,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iscatt/plots.py:44
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -30351,6 +30669,7 @@ msgid "Setup for r.li modules - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -30420,6 +30739,10 @@ msgid "Setup for r.li modules - GRASS GIS"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/extensions.py:45
 msgid "Fetch & install extension from GRASS Addons"
 msgstr ""
@@ -30530,6 +30853,7 @@ msgid "Extension"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30621,6 +30945,11 @@ msgid "Extension"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/rlisetup/wizard.py:66
@@ -30682,6 +31011,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:981
 =======
 <<<<<<< HEAD
@@ -30724,6 +31054,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:982
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:981
@@ -30742,6 +31074,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:981
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -30825,6 +31158,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:981
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:981
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Whole map layer"
 msgstr ""
 
@@ -30858,6 +31196,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:708
 =======
 <<<<<<< HEAD
@@ -30900,6 +31239,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:709
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:708
@@ -30918,6 +31259,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:708
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31001,6 +31343,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:708
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:708
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s was not found, please select another vector"
 msgstr ""
@@ -31022,6 +31369,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:713
 =======
 <<<<<<< HEAD
@@ -31064,6 +31412,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:714
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:713
@@ -31082,6 +31432,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:713
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31165,6 +31516,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:713
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:713
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s has no areas, please select another vector"
 msgstr ""
@@ -31186,6 +31542,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:719
 =======
 <<<<<<< HEAD
@@ -31228,6 +31585,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:720
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:719
@@ -31246,6 +31605,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:719
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31329,6 +31689,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:719
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:719
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s has no table connected, please select another vector"
 msgstr ""
@@ -31350,6 +31715,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31391,6 +31757,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:763
 msgid "Insert sampling frame parameter"
 msgstr ""
@@ -31436,6 +31804,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31505,6 +31874,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:762
 msgid "Insert sampling frame parameter"
 msgstr ""
@@ -31562,6 +31935,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31653,6 +32027,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Select areas from the\n"
 "overlaid vector map"
@@ -31675,6 +32054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31716,6 +32096,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:998
 msgid "Choose a method"
 msgstr ""
@@ -31784,6 +32166,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31853,6 +32236,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:997
 msgid "Choose a method"
 msgstr ""
@@ -31923,6 +32310,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32014,6 +32402,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Draw sampling regions"
 msgstr ""
 
@@ -32035,6 +32428,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32076,6 +32470,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Draw sample region {count} of {num_regions}"
 msgstr ""
@@ -32113,6 +32509,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -32182,6 +32579,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Draw sample region "
 msgstr ""
 
@@ -32226,6 +32627,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32317,6 +32719,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/toolbars.py:105
 msgid "Rectangle"
 msgstr ""
@@ -32338,6 +32745,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32379,6 +32787,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1307
 #: ../gui/wxpython/rlisetup/wizard.py:1499
 #: ../gui/wxpython/rlisetup/wizard.py:1612
@@ -32497,6 +32907,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32529,6 +32940,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:156
 =======
 =======
@@ -32546,6 +32959,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32593,6 +33007,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1309
 #: ../gui/wxpython/rlisetup/wizard.py:1501
 #: ../gui/wxpython/rlisetup/wizard.py:1614
@@ -32713,6 +33129,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32804,6 +33221,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:155
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -32829,6 +33251,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:1928
 =======
 <<<<<<< HEAD
@@ -32903,6 +33326,12 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+#: ../gui/wxpython/rlisetup/wizard.py:1920
+<<<<<<< HEAD
+#: ../gui/wxpython/rlisetup/functions.py:140
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/rlisetup/wizard.py:1928
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32920,6 +33349,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -32998,6 +33428,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:139
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "The polygon seems to have 0 areas"
@@ -33020,6 +33452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33061,6 +33494,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1923
 msgid "Select sample area 1 of "
 msgstr ""
@@ -33150,6 +33585,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -33219,6 +33655,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1931
 msgid "Select sample area 1 of "
 msgstr ""
@@ -33352,6 +33792,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33443,6 +33884,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:26
 msgid "Modify the configuration file"
 msgstr ""
@@ -33469,6 +33915,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/frame.py:97
 =======
 <<<<<<< HEAD
@@ -33511,6 +33958,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:101
 =======
 #: ../gui/wxpython/rlisetup/frame.py:97
@@ -33529,6 +33978,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/frame.py:97
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -33612,6 +34062,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/frame.py:97
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/frame.py:97
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Are you sure that you want modify r.li configuration file {name}?\n"
@@ -33635,6 +34090,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33676,6 +34132,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:106
 msgid "WARNING"
 msgstr ""
@@ -33729,6 +34187,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -33798,6 +34257,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:102
 msgid "WARNING"
 msgstr ""
@@ -33858,6 +34321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33949,6 +34413,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Do you want remove r.li configuration file <%s>?"
 msgstr ""
@@ -33970,6 +34439,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -34011,6 +34481,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:245
 msgid "Remove new r.li configuration file?"
 msgstr ""
@@ -34031,6 +34503,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -34100,6 +34573,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:241
 msgid "Remove new r.li configuration file?"
 msgstr ""
@@ -34122,6 +34599,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -34213,6 +34691,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Set the new name for %s \"                                            "
@@ -34236,6 +34719,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -34277,6 +34761,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:279
 msgid "Rename configuration file"
 msgstr ""
@@ -35112,6 +35598,7 @@ msgid "There were some issues when loading menu or Tools tab:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -35179,6 +35666,10 @@ msgid "There were some issues when loading menu or Tools tab:"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:275
 msgid "Rename configuration file"
 msgstr ""
@@ -41601,6 +42092,7 @@ msgid "Dbf driver does not support usage of SQL functions."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -48099,6 +48591,11 @@ msgid "Dbf driver does not support usage of SQL functions."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/lmgr/frame.py:1305
@@ -48166,6 +48663,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -48205,6 +48703,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/manager.py:237 ../gui/wxpython/dbmgr/base.py:369
 #: ../gui/wxpython/dbmgr/base.py:961 ../gui/wxpython/dbmgr/base.py:1132
 #: ../gui/wxpython/dbmgr/base.py:1486 ../gui/wxpython/dbmgr/base.py:2180
@@ -48220,6 +48720,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -48262,6 +48763,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/manager.py:236 ../gui/wxpython/dbmgr/base.py:362
 #: ../gui/wxpython/dbmgr/base.py:952 ../gui/wxpython/dbmgr/base.py:1123
 #: ../gui/wxpython/dbmgr/base.py:1477 ../gui/wxpython/dbmgr/base.py:2170
@@ -48283,6 +48786,7 @@ msgid "Number of loaded records: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -48352,6 +48856,10 @@ msgid "Number of loaded records: %d"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:81
 #, python-format
 msgid ""
@@ -48423,6 +48931,7 @@ msgid "Category"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -48514,6 +49023,11 @@ msgid "Category"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51
@@ -48542,6 +49056,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -48569,6 +49084,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362
 =======
 =======
@@ -48584,6 +49101,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362
@@ -48632,6 +49150,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Database connection"
@@ -49906,6 +50426,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -49975,6 +50496,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/web_services/widgets.py:140
 msgid " Requested data settings "
 msgstr ""
@@ -53091,6 +53616,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -53182,6 +53708,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Unable to open file\n"
@@ -53205,6 +53736,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:535
 =======
 <<<<<<< HEAD
@@ -53247,6 +53779,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:530
 =======
 #: ../gui/wxpython/psmap/instructions.py:535
@@ -53265,6 +53799,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:535
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53348,6 +53883,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:535
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:535
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Instruction file will be loaded with following region: %s\n"
 msgstr ""
@@ -53369,6 +53909,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:541
 =======
 <<<<<<< HEAD
@@ -53411,6 +53952,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:536
 =======
 #: ../gui/wxpython/psmap/instructions.py:541
@@ -53429,6 +53972,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:541
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53512,6 +54056,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:541
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:541
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Region cannot be set\n"
@@ -53535,6 +54084,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -53576,6 +54126,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:706
 <<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:929
@@ -53616,6 +54168,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -53685,6 +54238,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:711
 #: ../gui/wxpython/psmap/instructions.py:925
 #: ../gui/wxpython/psmap/instructions.py:1053
@@ -53714,6 +54271,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -53746,6 +54304,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -53763,6 +54323,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -53828,6 +54389,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %s"
 msgstr ""
@@ -53849,6 +54412,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:727
 =======
 <<<<<<< HEAD
@@ -53891,6 +54455,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:722
 =======
 #: ../gui/wxpython/psmap/instructions.py:727
@@ -53909,6 +54475,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:727
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53992,6 +54559,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:727
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:727
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Scale has changed, old value: %(old)s\n"
@@ -54015,6 +54587,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:732
 =======
 <<<<<<< HEAD
@@ -54057,6 +54630,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:727
 =======
 #: ../gui/wxpython/psmap/instructions.py:732
@@ -54075,6 +54650,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:732
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54158,6 +54734,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:732
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:732
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to read instruction %s.\n"
@@ -54181,6 +54762,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:746
 =======
 <<<<<<< HEAD
@@ -54223,6 +54805,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:741
 =======
 #: ../gui/wxpython/psmap/instructions.py:746
@@ -54241,6 +54825,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:746
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54324,6 +54909,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:746
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:746
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Map frame position changed, old value: %(old1)s %(old2)s\n"
@@ -54347,6 +54937,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:764
 =======
 <<<<<<< HEAD
@@ -54375,6 +54966,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:765
 =======
 =======
@@ -54390,6 +54983,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:765
@@ -54438,6 +55032,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:759
 =======
 #: ../gui/wxpython/psmap/instructions.py:764
@@ -54457,6 +55053,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:764
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54494,6 +55091,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54512,6 +55111,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -54553,6 +55153,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Map frame size changed, old value: %(old1)s %(old2)s\n"
@@ -54576,6 +55178,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:837
 =======
 <<<<<<< HEAD
@@ -54604,6 +55207,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:840
 =======
 =======
@@ -54619,6 +55224,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:840
@@ -54667,6 +55273,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:832
 =======
 #: ../gui/wxpython/psmap/instructions.py:837
@@ -54686,6 +55294,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:837
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54723,6 +55332,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54741,6 +55352,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -54782,6 +55394,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to read instruction %(file)s.\n"
@@ -54805,6 +55419,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:852
 =======
 <<<<<<< HEAD
@@ -54833,6 +55448,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:856
 =======
 =======
@@ -54848,6 +55465,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:856
@@ -54896,6 +55514,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:847
 =======
 #: ../gui/wxpython/psmap/instructions.py:852
@@ -54915,6 +55535,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:852
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54952,6 +55573,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54970,6 +55593,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -55011,6 +55635,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %s."
 msgstr ""
@@ -55032,6 +55658,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:1132
 =======
 <<<<<<< HEAD
@@ -55060,6 +55687,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:1136
 =======
 =======
@@ -55075,6 +55704,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:1136
@@ -55123,6 +55753,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:1127
 =======
 #: ../gui/wxpython/psmap/instructions.py:1132
@@ -55142,6 +55774,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:1132
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -55179,6 +55812,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -55197,6 +55832,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -55238,6 +55874,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %(inst)s: file %(file)s not found."
 msgstr ""
@@ -55259,6 +55897,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55300,6 +55939,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/g.gui.psmap.py:52
 msgid "Cartographic Composer - GRASS GIS"
 msgstr ""
@@ -55360,6 +56001,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55429,6 +56071,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/toolbars.py:86
 msgid "Full extent"
 msgstr ""
@@ -55478,6 +56124,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55519,6 +56166,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:267
 msgid "Units:"
 msgstr ""
@@ -55539,6 +56188,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55608,6 +56258,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/utils.py:102
 msgid "inch"
 msgstr ""
@@ -55662,6 +56316,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -55753,6 +56408,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Position of the top left corner\n"
 "from the top left edge of the paper"
@@ -55775,6 +56435,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55816,6 +56477,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:311
 msgid "Position is given:"
 msgstr ""
@@ -55844,6 +56507,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55913,6 +56577,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:313
 msgid "Position is given:"
 msgstr ""
@@ -55943,6 +56611,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56034,6 +56703,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Position from the top left\n"
 "edge of the paper"
@@ -56056,6 +56730,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -56083,6 +56758,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:462
 =======
 =======
@@ -56098,6 +56775,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:462
@@ -56146,6 +56824,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:453
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Font:"
@@ -56286,6 +56966,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -56355,6 +57036,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:455
 msgid "Font:"
 msgstr ""
@@ -56493,6 +57178,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56525,6 +57211,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -56542,6 +57230,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -56607,6 +57296,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Map max resolution (dpi):"
 msgstr ""
 
@@ -56629,6 +57320,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -56656,6 +57348,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684
 =======
 =======
@@ -56671,6 +57365,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684
@@ -56719,6 +57414,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Border"
@@ -56755,6 +57452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -56824,6 +57522,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1125 ../gui/wxpython/psmap/dialogs.py:3641
 msgid "Border"
 msgstr ""
@@ -56858,6 +57560,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56890,6 +57593,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -56907,6 +57612,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -56972,6 +57678,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Region is set to match this map,\n"
 "raster or vector map must be added later"
@@ -56994,6 +57702,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -57021,6 +57730,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1296
 =======
 =======
@@ -57036,6 +57747,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:1296
@@ -57084,6 +57796,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1269
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Region selection"
@@ -57176,6 +57890,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -57245,6 +57960,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1272
 msgid "Region selection"
 msgstr ""
@@ -57335,6 +58054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -57367,6 +58087,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -57384,6 +58106,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -57449,6 +58172,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%s properties"
 msgstr ""
@@ -57470,6 +58195,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -57497,6 +58223,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2249
 =======
 =======
@@ -57512,6 +58240,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:2249
@@ -57560,6 +58289,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2218
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Data selection"
@@ -57742,6 +58473,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -57811,6 +58543,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2208
 msgid "Data selection"
 msgstr ""
@@ -57991,6 +58727,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58023,6 +58760,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58040,6 +58779,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58105,6 +58845,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%(rast)s: type %(type)s"
 msgstr ""
@@ -58126,6 +58868,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58153,6 +58896,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3498
 =======
 =======
@@ -58168,6 +58913,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:3498
@@ -58216,6 +58962,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3459
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Type of legend"
@@ -58292,6 +59040,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -58361,6 +59110,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3455
 msgid "Type of legend"
 msgstr ""
@@ -58435,6 +59188,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58467,6 +59221,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58484,6 +59240,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58549,6 +59306,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Width of the color symbol (for lines)\n"
 "in front of the legend text"
@@ -58571,6 +59330,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58598,6 +59358,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028
 =======
 =======
@@ -58613,6 +59375,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028
@@ -58661,6 +59424,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Columns:"
@@ -58689,6 +59454,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -58758,6 +59524,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3813 ../gui/wxpython/psmap/dialogs.py:3976
 msgid "Columns:"
 msgstr ""
@@ -58784,6 +59554,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58816,6 +59587,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58833,6 +59606,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58898,6 +59672,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Column separation distance between the left edges\n"
 "of two columns in a multicolumn legend"
@@ -58920,6 +59696,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58947,6 +59724,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4133
 =======
 =======
@@ -58962,6 +59741,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:4133
@@ -59010,6 +59790,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4085
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Edit legend label:"
@@ -59166,6 +59948,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -59235,6 +60018,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4081
 msgid "Edit legend label:"
 msgstr ""
@@ -59389,6 +60176,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -59421,6 +60209,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -59438,6 +60228,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -59503,6 +60294,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "PIL\n"
 "missing"
@@ -59525,6 +60318,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/dialogs.py:5956
 =======
 <<<<<<< HEAD
@@ -59553,6 +60347,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6007
 =======
 =======
@@ -59568,6 +60364,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6007
@@ -59616,6 +60413,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:5954
 =======
 #: ../gui/wxpython/psmap/dialogs.py:5956
@@ -59635,6 +60434,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/dialogs.py:5956
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59672,6 +60472,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -59690,6 +60492,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59731,6 +60534,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
@@ -59752,6 +60557,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/dialogs.py:6019
 =======
 <<<<<<< HEAD
@@ -59780,6 +60586,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6070
 =======
 =======
@@ -59795,6 +60603,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6070
@@ -59843,6 +60652,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6017
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6019
@@ -59862,6 +60673,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6019
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59899,6 +60711,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -59917,6 +60731,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59958,6 +60773,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "size: %(width)s x %(height)s pts"
 msgstr ""
@@ -59979,6 +60796,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -60006,6 +60824,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6092
 =======
 =======
@@ -60021,6 +60841,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6092
@@ -60069,6 +60890,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6039
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "No image selected."
@@ -60109,6 +60932,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -60178,6 +61002,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6041
 msgid "No image selected."
 msgstr ""
@@ -60216,6 +61044,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -60248,6 +61077,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -60265,6 +61096,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -60330,6 +61162,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Note: Selected symbol is not displayed\n"
 "in draft mode (only in preview mode)"
@@ -60352,6 +61186,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -60379,6 +61214,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619
 =======
 =======
@@ -60394,6 +61231,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619
@@ -60442,6 +61280,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Outline color:"
@@ -60503,6 +61343,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -60572,6 +61413,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6568
 msgid "Outline color:"
 msgstr ""
@@ -60634,6 +61479,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -60725,6 +61571,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Python Imaging Library is not available.\n"
 "'Preview' functionality won't work."
@@ -60747,6 +61598,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:275
 =======
 <<<<<<< HEAD
@@ -60789,6 +61641,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:281
 =======
 #: ../gui/wxpython/psmap/frame.py:275
@@ -60807,6 +61661,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:275
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -60890,6 +61745,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/frame.py:275
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/frame.py:275
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Characters on position %s are not supported by ISO-8859-1 (Latin 1) encoding "
@@ -60913,6 +61773,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:283
 =======
 <<<<<<< HEAD
@@ -60955,6 +61816,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:289
 =======
 #: ../gui/wxpython/psmap/frame.py:283
@@ -60973,6 +61836,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:283
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -61056,6 +61920,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/frame.py:283
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/frame.py:283
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Not all characters are supported by ISO-8859-1 (Latin 1) encoding which is "
 "required by module ps.map."
@@ -61078,6 +61947,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -61119,6 +61989,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:320
 msgid "Program ps2pdf is not available. Please install it first to create PDF."
 msgstr ""
@@ -61154,6 +62026,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -61223,6 +62096,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:314
 msgid "Program ps2pdf is not available. Please install it first to create PDF."
 msgstr ""
@@ -61257,6 +62134,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -61289,6 +62167,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -61306,6 +62186,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -61371,6 +62252,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Ps.map exited with return code %s"
 msgstr ""
@@ -61392,6 +62275,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:438
 =======
 <<<<<<< HEAD
@@ -61420,6 +62304,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:437
 =======
 =======
@@ -61435,6 +62321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:437
@@ -61483,6 +62370,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:436
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Program {} is not available."
@@ -61524,6 +62413,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:438
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -61561,6 +62451,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -61579,6 +62471,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -61620,6 +62513,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%(prg)s exited with return code %(code)s"
 msgstr ""
@@ -61641,6 +62536,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -61668,6 +62564,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:464
 =======
 =======
@@ -61683,6 +62581,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:464
@@ -61731,6 +62630,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:463
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "PDF generated"
@@ -61771,6 +62672,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -61840,6 +62742,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:442
 msgid "PDF generated"
 msgstr ""
@@ -61882,6 +62788,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -61914,6 +62821,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -61931,6 +62840,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -61996,6 +62906,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Preview is not available probably because Ghostscript is not installed or "
 "not on PATH."
@@ -62018,6 +62930,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -62045,6 +62958,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:514
 =======
 =======
@@ -62060,6 +62975,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:514
@@ -62108,6 +63024,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:512
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -62141,6 +63059,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -62210,6 +63129,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:488
 msgid "Please follow instructions on GRASS Trac Wiki."
 msgstr ""
@@ -62240,6 +63163,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -62272,6 +63196,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -62289,6 +63215,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -62354,6 +63281,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read file %s."
 msgstr ""
@@ -62375,6 +63304,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -62402,6 +63332,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:794
 =======
 =======
@@ -62417,6 +63349,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:794
@@ -62465,6 +63398,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:792
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Scalebar is not appropriate for this projection"
@@ -62528,6 +63463,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -62597,6 +63533,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:761
 msgid "Scalebar is not appropriate for this projection"
 msgstr ""
@@ -62665,6 +63605,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -62756,3 +63697,8 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_bn.po b/locale/po/grasswxpy_bn.po
index c51b780c0e5..bb2e64bf569 100644
--- a/locale/po/grasswxpy_bn.po
+++ b/locale/po/grasswxpy_bn.po
@@ -18608,6 +18608,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18680,6 +18681,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -18703,6 +18709,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18794,6 +18801,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -18814,6 +18826,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18886,6 +18899,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -19549,6 +19567,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19595,6 +19614,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
diff --git a/locale/po/grasswxpy_cs.po b/locale/po/grasswxpy_cs.po
index 3576b9f2134..42b12e2a0db 100644
--- a/locale/po/grasswxpy_cs.po
+++ b/locale/po/grasswxpy_cs.po
@@ -18333,6 +18333,7 @@ msgstr "Vložte hodnoty rastrových kategorií nebo procenta"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18367,6 +18368,8 @@ msgstr "Vložte hodnoty rastrových kategorií nebo procenta"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/colorrules.py:983
 #: ../gui/wxpython/modules/colorrules.py:1685
 #: ../gui/wxpython/modules/colorrules.py:1691
@@ -18392,6 +18395,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18421,6 +18425,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/gmodeler/frame.py:450 ../gui/wxpython/gmodeler/frame.py:600
 msgid "Create new model?"
 msgstr "Vytvořit nový model?"
@@ -18736,6 +18742,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18795,6 +18802,9 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/colorrules.py:985
 msgid "fp range"
@@ -21807,6 +21817,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -21898,6 +21909,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -22271,6 +22287,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22362,6 +22379,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -23377,6 +23399,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23468,6 +23491,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -23558,6 +23586,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23636,6 +23665,11 @@ msgid "Text properties"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Workspace Toolbar"
@@ -23675,6 +23709,7 @@ msgid "Text properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -23721,6 +23756,9 @@ msgid "Text properties"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:226
@@ -23738,6 +23776,7 @@ msgid "Remove scale bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23784,6 +23823,8 @@ msgid "Remove scale bar"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -23805,6 +23846,7 @@ msgstr "Vybrat model ke spuštění"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23877,6 +23919,11 @@ msgstr "Vybrat model ke spuštění"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -24072,6 +24119,7 @@ msgstr "Přepsat soubor?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24118,6 +24166,9 @@ msgstr "Přepsat soubor?"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -24329,6 +24380,7 @@ msgstr "Odstranit mapovou vrstvu"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24401,6 +24453,11 @@ msgstr "Odstranit mapovou vrstvu"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Quit GRASS GUI"
@@ -24423,6 +24480,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -24471,6 +24529,9 @@ msgid "Histogram Tool"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/wxplot/histogram.py:51
@@ -24488,6 +24549,7 @@ msgid "Histogram of"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24534,6 +24596,8 @@ msgid "Histogram of"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -25511,6 +25575,7 @@ msgid "Neighborhood analysis tool for vector point maps. Makes each cell value a
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -25561,6 +25626,9 @@ msgid "Neighborhood analysis tool for vector point maps. Makes each cell value a
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1291
@@ -27437,6 +27505,7 @@ msgid "Soil heat flux"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27474,6 +27543,8 @@ msgid "Soil heat flux"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -27691,6 +27762,7 @@ msgstr "Správa vrstev"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27763,6 +27835,11 @@ msgstr "Správa vrstev"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/manager.py:155
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/manager.py:154
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Close Attribute Table Manager"
@@ -27784,6 +27861,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29009,6 +29087,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/menustrings.py:906 ../gui/wxpython/menustrings.py:1851
 msgid "Login"
@@ -30852,6 +30932,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30924,6 +31005,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/dialogs.py:80
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:79
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:133
@@ -31098,6 +31184,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31144,6 +31231,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "No attribute table found.\n"
@@ -31406,6 +31496,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31478,6 +31569,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -31764,6 +31860,7 @@ msgstr "Soubory"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31810,6 +31907,9 @@ msgstr "Soubory"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -32335,6 +32435,7 @@ msgid "Lat/long projections"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32393,6 +32494,8 @@ msgid "Failed to set default display font. Try different font."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/preferences.py:1830
@@ -32438,6 +32541,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32510,6 +32614,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:562
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:559
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Overlaying map layers"
@@ -32551,6 +32660,7 @@ msgid "Required item is not set."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33166,6 +33276,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/dialogs.py:105
@@ -36565,6 +36677,7 @@ msgstr "Vytvořit novou lokaci?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -36594,6 +36707,8 @@ msgstr "Vytvořit novou lokaci?"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Hide {overlay}"
 msgstr "Překrýt další vrstvou"
 
@@ -37046,6 +37161,7 @@ msgstr "Vytvořit novou lokaci?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37105,3 +37221,6 @@ msgstr "Vytvořit novou lokaci?"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_de.po b/locale/po/grasswxpy_de.po
index f26c7184674..086d2a6a12c 100644
--- a/locale/po/grasswxpy_de.po
+++ b/locale/po/grasswxpy_de.po
@@ -1788,6 +1788,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/datacatalog/g.gui.datacatalog.py:49
 msgid "Data Catalog - GRASS GIS"
 msgstr ""
@@ -1832,6 +1833,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iclass/frame.py:1169
 #, python-format
 msgid "No area in category %s. Category skipped."
@@ -2097,6 +2100,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2126,6 +2130,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/datacatalog/g.gui.datacatalog.py:49
 msgid "Data Catalog - GRASS GIS"
 msgstr ""
@@ -2144,6 +2150,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2186,6 +2193,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/datacatalog/catalog.py:203
 #: ../gui/wxpython/location_wizard/wizard.py:329
@@ -2612,6 +2621,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/datacatalog/toolbars.py:49
 msgid "Import raster data  [r.import]"
 =======
@@ -2655,6 +2665,8 @@ msgid "Import raster data  [r.import]"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:45
 msgid "Import raster data  [r.import]"
 =======
@@ -2674,6 +2686,7 @@ msgid "Import raster data  [r.import]"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2703,6 +2716,8 @@ msgid "Import raster data  [r.import]"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/datacatalog/toolbars.py:49
 msgid "Import raster data  [r.import]"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2720,6 +2735,7 @@ msgid "Import raster data  [r.import]"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2762,6 +2778,8 @@ msgid "Import raster data  [r.import]"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/toolbars.py:52
@@ -3206,6 +3224,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3297,6 +3316,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -4684,6 +4708,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4775,6 +4800,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/locdownload.py:146
 msgid "Download in progress, wait until it is finished 0%"
@@ -10253,6 +10283,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -10344,6 +10375,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1519
 msgid "Calculates linear regression from two raster maps: y = a + b*x."
@@ -17132,6 +17168,7 @@ msgid "Base raster map <{}> not found in current mapset."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -17223,6 +17260,11 @@ msgid "Base raster map <{}> not found in current mapset."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/rdigit/controller.py:159
@@ -17866,6 +17908,7 @@ msgid "Map Display {number}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -17916,6 +17959,9 @@ msgid "Map Display {number}"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/lmgr/frame.py:2179
@@ -17954,6 +18000,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17991,6 +18038,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -18994,6 +19043,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -19085,6 +19135,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -19470,6 +19525,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -19561,6 +19617,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -20577,6 +20638,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20668,6 +20730,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -20774,6 +20841,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20813,6 +20881,8 @@ msgid "Text properties"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797
 #, fuzzy
 msgid "Map Swipe Tool"
@@ -20835,6 +20905,7 @@ msgid "Text properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -20883,6 +20954,9 @@ msgid "Text properties"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:226
@@ -20900,6 +20974,7 @@ msgid "Remove scale bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20937,6 +21012,8 @@ msgid "Remove scale bar"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -26260,6 +26337,7 @@ msgstr "Vektorkarte <%s> hinzugefügt"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26351,6 +26429,11 @@ msgstr "Vektorkarte <%s> hinzugefügt"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Current workspace is not empty. Do you want to store current settings to "
 "workspace file?"
@@ -26372,6 +26455,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26413,6 +26497,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Aktuelles Projekt ist nicht leer. Wollen Sie die aktuellen Einstellungen in "
 "einer Projektdatei speichern?"
 =======
@@ -26431,6 +26517,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26500,6 +26587,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/workspace.py:76
 msgid "Create new workspace?"
@@ -31170,6 +31261,7 @@ msgid "Cartographic Composer - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -31220,6 +31312,9 @@ msgid "Cartographic Composer - GRASS GIS"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 msgid "style"
@@ -31319,6 +31414,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31356,6 +31452,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -31936,6 +32034,7 @@ msgstr "GRASS GIS Rasterkartenrechner"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31995,6 +32094,10 @@ msgstr "GRASS GIS Rasterkartenrechner"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gmodeler/dialogs.py:318
 #, fuzzy, python-format
 msgid ""
@@ -32017,6 +32120,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32051,6 +32155,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "'%s' ist kein GRASS Werkzeug.\n"
 "\n"
 "Kann keine neue Aktion zum Modell hinzufügen."
@@ -32076,6 +32182,7 @@ msgstr "GRASS GIS 3D Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32105,6 +32212,8 @@ msgstr "GRASS GIS 3D Raster Map Calculator"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 "Einheiten der aktuellen Projektion werden nicht unterstützt.\n"
 "Es wird stattdessen Meter verwendet!"
 
@@ -32270,6 +32379,7 @@ msgstr "GRASS GIS 3D Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32312,6 +32422,9 @@ msgstr "GRASS GIS 3D Raster Map Calculator"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Define GRASS Database and Location Name"
 msgstr ""
@@ -32343,6 +32456,7 @@ msgstr "Wählen Sie eine Methode, um die neue Location zu erzeugen"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Read projection and datum terms from a Well Known Text (WKT) .prj file"
 msgstr "Lese Projektions- und Datumsinformationen aus Well Known Text (WKT) .prj-Datei"
 
@@ -32489,6 +32603,8 @@ msgstr "Wählen Sie eine Methode, um die neue Location zu erzeugen"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Read projection and datum terms from a Well Known Text (WKT) .prj file"
 #~ msgstr ""
@@ -32525,6 +32641,7 @@ msgstr "Angabe von Projektions- und Datumsinformationen über anwendungsspezifis
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32554,6 +32671,8 @@ msgstr "Angabe von Projektions- und Datumsinformationen über anwendungsspezifis
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 msgid "GIS Data Directory:"
 msgstr "GIS-Daten Verzeichnis:"
@@ -32608,6 +32727,7 @@ msgstr "Wählen Sie eine Datei mit EPSG-Codes"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32705,6 +32825,8 @@ msgstr "Wählen Sie eine Datei mit EPSG-Codes"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Choose method of specifying georeferencing parameters"
 #~ msgstr ""
 #~ "Wählen Sie eine Methode, um die Parameter der Georeferenzierung zuwählen"
@@ -32726,6 +32848,7 @@ msgstr "Wählen Sie eine Methode, um die Parameter der Georeferenzierung zuwähl
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32755,6 +32878,8 @@ msgstr "Wählen Sie eine Methode, um die Parameter der Georeferenzierung zuwähl
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Choose method of specifying georeferencing parameters"
 msgstr "Wählen Sie eine Methode, um die Parameter der Georeferenzierung zuwählen"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -32772,6 +32897,7 @@ msgstr "Wählen Sie eine Methode, um die Parameter der Georeferenzierung zuwähl
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32814,6 +32940,8 @@ msgstr "Wählen Sie eine Methode, um die Parameter der Georeferenzierung zuwähl
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Location Title:"
 msgstr "Location-Titel:"
@@ -32835,6 +32963,7 @@ msgstr "Location-Titel:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Location wizard canceled. Location not created."
 msgstr "Location-Assistent wurde abgebrochen. Die Location wurde nicht erzeugt."
 
@@ -32965,6 +33094,8 @@ msgstr "Einlesen von Projektions- und Datumsinformationen aus georeferenzierter
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Location wizard canceled. Location not created."
 #~ msgstr ""
 #~ "Location-Assistent wurde abgebrochen. Die Location wurde nicht erzeugt."
@@ -33037,6 +33168,7 @@ msgstr "Möchten Sie nun die Ausdehnung und Auflösung der Standardregion eingeb
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -33066,6 +33198,8 @@ msgstr "Möchten Sie nun die Ausdehnung und Auflösung der Standardregion eingeb
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Location wizard canceled. Location not created."
 msgstr "Location-Assistent wurde abgebrochen. Die Location wurde nicht erzeugt."
 
@@ -33158,6 +33292,7 @@ msgstr "Location-Titel"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33318,6 +33453,8 @@ msgstr "Location-Titel"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII "
 #~ "characters excluding %(chars)s and space."
@@ -33342,6 +33479,7 @@ msgstr "Der Name <%(name)s> ist kein gültiger Name für Locations. Bitte verwen
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -33371,6 +33509,8 @@ msgstr "Der Name <%(name)s> ist kein gültiger Name für Locations. Bitte verwen
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Name <%(name)s> is not a valid name for location. Please use only ASCII characters excluding %(chars)s and space."
 msgstr "Der Name <%(name)s> ist kein gültiger Name für Locations. Bitte verwenden Sie nur ASCII-Zeichen ohne %(chars)s und Leerzeichen."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -33386,6 +33526,7 @@ msgstr "Der Name <%(name)s> ist kein gültiger Name für Locations. Bitte verwen
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33423,6 +33564,8 @@ msgstr "Der Name <%(name)s> ist kein gültiger Name für Locations. Bitte verwen
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Unable to create location"
 msgstr "Kann die Location nicht erzeugen"
@@ -33446,6 +33589,7 @@ msgstr "Wählen Sie den EPSG-Code des Koordinatensystem"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -33480,6 +33624,8 @@ msgstr "Wählen Sie den EPSG-Code des Koordinatensystem"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Read projection and datum terms from a georeferenced data file"
 #~ msgstr ""
 #~ "Einlesen von Projektions- und Datumsinformationen aus georeferenzierter "
@@ -33502,6 +33648,7 @@ msgstr "Einlesen von Projektions- und Datumsinformationen aus georeferenzierter
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -33531,6 +33678,8 @@ msgstr "Einlesen von Projektions- und Datumsinformationen aus georeferenzierter
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Read projection and datum terms from a georeferenced data file"
 msgstr "Einlesen von Projektions- und Datumsinformationen aus georeferenzierter Datei"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -33548,6 +33697,7 @@ msgstr "Einlesen von Projektions- und Datumsinformationen aus georeferenzierter
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33590,6 +33740,8 @@ msgstr "Einlesen von Projektions- und Datumsinformationen aus georeferenzierter
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Create a generic Cartesian coordinate system (XY)"
 msgstr "Erzeuge ein generisches kartesisches Koordinatensystem (XY)"
@@ -33617,6 +33769,7 @@ msgstr "Neue Location erzeugen?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "GRASS GIS SQL Query Utility"
 msgstr "GRASS GIS SQL Abfragewerkzeug"
 =======
@@ -33660,6 +33813,8 @@ msgstr "GRASS GIS SQL Abfragewerkzeug"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "GRASS GIS SQL Query Utility"
 #~ msgstr "GRASS GIS SQL Abfragewerkzeug"
 
@@ -33691,6 +33846,7 @@ msgstr "GRASS GIS SQL Abfragewerkzeug"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -33720,6 +33876,8 @@ msgstr "GRASS GIS SQL Abfragewerkzeug"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "GRASS GIS SQL Query Utility"
 msgstr "GRASS GIS SQL Abfragewerkzeug"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -33737,6 +33895,7 @@ msgstr "GRASS GIS SQL Abfragewerkzeug"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33779,3 +33938,5 @@ msgstr "GRASS GIS SQL Abfragewerkzeug"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_el.po b/locale/po/grasswxpy_el.po
index 6c49e2af527..5f69f83c242 100644
--- a/locale/po/grasswxpy_el.po
+++ b/locale/po/grasswxpy_el.po
@@ -2408,6 +2408,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2486,6 +2487,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/toolbars.py:46
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:45
 =======
 #: ../gui/wxpython/datacatalog/toolbars.py:49
@@ -2502,6 +2508,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -2521,6 +2528,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -2532,6 +2541,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -2611,6 +2621,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Import raster data  [r.import]"
 msgstr ""
 
@@ -2635,6 +2647,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/datacatalog/toolbars.py:55
 msgid "Select another import option"
 =======
@@ -2762,6 +2775,17 @@ msgid "Select another import option"
 msgid "Select another import option"
 =======
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/toolbars.py:52
+=======
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+<<<<<<< HEAD
+#: ../gui/wxpython/datacatalog/toolbars.py:51
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+msgid "Select another import option"
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:55
 msgid "Select another import option"
 =======
@@ -2780,6 +2804,7 @@ msgid "Select another import option"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2884,6 +2909,8 @@ msgid "Select another import option"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/toolbars.py:72
@@ -2959,6 +2986,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3031,6 +3059,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031
 =======
 #: ../gui/wxpython/datacatalog/tree.py:104
@@ -3397,6 +3430,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3429,6 +3463,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -3446,6 +3482,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -3511,6 +3548,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -3653,6 +3692,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3685,6 +3725,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2167
 #: ../gui/wxpython/animation/utils.py:99 ../gui/wxpython/animation/utils.py:107
 =======
@@ -3701,6 +3743,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3733,6 +3776,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapswipe/frame.py:460 ../gui/wxpython/lmgr/layertree.py:2084
 #: ../gui/wxpython/animation/utils.py:98 ../gui/wxpython/animation/utils.py:106
 =======
@@ -4410,6 +4455,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4456,6 +4502,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Map <%s> not found."
 msgstr "Ο χάρτης <%s> δεν βρέθηκε."
@@ -4505,6 +4554,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4537,6 +4587,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/tree.py:77
 msgid "No time info"
 msgstr ""
@@ -4556,6 +4608,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4588,6 +4641,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/tree.py:79
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -6021,6 +6076,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/timeline/g.gui.timeline.py:63
 msgid "Timeline Tool - GRASS GIS"
 =======
@@ -6062,6 +6118,8 @@ msgid "Timeline Tool - GRASS GIS"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:3579
 #: ../gui/wxpython/image2target/ii2t_manager.py:3499
 #: ../gui/wxpython/photo2image/ip2i_manager.py:2561
@@ -6077,6 +6135,7 @@ msgid "Timeline Tool - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -6119,6 +6178,8 @@ msgid "Timeline Tool - GRASS GIS"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:3574
 #: ../gui/wxpython/image2target/ii2t_manager.py:3481
 #: ../gui/wxpython/photo2image/ip2i_manager.py:2555
@@ -6240,6 +6301,7 @@ msgid "Timeline Tool - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/timeline/g.gui.timeline.py:63
 msgid "Timeline Tool - GRASS GIS"
@@ -6312,6 +6374,11 @@ msgid "Timeline Tool - GRASS GIS"
 #: ../gui/wxpython/timeline/g.gui.timeline.py:63
 msgid "Timeline Tool - GRASS GIS"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/timeline/g.gui.timeline.py:63
+msgid "Timeline Tool - GRASS GIS"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/timeline/frame.py:38
@@ -6330,6 +6397,7 @@ msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6377,6 +6445,8 @@ msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -9306,6 +9376,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/tplot/frame.py:209 ../gui/wxpython/tplot/frame.py:264
 msgid "Show simple linear regression line"
 msgstr ""
@@ -9336,6 +9407,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213
 =======
 =======
@@ -9351,6 +9424,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1213
@@ -9399,6 +9473,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:173 ../gui/wxpython/menustrings.py:1211
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Manage maps"
@@ -11073,6 +11149,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -11102,6 +11179,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/tplot/frame.py:209 ../gui/wxpython/tplot/frame.py:264
 msgid "Show simple linear regression line"
 msgstr ""
@@ -11120,6 +11199,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -11162,6 +11242,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521
 msgid "Calculates linear regression from two raster maps: y = a + b*x."
@@ -11356,6 +11438,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -11428,6 +11511,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1565
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:600 ../gui/wxpython/menustrings.py:1563
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Fill holes in areas"
@@ -12249,6 +12337,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -12340,6 +12429,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769
 msgid "Support Vector Machines classification (SVM)"
@@ -17970,6 +18064,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18042,6 +18137,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/rdigit/controller.py:122
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rdigit/controller.py:121
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Please select first the raster map"
@@ -18065,6 +18165,7 @@ msgid "Raster map <{}> not found in current mapset."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18119,6 +18220,8 @@ msgid "Base raster map <{}> not found in current mapset."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/rdigit/g.gui.rdigit.py:174
@@ -18137,6 +18240,7 @@ msgid "Base raster map <{}> not found in current mapset."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
@@ -18183,6 +18287,8 @@ msgid "Base raster map <{}> not found in current mapset."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/rdigit/controller.py:160
@@ -18916,6 +19022,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18957,6 +19064,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:186
 #, python-format
 msgid "<%(name)s>: layer type <%(type)s> is not supported"
@@ -19214,6 +19323,7 @@ msgid "Map Display {number}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -19262,6 +19372,9 @@ msgid "Map Display {number}"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/frame.py:2083
 #, python-brace-format
 msgid "Map Display {number}"
@@ -19279,6 +19392,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19310,6 +19424,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/frame.py:2179
 msgid "Add selected map layers into layer tree"
@@ -19326,6 +19442,7 @@ msgid "Add selected map layers into layer tree"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19371,6 +19488,8 @@ msgid "Add selected map layers into layer tree"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -19392,6 +19511,7 @@ msgstr "Συντεταγμένες"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19464,6 +19584,11 @@ msgstr "Συντεταγμένες"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/statusbar.py:829
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/statusbar.py:825
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -20090,6 +20215,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20181,6 +20307,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/mapdisp/toolbars.py:34
 msgid "Select vector feature(s)"
@@ -20649,6 +20780,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20740,6 +20872,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/import_export.py:69
 msgid "List of raster layers"
@@ -21999,6 +22136,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22090,6 +22228,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -22192,6 +22335,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22270,6 +22414,11 @@ msgid "Text properties"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Console"
@@ -22297,6 +22446,7 @@ msgid "Text properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -22343,6 +22493,9 @@ msgid "Text properties"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:226
@@ -22360,6 +22513,7 @@ msgid "Remove scale bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22406,6 +22560,8 @@ msgid "Remove scale bar"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -22427,6 +22583,7 @@ msgstr "Επιλογή μοντέλων για επεξεργασία"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22499,6 +22656,11 @@ msgstr "Επιλογή μοντέλων για επεξεργασία"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -22694,6 +22856,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22740,6 +22903,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -22798,6 +22964,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22870,6 +23037,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270
 =======
 #: ../gui/wxpython/wxplot/histogram.py:43
@@ -22976,6 +23148,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23022,6 +23195,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this "
@@ -23093,6 +23269,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23165,6 +23342,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1601 ../gui/wxpython/lmgr/frame.py:1477
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "System Info"
@@ -23186,6 +23368,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27731,6 +27914,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/iclass/dialogs.py:606
 msgid "Save signature file"
@@ -32240,6 +32425,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
@@ -32286,6 +32472,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:1653 ../gui/wxpython/lmgr/frame.py:1502
 msgid "GRASS version"
@@ -32313,6 +32501,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32385,6 +32574,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1659 ../gui/wxpython/lmgr/frame.py:1508
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1623 ../gui/wxpython/lmgr/frame.py:1499
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Build platform"
@@ -32404,6 +32598,7 @@ msgid "Unable to create new mapset: {}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32443,6 +32638,8 @@ msgid "Do you want to import {}to the newly created location?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/startup/guiutils.py:212
@@ -32473,6 +32670,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32545,6 +32743,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1749 ../gui/wxpython/lmgr/frame.py:1598
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1713 ../gui/wxpython/lmgr/frame.py:1589
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Enter new name:"
@@ -32768,6 +32971,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32814,6 +33018,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Unable to launch \"Supervised Classification Tool\".\n"
@@ -32854,6 +33061,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32926,6 +33134,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2261 ../gui/wxpython/lmgr/frame.py:2132
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2225 ../gui/wxpython/lmgr/frame.py:2123
 =======
 #: ../gui/wxpython/startup/guiutils.py:717
@@ -32947,6 +33160,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32979,6 +33193,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -32996,6 +33212,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -33061,6 +33278,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Note that cell values can only be displayed for regions of less than 10,000 "
 "cells."
@@ -33760,6 +33979,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33832,6 +34052,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351
 =======
 #: ../gui/wxpython/dbmgr/base.py:470
@@ -33849,6 +34074,7 @@ msgid "Sort descending"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34104,6 +34330,8 @@ msgid "Set SQL statement to default"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/dbmgr/base.py:474
@@ -34460,6 +34688,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34532,6 +34761,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -34558,6 +34792,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34604,6 +34839,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -35746,6 +35984,7 @@ msgid "Lat/long projections"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36396,6 +36635,8 @@ msgid "Select target vector map to display:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/preferences.py:1830
@@ -39001,6 +39242,7 @@ msgid "Cartographic Composer - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -39051,6 +39293,9 @@ msgid "Cartographic Composer - GRASS GIS"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #, fuzzy
@@ -39165,6 +39410,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39202,6 +39448,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -39228,6 +39476,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39300,6 +39549,8 @@ msgstr "(μονο για ανάγνωση)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy, python-format
 #~ msgid "Unable to delete location: %s"
 #~ msgstr "Αδυναμία διαγραφής επιλεγμένης Τοποθεσίας"
@@ -39505,6 +39756,7 @@ msgstr "(μονο για ανάγνωση)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -39534,6 +39786,8 @@ msgstr "(μονο για ανάγνωση)"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Volume"
 msgstr "Όγκος"
 
@@ -39584,6 +39838,7 @@ msgstr "(μονο για ανάγνωση)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39626,3 +39881,5 @@ msgstr "(μονο για ανάγνωση)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_es.po b/locale/po/grasswxpy_es.po
index 7452176053f..d3083bd7815 100644
--- a/locale/po/grasswxpy_es.po
+++ b/locale/po/grasswxpy_es.po
@@ -24,6 +24,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -102,6 +103,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+"POT-Creation-Date: 2024-05-23 03:37-0600\n"
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 =======
 "POT-Creation-Date: 2021-02-17 23:13-0500\n"
@@ -118,6 +124,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -137,6 +144,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -148,6 +157,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -227,6 +237,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "PO-Revision-Date: 2022-05-22 05:04+0000\n"
 "Last-Translator: Veronica \n"
 "Language-Team: Spanish >>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -19882,6 +19895,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/colorrules.py:985
 msgid "fp range"
@@ -20090,6 +20108,7 @@ msgid "Find more information at:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -20140,6 +20159,9 @@ msgid "Find more information at:"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:1531
@@ -20218,6 +20240,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20255,6 +20278,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -23048,6 +23073,7 @@ msgstr "Importar configuraciones"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23139,6 +23165,11 @@ msgstr "Importar configuraciones"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map names %(names)s exist. "
 msgstr ""
@@ -23164,6 +23195,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23255,6 +23287,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map name <%(name)s> exist. "
 msgstr ""
@@ -23362,6 +23399,7 @@ msgstr "Reproyectar capas seleccionadas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23453,6 +23491,11 @@ msgstr "Reproyectar capas seleccionadas"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -23838,6 +23881,7 @@ msgstr "Calculadora de mapas ráster 3D"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23929,6 +23973,11 @@ msgstr "Calculadora de mapas ráster 3D"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -25049,6 +25098,7 @@ msgstr "AVISO"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -25140,6 +25190,11 @@ msgstr "AVISO"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -25447,6 +25502,7 @@ msgstr "opacidad:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25519,6 +25575,11 @@ msgstr "opacidad:"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223
 =======
 #: ../gui/wxpython/mapwin/decorations.py:203
@@ -25722,6 +25783,7 @@ msgstr "¿Sobreescribir archivo?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25768,6 +25830,9 @@ msgstr "¿Sobreescribir archivo?"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Do you want to remove map layer(s)\n"
@@ -26095,6 +26160,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26122,6 +26188,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1126
 =======
 =======
@@ -26137,6 +26205,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/lmgr/layertree.py:1126
@@ -26185,6 +26254,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1088
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Unable to display histogram of raster map. No map name defined."
@@ -26321,6 +26392,7 @@ msgid "Add vector map"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26390,6 +26462,10 @@ msgid "Add vector map"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 msgstr ""
@@ -27680,6 +27756,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27771,6 +27848,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/toolbars.py:203
 msgid "Start new map display"
@@ -31133,6 +31215,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31224,6 +31307,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/toolbars.py:317
 msgid "Generate command for m.nviz.image"
@@ -31578,6 +31666,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31669,6 +31758,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/pyshell.py:78
 msgid "Simple &editor"
@@ -31717,6 +31811,7 @@ msgstr "Mapa ráster <%s> añadido"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -31751,6 +31846,8 @@ msgstr "Mapa ráster <%s> añadido"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/pyshell.py:143
 #, python-format
 msgid "Vector map <%s> added"
@@ -32116,6 +32213,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32148,6 +32246,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -32165,6 +32265,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -32230,6 +32331,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Database connection for vector map <%s> is not defined in DB file. You can "
@@ -32252,6 +32355,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32293,6 +32397,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "No se ha definido en el archivo DB, la conexión a la base de datos para el "
 "mapa vectorial <%s>. Puede definir una nueva conexión en la pestaña "
 "\"Administración de capas\"."
@@ -32312,6 +32418,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -32381,6 +32488,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/manager.py:123
 msgid "Please wait, loading attribute data..."
@@ -32504,6 +32615,7 @@ msgstr "Restricción para la búsqueda (claúsula WHERE)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32536,6 +32648,8 @@ msgstr "Restricción para la búsqueda (claúsula WHERE)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257
 #: ../gui/wxpython/dbmgr/base.py:1283
 =======
@@ -32552,6 +32666,7 @@ msgstr "Restricción para la búsqueda (claúsula WHERE)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32584,6 +32699,8 @@ msgstr "Restricción para la búsqueda (claúsula WHERE)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248
 #: ../gui/wxpython/dbmgr/base.py:1274
 =======
@@ -32629,6 +32746,7 @@ msgstr "Aplicar la instrucción SELECT y recargar los registros de datos"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32675,6 +32793,9 @@ msgstr "Aplicar la instrucción SELECT y recargar los registros de datos"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Example: %s"
 msgstr "Ejemplo: %s"
@@ -33251,6 +33372,7 @@ msgstr "Calculadora de campos <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33323,6 +33445,11 @@ msgstr "Calculadora de campos <%s>"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/dialogs.py:80
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:79
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:133
@@ -33497,6 +33624,7 @@ msgstr "Recargar todos los datos de atributos (eliminar selección actual)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33543,6 +33671,9 @@ msgstr "Recargar todos los datos de atributos (eliminar selección actual)"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "No attribute table found.\n"
@@ -33823,6 +33954,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33895,6 +34027,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -34181,6 +34318,7 @@ msgstr "Archivos"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34227,6 +34365,9 @@ msgstr "Archivos"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -34756,6 +34897,7 @@ msgstr "No válido"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34828,6 +34970,11 @@ msgstr "No válido"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -34853,6 +35000,7 @@ msgstr "PROJ string (requerido):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -34944,6 +35092,11 @@ msgstr "PROJ string (requerido):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/provider.py:562
 msgid "Overlaying map layers"
@@ -34963,6 +35116,7 @@ msgstr "Superponer capas de mapas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35035,6 +35189,11 @@ msgstr "Superponer capas de mapas"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -35710,6 +35869,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35756,6 +35916,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr "Directorio {t} no removido."
@@ -37810,6 +37973,7 @@ msgstr "etiquetas:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37842,6 +38006,8 @@ msgstr "etiquetas:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "&Delete location"
 #~ msgstr "&Borrar Localización"
 
@@ -37876,6 +38042,7 @@ msgstr "etiquetas:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37908,6 +38075,8 @@ msgstr "etiquetas:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Show comp. extent"
 #~ msgstr "Mostrar la región computacional"
 =======
@@ -37928,6 +38097,7 @@ msgid "Cartographic Composer - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -37978,6 +38148,9 @@ msgid "Cartographic Composer - GRASS GIS"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 msgid "Fetching list of modules from GRASS-Addons SVN (be patient)..."
@@ -38137,6 +38310,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38174,6 +38348,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -39106,6 +39282,7 @@ msgstr "Se ha cancelado el asistente de Localizaciones. La Localización no ha s
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39152,6 +39329,9 @@ msgstr "Se ha cancelado el asistente de Localizaciones. La Localización no ha s
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Location <%(loc)s> will be created in GIS data directory <%(dir)s>. You will need to change the default GIS data directory in the GRASS startup screen."
 msgstr "La Localización <%(loc)s> se creará en el directorio de datos SIG <%(dir)s>. Necesitará cambiar el directorio de datos SIG predeterminado en la pantalla de inicio de GRASS."
@@ -39343,6 +39523,7 @@ msgstr "¿Quiere establecer la extensión y resolución de la región predetermi
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -39372,6 +39553,8 @@ msgstr "¿Quiere establecer la extensión y resolución de la región predetermi
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Performs ordinary or block kriging."
 msgstr "Realiza kriging ordinario o en bloque."
 
@@ -39647,6 +39830,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39888,6 +40072,8 @@ msgstr "Doble click o Ctrl-Enter para ejecutar módulo seleccionado"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Creates a Voronoi diagram in current region from an input vector map containing points or centroids."
 msgstr "Crea un diagrama de Voronoi en la región actual a partir de un mapa vectorial de entrada que contenga puntos o centroides."
@@ -39968,6 +40154,7 @@ msgstr "¡Localización <%s> creada!"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40019,6 +40206,8 @@ msgstr "¡Localización <%s> creada!"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Unable to exit GRASS shell: unknown PID"
 #~ msgstr ""
 #~ "No fue posible salir de la línea de comandos de GRASS: PID desconocido"
@@ -40040,6 +40229,7 @@ msgstr "No fue posible salir de la línea de comandos de GRASS: PID desconocido"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -40069,6 +40259,8 @@ msgstr "No fue posible salir de la línea de comandos de GRASS: PID desconocido"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Unable to exit GRASS shell: unknown PID"
 msgstr "No fue posible salir de la línea de comandos de GRASS: PID desconocido"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -40084,6 +40276,7 @@ msgstr "No fue posible salir de la línea de comandos de GRASS: PID desconocido"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40121,6 +40314,8 @@ msgstr "No fue posible salir de la línea de comandos de GRASS: PID desconocido"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Remove vector legend"
 msgstr "Remover leyenda mapa vectorial"
@@ -40186,6 +40381,7 @@ msgstr "Herramienta de Histograma de GRASS GIS (d.histogram)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -40220,6 +40416,8 @@ msgstr "Herramienta de Histograma de GRASS GIS (d.histogram)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Copies available data files in the current mapset search path to the "
 #~ "user's current mapset."
@@ -40329,6 +40527,7 @@ msgstr "Redimensionar la leyenda"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40361,6 +40560,8 @@ msgstr "Redimensionar la leyenda"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Unable to create location"
 #~ msgstr "No se puede crear la Localización"
 =======
@@ -40377,6 +40578,7 @@ msgstr "Redimensionar la leyenda"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40409,6 +40611,8 @@ msgstr "Redimensionar la leyenda"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII "
 #~ "characters excluding %(chars)s and space."
@@ -40435,6 +40639,7 @@ msgstr "No se puede crear la Localización"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40481,6 +40686,9 @@ msgstr "No se puede crear la Localización"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Select EPSG code of spatial reference system"
 msgstr "Seleccione el código EPSG del sistema de referencia espacial"
@@ -40508,6 +40716,7 @@ msgstr "Leer la configuración de proyección y datum de un archivo de datos geo
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -40537,6 +40746,8 @@ msgstr "Leer la configuración de proyección y datum de un archivo de datos geo
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Copies available data files in the current mapset search path to the user's current mapset."
 msgstr "Copia los archivos de datos disponibles en la ruta de búsqueda del Directorio de mapas actual."
 
@@ -40629,6 +40840,7 @@ msgstr "Utilidad de GRASS GIS para Sentencia SQL"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40708,6 +40920,8 @@ msgstr "Utilidad de GRASS GIS para Sentencia SQL"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Do you want to quit GRASS including shell prompt or just close the GUI?"
 #~ msgstr ""
@@ -40769,6 +40983,7 @@ msgstr "Doble click o Ctrl-Enter para ejecutar módulo seleccionado"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -40798,6 +41013,8 @@ msgstr "Doble click o Ctrl-Enter para ejecutar módulo seleccionado"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Do you want to quit GRASS including shell prompt or just close the GUI?"
 msgstr "¿Quiere salir de GRASS incluyendo la línea de comandos o solamente cerrar la GUI?"
 
@@ -40818,6 +41035,7 @@ msgstr "Doble click o Ctrl-Enter para ejecutar módulo seleccionado"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40860,3 +41078,5 @@ msgstr "Doble click o Ctrl-Enter para ejecutar módulo seleccionado"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_fi.po b/locale/po/grasswxpy_fi.po
index 7acc453cbb6..c449a59d5d7 100644
--- a/locale/po/grasswxpy_fi.po
+++ b/locale/po/grasswxpy_fi.po
@@ -23629,6 +23629,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23701,6 +23702,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:252
@@ -23884,6 +23890,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23930,6 +23937,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -24139,6 +24149,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -24166,6 +24177,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306
 =======
 =======
@@ -24181,6 +24194,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306
@@ -24229,6 +24243,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Quit GRASS GUI"
@@ -24577,6 +24593,7 @@ msgid "New workspace"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -24646,6 +24663,10 @@ msgid "New workspace"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 msgstr ""
@@ -25482,6 +25503,7 @@ msgid "Delete all text from the shell"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -25511,6 +25533,8 @@ msgid "Delete all text from the shell"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/menustrings.py:23
 msgid "Add multiple raster or vector map layers to current display"
 msgstr ""
@@ -29714,6 +29738,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29751,6 +29776,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/locdownload.py:563
 msgid "Location Download"
 msgstr ""
@@ -31370,6 +31397,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31442,6 +31470,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -31465,6 +31498,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31556,6 +31590,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -31576,6 +31615,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31648,6 +31688,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -32311,6 +32356,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32357,6 +32403,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
@@ -33447,6 +33496,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33490,6 +33540,8 @@ msgstr "Paikka <%s> luotu"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Repository"
 #~ msgstr "Etäkirjasto"
 
@@ -33509,6 +33561,7 @@ msgstr "Paikan Otsikko:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33585,6 +33638,11 @@ msgstr "Luo uusi Paikka?"
 #~ msgstr "Paikka <%s> luotu"
 =======
 >>>>>>> osgeo-main
+=======
+#~ msgid "Location <%s> created"
+#~ msgstr "Paikka <%s> luotu"
+=======
+>>>>>>> osgeo-main
 msgid "Location <%s> created"
 msgstr "Paikka <%s> luotu"
 
@@ -33607,6 +33665,7 @@ msgstr "Luo uusi Paikka?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -33680,3 +33739,5 @@ msgstr "Luo uusi Paikka?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_fr.po b/locale/po/grasswxpy_fr.po
index a94b61a625a..ec5c85a9171 100644
--- a/locale/po/grasswxpy_fr.po
+++ b/locale/po/grasswxpy_fr.po
@@ -19513,6 +19513,7 @@ msgstr "Entrer les valeurs de catégories ou les pourcentages"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/location_wizard/wizard.py:186
 msgid "Change"
 msgstr ""
@@ -19557,6 +19558,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/colorrules.py:983
 #: ../gui/wxpython/modules/colorrules.py:1685
 #: ../gui/wxpython/modules/colorrules.py:1691
@@ -19582,6 +19585,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -19611,6 +19615,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/location_wizard/wizard.py:186
 msgid "Change"
 msgstr ""
@@ -19629,6 +19635,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19671,6 +19678,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/colorrules.py:985
 msgid "fp range"
@@ -19879,6 +19888,7 @@ msgid "Find more information at:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -19929,6 +19939,9 @@ msgid "Find more information at:"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:1531
@@ -20007,6 +20020,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20044,6 +20058,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -22842,6 +22858,7 @@ msgstr "Paramètres d'import"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22933,6 +22950,11 @@ msgstr "Paramètres d'import"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map names %(names)s exist. "
 msgstr ""
@@ -22958,6 +22980,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23049,6 +23072,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map name <%(name)s> exist. "
 msgstr ""
@@ -23156,6 +23184,7 @@ msgstr "Reprojeter les couches sélectionnées"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23247,6 +23276,11 @@ msgstr "Reprojeter les couches sélectionnées"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -23632,6 +23666,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23723,6 +23758,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -24845,6 +24885,7 @@ msgstr "ATTENTION"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -24936,6 +24977,11 @@ msgstr "ATTENTION"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -25245,6 +25291,7 @@ msgstr "opacité :"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25317,6 +25364,11 @@ msgstr "opacité :"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2347 ../gui/wxpython/lmgr/frame.py:2237
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2311 ../gui/wxpython/lmgr/frame.py:2223
 =======
 #: ../gui/wxpython/mapwin/decorations.py:203
@@ -25520,6 +25572,7 @@ msgstr "Écraser le fichier ?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25566,6 +25619,9 @@ msgstr "Écraser le fichier ?"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Do you want to remove map layer(s)\n"
@@ -25890,6 +25946,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 =======
@@ -25919,6 +25976,8 @@ msgid "Histogram Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1126
 =======
 =======
@@ -25934,6 +25993,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/lmgr/layertree.py:1126
@@ -25982,6 +26042,8 @@ msgid "Histogram Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1088
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Unable to display histogram of raster map. No map name defined."
@@ -26040,6 +26102,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
@@ -26114,6 +26177,11 @@ msgid "Histogram Tool"
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/wxplot/histogram.py:43
+msgid "Histogram Tool"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/wxplot/histogram.py:51
@@ -26219,6 +26287,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26256,6 +26325,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -27246,6 +27317,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27337,6 +27409,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/toolbars.py:203
 msgid "Start new map display"
@@ -30558,6 +30635,7 @@ msgid "Interactive editing and digitization of vector maps."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -30608,6 +30686,9 @@ msgid "Interactive editing and digitization of vector maps."
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:2023
@@ -30868,6 +30949,7 @@ msgid "Download in progress, wait until it is finished 0%"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30905,6 +30987,8 @@ msgid "Download in progress, wait until it is finished 0%"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -30968,6 +31052,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31059,6 +31144,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/pyshell.py:78
 msgid "Simple &editor"
@@ -31117,6 +31207,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31208,6 +31299,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/workspace.py:72
 msgid ""
@@ -31535,6 +31631,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31567,6 +31664,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -31584,6 +31683,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -31649,6 +31749,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Database connection for vector map <%s> is not defined in DB file. You can "
@@ -31671,6 +31773,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31712,6 +31815,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "La connexion à une base de données n'est pas définie dans le fichier DB pour "
 "la carte vecteur <%s>. Vous pouvez définir une nouvelle connexion dans "
 "l'onglet 'Gérer les couches'."
@@ -31731,6 +31836,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31800,6 +31906,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/manager.py:123
 msgid "Please wait, loading attribute data..."
@@ -31924,6 +32034,7 @@ msgstr "Contrainte pour la requête (clause WHERE)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31956,6 +32067,8 @@ msgstr "Contrainte pour la requête (clause WHERE)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257
 #: ../gui/wxpython/dbmgr/base.py:1283
 =======
@@ -31972,6 +32085,7 @@ msgstr "Contrainte pour la requête (clause WHERE)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32004,6 +32118,8 @@ msgstr "Contrainte pour la requête (clause WHERE)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248
 #: ../gui/wxpython/dbmgr/base.py:1274
 =======
@@ -32049,6 +32165,7 @@ msgstr "Appliquer l'expression SELECT et recharger les enregistrements"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32095,6 +32212,9 @@ msgstr "Appliquer l'expression SELECT et recharger les enregistrements"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Example: %s"
 msgstr "Exemple : %s"
@@ -32669,6 +32789,7 @@ msgstr "Statistiques de champs <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32741,6 +32862,11 @@ msgstr "Statistiques de champs <%s>"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/dialogs.py:80
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:79
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:133
@@ -32915,6 +33041,7 @@ msgstr "Recharger toutes les données attributaires (annule la sélection actuel
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32961,6 +33088,9 @@ msgstr "Recharger toutes les données attributaires (annule la sélection actuel
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "No attribute table found.\n"
@@ -33240,6 +33370,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33312,6 +33443,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -33598,6 +33734,7 @@ msgstr "Fichiers"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33644,6 +33781,9 @@ msgstr "Fichiers"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -34168,6 +34308,7 @@ msgstr "Invalide"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34240,6 +34381,11 @@ msgstr "Invalide"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -34265,6 +34411,7 @@ msgstr "Chaîne PROJ (requise) :"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -34356,6 +34503,11 @@ msgstr "Chaîne PROJ (requise) :"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/provider.py:562
 msgid "Overlaying map layers"
@@ -34375,6 +34527,7 @@ msgstr "Superposition des couches"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34447,6 +34600,11 @@ msgstr "Superposition des couches"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -35123,6 +35281,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35169,6 +35328,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr "Répertoire {t} non supprimé."
@@ -37222,6 +37384,7 @@ msgstr "étiquettes :"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37254,6 +37417,8 @@ msgstr "étiquettes :"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Location Name:"
 #~ msgstr "Nom du secteur : "
 
@@ -37279,6 +37444,7 @@ msgstr "étiquettes :"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37311,6 +37477,8 @@ msgstr "étiquettes :"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Show comp. extent"
 #~ msgstr "Afficher l'étendue"
 =======
@@ -37331,6 +37499,7 @@ msgid "Cartographic Composer - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -37381,6 +37550,9 @@ msgid "Cartographic Composer - GRASS GIS"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 msgid "failed to open '{0}'"
@@ -37441,6 +37613,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37478,6 +37651,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -38817,6 +38992,7 @@ msgstr "Voulez-vous définir les limites et la résolution la région par défau
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -38846,6 +39022,8 @@ msgstr "Voulez-vous définir les limites et la résolution la région par défau
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Copy map"
 msgstr "Copier la carte"
 
@@ -39479,6 +39657,7 @@ msgstr "GRASS GIS %s - Gestionnaire des couches"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39672,6 +39851,8 @@ msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid ""
 "Location <%s> created.\n"
@@ -39755,6 +39936,7 @@ msgstr "Histogramme GRASS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39959,6 +40141,8 @@ msgstr "Histogramme GRASS"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Copies available data files in the current mapset search path to the "
 #~ "user's current mapset."
@@ -40043,6 +40227,7 @@ msgstr "Cliquer pour restreindre l'édition au jeu de données courant uniquemen
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -40072,6 +40257,8 @@ msgstr "Cliquer pour restreindre l'édition au jeu de données courant uniquemen
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Copies available data files in the current mapset search path to the user's current mapset."
 msgstr "Copier les fichiers de données disponibles dans le chemin de recherche du jeu de cartes courant vers le jeu de cartes de l'utilisateur courant."
 
@@ -40125,6 +40312,7 @@ msgstr "Recherche :"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40177,6 +40365,8 @@ msgstr "Recherche :"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Type to search database by map type or name. Use prefix 'r:', 'v:' and "
 #~ "'r3:'to show only raster, vector or 3D raster data, respectively. Use "
@@ -40204,6 +40394,7 @@ msgstr "Écrire pour rechercher dans la base par type ou nom de carte. Utiliser
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -40233,6 +40424,8 @@ msgstr "Écrire pour rechercher dans la base par type ou nom de carte. Utiliser
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Type to search database by map type or name. Use prefix 'r:', 'v:' and 'r3:'to show only raster, vector or 3D raster data, respectively. Use Python regular expressions to refine your search."
 msgstr "Écrire pour rechercher dans la base par type ou nom de carte. Utiliser les préfixes 'r:', 'v:' ou 'r3:' pour ne montrer respectivement que les rasters, vecteurs ou rasters 3D. Utiliser des expressions régulières Python pouraffiner la recherche."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -40248,6 +40441,7 @@ msgstr "Écrire pour rechercher dans la base par type ou nom de carte. Utiliser
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40285,6 +40479,8 @@ msgstr "Écrire pour rechercher dans la base par type ou nom de carte. Utiliser
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid " (readonly)"
 msgstr " (lecture seule)"
@@ -40315,6 +40511,7 @@ msgstr "Redimensionner la légende"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -40336,6 +40533,8 @@ msgstr "Redimensionner la légende"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Unable to create location"
 #~ msgstr "Impossible de créer le secteur"
 =======
@@ -40352,6 +40551,7 @@ msgstr "Redimensionner la légende"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -40405,6 +40605,8 @@ msgstr "Redimensionner la légende"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII "
 #~ "characters excluding %(chars)s and space."
@@ -40430,6 +40632,7 @@ msgstr "Le nom <%(name)s> n'est pas un nom valide pour un secteur. Merci de n'ut
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -40459,6 +40662,8 @@ msgstr "Le nom <%(name)s> n'est pas un nom valide pour un secteur. Merci de n'ut
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Name <%(name)s> is not a valid name for location. Please use only ASCII characters excluding %(chars)s and space."
 msgstr "Le nom <%(name)s> n'est pas un nom valide pour un secteur. Merci de n'utiliser que des caractères ASCII à l'exclusion de %(chars)s et des espaces."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -40474,6 +40679,7 @@ msgstr "Le nom <%(name)s> n'est pas un nom valide pour un secteur. Merci de n'ut
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40757,6 +40963,28 @@ msgstr "Voulez-vous créer le secteur GRASS <%s> ?"
 msgid "Create new location?"
 msgstr "Créer un nouveau secteur ?"
 
+>>>>>>> osgeo-main
+=======
+
+msgid "Unable to create location"
+msgstr "Impossible de créer le secteur"
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+
+msgid "Select EPSG code of spatial reference system"
+msgstr "Sélectionner le code EPSG"
+
+msgid "Read projection and datum terms from a georeferenced data file"
+msgstr "Lire depuis un fichier géoréférencé"
+
+msgid "Create a generic Cartesian coordinate system (XY)"
+msgstr "Système de coordonnées cartésiennes (XY)"
+
+msgid "Do you want to create GRASS location <%s>?"
+msgstr "Voulez-vous créer le secteur GRASS <%s> ?"
+
+msgid "Create new location?"
+msgstr "Créer un nouveau secteur ?"
+
 >>>>>>> osgeo-main
 msgid "GRASS GIS SQL Query Utility"
 msgstr "Utilitaire de requêtes SQL"
@@ -40777,6 +41005,7 @@ msgstr "Utilitaire de requêtes SQL"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -40811,6 +41040,8 @@ msgstr "Utilitaire de requêtes SQL"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Do you want to quit GRASS including shell prompt or just close the GUI?"
 #~ msgstr ""
@@ -40861,6 +41092,7 @@ msgstr "Utilitaire de requêtes SQL"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40894,6 +41126,8 @@ msgstr "Utilitaire de requêtes SQL"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "supported tools only"
 msgstr "outils pris en charge uniquement"
@@ -40910,6 +41144,7 @@ msgstr "outils pris en charge uniquement"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40943,6 +41178,8 @@ msgstr "outils pris en charge uniquement"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Do you want to quit GRASS including shell prompt or just close the GUI?"
 msgstr "Voulez-vous quitter GRASS y compris le terminal ou juste fermer l'interface graphique ?"
 
@@ -40964,6 +41201,7 @@ msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -41022,6 +41260,10 @@ msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 msgid "Do you want to quit GRASS including shell prompt or just close the GUI?"
 msgstr "Voulez-vous quitter GRASS y compris le terminal ou juste fermer l'interface graphique ?"
 
@@ -41042,6 +41284,7 @@ msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -41101,3 +41344,6 @@ msgstr "Double-clic ou Ctrl+Entrée pour exécuter le module sélectionné"
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_hu.po b/locale/po/grasswxpy_hu.po
index 37e27a41864..21de3cb6c14 100644
--- a/locale/po/grasswxpy_hu.po
+++ b/locale/po/grasswxpy_hu.po
@@ -18164,6 +18164,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18255,6 +18256,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/colorrules.py:448
 msgid "Choose file to load color table"
@@ -18644,6 +18650,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18735,6 +18742,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/colorrules.py:985
 msgid "fp range"
@@ -21726,6 +21738,7 @@ msgstr "Kiválasztott rétegek átvetítése"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -21817,6 +21830,11 @@ msgstr "Kiválasztott rétegek átvetítése"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -22149,6 +22167,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22240,6 +22259,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -23303,6 +23327,7 @@ msgstr "FIGYELMEZTETÉS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23394,6 +23419,11 @@ msgstr "FIGYELMEZTETÉS"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -23483,6 +23513,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23555,6 +23586,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Workspace Toolbar"
@@ -23597,6 +23633,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23688,6 +23725,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850
 msgid "Choose model to run"
@@ -23707,6 +23749,7 @@ msgstr "Válassza ki a futtatandó modelt"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23779,6 +23822,11 @@ msgstr "Válassza ki a futtatandó modelt"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -23974,6 +24022,7 @@ msgstr "Fájl felülírása?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24020,6 +24069,9 @@ msgstr "Fájl felülírása?"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -24234,6 +24286,7 @@ msgstr "Térkép réteg eltávolítás"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24306,6 +24359,11 @@ msgstr "Térkép réteg eltávolítás"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Quit GRASS GUI"
@@ -24328,6 +24386,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -24376,6 +24435,9 @@ msgid "Histogram Tool"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/wxplot/histogram.py:51
@@ -24393,6 +24455,7 @@ msgid "Histogram of"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24439,6 +24502,8 @@ msgid "Histogram of"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -24701,6 +24766,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24773,6 +24839,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:1059
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1021
 =======
 #: ../gui/wxpython/menustrings.py:1005 ../gui/wxpython/menustrings.py:1950
@@ -25300,6 +25371,7 @@ msgstr "A letöltés folyamatban, várjon amíg befejeződik"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25346,6 +25418,9 @@ msgstr "A letöltés folyamatban, várjon amíg befejeződik"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unsupported map type <%s>"
 msgstr "Nem támogatott térkép típus <%s>"
@@ -25632,6 +25707,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25678,6 +25754,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "%s <%s> already exists in the current mapset. Do you want to overwrite it?"
@@ -26086,6 +26165,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26158,6 +26238,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351
 =======
 #: ../gui/wxpython/dbmgr/base.py:502
@@ -26175,6 +26260,7 @@ msgid "Fractal dimension of boundary defining a polygon"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26404,6 +26490,8 @@ msgid "Set SQL statement to default"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/dbmgr/base.py:505
@@ -26734,6 +26822,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26806,6 +26895,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -26832,6 +26926,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26878,6 +26973,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -27600,6 +27698,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27672,6 +27771,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -27958,6 +28062,7 @@ msgstr "Fájlok"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28004,6 +28109,9 @@ msgstr "Fájlok"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr "A tér-idő adathalmazok időbeli terjedelmének azonosnak kell lennie."
@@ -28514,6 +28622,7 @@ msgstr "Hibás"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28586,6 +28695,11 @@ msgstr "Hibás"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -28611,6 +28725,7 @@ msgstr "PROJ szöveg (kötelező):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -28702,6 +28817,11 @@ msgstr "PROJ szöveg (kötelező):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/provider.py:562
 msgid "Overlaying map layers"
@@ -28721,6 +28841,7 @@ msgstr "Térkép rétegek átfedés vizsgálata"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28793,6 +28914,11 @@ msgstr "Térkép rétegek átfedés vizsgálata"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -29461,6 +29587,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29507,6 +29634,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr "{t} könyvtárat nem távolítottam el."
@@ -31533,6 +31663,7 @@ msgstr "címkék:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/g.gui.psmap.py:51
 msgid "Cartographic Composer - GRASS GIS"
 msgstr ""
@@ -31576,6 +31707,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Abort download location"
 #~ msgstr "Hely letöltés megszakítása"
 
@@ -31602,6 +31735,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -31679,6 +31813,11 @@ msgstr ""
 <<<<<<< HEAD
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+<<<<<<< HEAD
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #~ msgid "Use defined projection"
 #~ msgstr "Felhasználó definiált vetület"
 
@@ -31710,6 +31849,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -31739,6 +31879,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/psmap/g.gui.psmap.py:51
 msgid "Cartographic Composer - GRASS GIS"
 msgstr ""
@@ -31757,6 +31899,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31799,6 +31942,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 =======
@@ -32305,6 +32450,7 @@ msgstr "Opcionális hely cím, ezt a mezőt üresen hagyhatja."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32337,6 +32483,8 @@ msgstr "Opcionális hely cím, ezt a mezőt üresen hagyhatja."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Unable to create location"
 #~ msgstr "Nem tudom létrehozni a helyet"
 =======
@@ -32353,6 +32501,7 @@ msgstr "Opcionális hely cím, ezt a mezőt üresen hagyhatja."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32385,6 +32534,8 @@ msgstr "Opcionális hely cím, ezt a mezőt üresen hagyhatja."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII "
 #~ "characters excluding %(chars)s and space."
@@ -32411,6 +32562,7 @@ msgstr "Nem tudom létrehozni a helyet"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32457,6 +32609,9 @@ msgstr "Nem tudom létrehozni a helyet"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Select EPSG code of spatial reference system"
 msgstr "Válasszon EPSG kódot a vetülethez"
@@ -32498,6 +32653,7 @@ msgstr "GRASS GIS hisztogram eszköz (d.histogram)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32527,6 +32683,8 @@ msgstr "GRASS GIS hisztogram eszköz (d.histogram)"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Failed to display layer: not in current mapset or invalid layer"
 msgstr "Nem sikerült a réteget megjeleníteni: nincs az aktuális térképcsoportban vagy hibás réteg"
 
@@ -32754,6 +32912,7 @@ msgstr "GRASS GIS hisztogram eszköz (d.histogram)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32813,3 +32972,6 @@ msgstr "GRASS GIS hisztogram eszköz (d.histogram)"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_id_ID.po b/locale/po/grasswxpy_id_ID.po
index 35909815470..c9021953b61 100644
--- a/locale/po/grasswxpy_id_ID.po
+++ b/locale/po/grasswxpy_id_ID.po
@@ -18600,6 +18600,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18672,6 +18673,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -18695,6 +18701,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18786,6 +18793,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -18806,6 +18818,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18878,6 +18891,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -19541,6 +19559,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19587,6 +19606,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
diff --git a/locale/po/grasswxpy_it.po b/locale/po/grasswxpy_it.po
index b07c7035b8f..af9c3b82083 100644
--- a/locale/po/grasswxpy_it.po
+++ b/locale/po/grasswxpy_it.po
@@ -22,6 +22,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -94,6 +95,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+"POT-Creation-Date: 2024-05-23 03:37-0600\n"
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 "PO-Revision-Date: 2024-03-28 22:45+0000\n"
@@ -117,6 +123,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -208,6 +215,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Last-Translator: luca \n"
 "Language-Team: Italian \n"
@@ -233,6 +245,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "X-Generator: Weblate 4.12.2\n"
 =======
 <<<<<<< HEAD
@@ -275,6 +288,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "X-Generator: Weblate 5.3\n"
 =======
 "X-Generator: Weblate 4.12.2\n"
@@ -293,6 +308,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "X-Generator: Weblate 4.12.2\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -376,6 +392,11 @@ msgstr ""
 "X-Generator: Weblate 4.12.2\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"X-Generator: Weblate 4.12.2\n"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/nviz/tools.py:109 ../gui/wxpython/nviz/preferences.py:65
 #: ../gui/wxpython/nviz/preferences.py:69
@@ -15991,6 +16012,7 @@ msgstr "Digitalizzatore vettoriale non disponibile"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -16082,6 +16104,11 @@ msgstr "Digitalizzatore vettoriale non disponibile"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Note that the wxGUI's vector digitizer is disabled in this installation."
 "Please keep an eye out for updated versions of GRASS. In the meantime you "
@@ -16103,6 +16130,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16175,6 +16203,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/frame.py:163
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:178
 =======
 #: ../gui/wxpython/mapdisp/toolbars.py:132 ../gui/wxpython/mapdisp/frame.py:513
@@ -16394,6 +16427,7 @@ msgstr "Visualizzatore di mappe"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16440,6 +16474,9 @@ msgstr "Visualizzatore di mappe"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to run command '%(command)s'. Details:\n"
@@ -16522,6 +16559,7 @@ msgstr "Ritorna alla modalità di visualizzazione 2D..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16554,6 +16592,8 @@ msgstr "Ritorna alla modalità di visualizzazione 2D..."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:830 ../gui/wxpython/mapdisp/frame.py:839
 #: ../gui/wxpython/mapdisp/frame.py:861
 =======
@@ -16570,6 +16610,7 @@ msgstr "Ritorna alla modalità di visualizzazione 2D..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16602,6 +16643,8 @@ msgstr "Ritorna alla modalità di visualizzazione 2D..."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:861 ../gui/wxpython/mapdisp/frame.py:870
 #: ../gui/wxpython/mapdisp/frame.py:892
 =======
@@ -16646,6 +16689,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16692,6 +16736,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Failed to run d.to.rast:\n"
 msgstr "Impossibile eseguire d.to.rast:\n"
 
@@ -16718,6 +16765,7 @@ msgstr "Vettoriale <%s> aperto per l'editing - saltato."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16790,6 +16838,11 @@ msgstr "Vettoriale <%s> aperto per l'editing - saltato."
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/frame.py:1103
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:1136
 =======
 #: ../gui/wxpython/mapdisp/frame.py:909 ../gui/wxpython/mapswipe/frame.py:663
@@ -16812,6 +16865,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16858,6 +16912,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Failed to query vector map(s) <{maps}>. Check database settings and topology."
@@ -20517,6 +20574,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20608,6 +20666,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/colorrules.py:985
 msgid "fp range"
@@ -20824,6 +20887,7 @@ msgid "Find more information at:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -20874,6 +20938,9 @@ msgid "Find more information at:"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:1531
@@ -20952,6 +21019,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20989,6 +21057,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -21107,6 +21177,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -21142,6 +21213,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Number of loaded records reached %d, displaying all the records will be time-"
 "consuming and may lead to computer freezing, do you still want to continue?"
 =======
@@ -21161,6 +21234,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21212,6 +21286,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Insufficient points defined and active (checked) for selected rectification "
 "method (order: %d).\n"
 "3+ points needed for 1st order,\n"
@@ -24346,6 +24422,7 @@ msgstr "Impostazione dell'import"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -24437,6 +24514,11 @@ msgstr "Impostazione dell'import"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map names %(names)s exist. "
 msgstr ""
@@ -24462,6 +24544,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -24553,6 +24636,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map name <%(name)s> exist. "
 msgstr ""
@@ -24633,6 +24721,7 @@ msgstr "Nome per la mappa GRASS di output"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24711,6 +24800,11 @@ msgstr "Nome per la mappa GRASS di output"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/modules/import_export.py:978
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:962
 =======
 #: ../gui/wxpython/modules/import_export.py:940
@@ -24727,6 +24821,7 @@ msgstr "Nome per la mappa GRASS di output"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -24746,6 +24841,8 @@ msgstr "Nome per la mappa GRASS di output"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -24757,6 +24854,7 @@ msgstr "Nome per la mappa GRASS di output"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -24836,6 +24934,8 @@ msgstr "Nome per la mappa GRASS di output"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Projection of following layers do not match with projection of current "
 "location. "
@@ -24876,6 +24976,7 @@ msgstr "Riproietta i layers selezionati"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -24967,6 +25068,11 @@ msgstr "Riproietta i layers selezionati"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -25372,6 +25478,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -25463,6 +25570,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -26577,6 +26689,7 @@ msgstr "ATTENZIONE"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26668,6 +26781,11 @@ msgstr "ATTENZIONE"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -26746,6 +26864,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26818,6 +26937,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483
 =======
 #: ../gui/wxpython/mapwin/base.py:319
@@ -26907,6 +27031,7 @@ msgstr "Unità non riconosciute, misurazione fallita."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26953,6 +27078,9 @@ msgstr "Unità non riconosciute, misurazione fallita."
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Map Display {number}"
 msgstr ""
@@ -26977,6 +27105,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27049,6 +27178,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:588 ../gui/wxpython/lmgr/frame.py:181
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:591 ../gui/wxpython/lmgr/frame.py:180
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Workspace Toolbar"
@@ -27091,6 +27225,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27182,6 +27317,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850
 msgid "Choose model to run"
@@ -27201,6 +27341,7 @@ msgstr "Scegli il modello da eseguire"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27273,6 +27414,11 @@ msgstr "Scegli il modello da eseguire"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -27469,6 +27615,7 @@ msgstr "Sovrascrivere il file?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27515,6 +27662,9 @@ msgstr "Sovrascrivere il file?"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -27577,6 +27727,7 @@ msgstr "Impossibile impostare i permessi. Operazione cancellata."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27649,6 +27800,11 @@ msgstr "Impossibile impostare i permessi. Operazione cancellata."
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1430 ../gui/wxpython/lmgr/frame.py:1279
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1394 ../gui/wxpython/lmgr/frame.py:1270
 =======
 #: ../gui/wxpython/wxplot/histogram.py:43
@@ -27755,6 +27911,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27801,6 +27958,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Directory '%s' is not defined in GRASS_ADDON_PATH. Do you want add this "
@@ -27841,6 +28001,7 @@ msgstr "Nessun mapset fornito. Operazione cancellata"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27913,6 +28074,11 @@ msgstr "Nessun mapset fornito. Operazione cancellata"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1532 ../gui/wxpython/lmgr/frame.py:1381
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1496 ../gui/wxpython/lmgr/frame.py:1372
 =======
 #: ../gui/wxpython/wxplot/dialogs.py:1019
@@ -28126,6 +28292,7 @@ msgstr "Sotto gruppo <%s> non trovato nel gruppo <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28172,6 +28339,9 @@ msgstr "Sotto gruppo <%s> non trovato nel gruppo <%s>"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Working directory changed to:\n"
@@ -28293,6 +28463,7 @@ msgstr "Più di un parametro fornito."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28365,6 +28536,11 @@ msgstr "Più di un parametro fornito."
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1588 ../gui/wxpython/lmgr/frame.py:1437
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1552 ../gui/wxpython/lmgr/frame.py:1428
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Choose a working directory"
@@ -28390,6 +28566,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -28481,6 +28658,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:1637 ../gui/wxpython/lmgr/frame.py:1486
 msgid "System Info"
@@ -28520,6 +28702,7 @@ msgstr "Piattaforma"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28592,6 +28775,11 @@ msgstr "Piattaforma"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1731 ../gui/wxpython/lmgr/frame.py:1580
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1695 ../gui/wxpython/lmgr/frame.py:1571
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Close all Map Displays"
@@ -28869,6 +29057,7 @@ msgstr "Inserisci nuovo nome:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28941,6 +29130,11 @@ msgstr "Inserisci nuovo nome:"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1750 ../gui/wxpython/lmgr/frame.py:1599
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1714 ../gui/wxpython/lmgr/frame.py:1590
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rename Map Display"
@@ -28968,6 +29162,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29059,6 +29254,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:1843 ../gui/wxpython/lmgr/frame.py:1693
 #, python-format
@@ -29089,6 +29289,7 @@ msgstr "Impossibile avviare lo strumento Timeline."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29161,6 +29362,11 @@ msgstr "Impossibile avviare lo strumento Timeline."
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1899 ../gui/wxpython/lmgr/frame.py:1749
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1863 ../gui/wxpython/lmgr/frame.py:1740
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Unable to start Temporal Plot Tool."
@@ -29190,6 +29396,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29281,6 +29488,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:2067 ../gui/wxpython/lmgr/frame.py:1919
 msgid "Add selected map layers into layer tree"
@@ -29340,6 +29552,7 @@ msgstr "Esci dalla GUI di GRASS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29412,6 +29625,11 @@ msgstr "Esci dalla GUI di GRASS"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid ""
@@ -29607,6 +29825,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29698,6 +29917,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/photo2image/g.gui.photo2image.py:109
 msgid "Please provide a camera name (generated by i.ortho.camera)"
@@ -29915,6 +30139,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30006,6 +30231,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/photo2image/g.gui.photo2image.py:121
@@ -30216,6 +30446,7 @@ msgstr "Incomincia l'editing"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30288,6 +30519,11 @@ msgstr "Incomincia l'editing"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:704
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:677
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Stop editing"
@@ -30314,6 +30550,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30405,6 +30642,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/layertree.py:727
 msgid "Rebuild topology"
@@ -30440,6 +30682,7 @@ msgstr "Impossibile creare profilo del raster"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30512,6 +30755,11 @@ msgstr "Impossibile creare profilo del raster"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:1059
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1021
 =======
 #: ../gui/wxpython/menustrings.py:153 ../gui/wxpython/menustrings.py:1175
@@ -34756,6 +35004,7 @@ msgstr "Scaricamento in progresso, aspettare fino che non è finito"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34802,6 +35051,9 @@ msgstr "Scaricamento in progresso, aspettare fino che non è finito"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unsupported map type <%s>"
 msgstr "Tipologia della mappa <%s> non supportata"
@@ -34825,6 +35077,7 @@ msgstr "Inserisci il nome per il nuovo %s nell'attuale mapset:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34897,6 +35150,11 @@ msgstr "Inserisci il nome per il nuovo %s nell'attuale mapset:"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:1067
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1029
 =======
 #: ../gui/wxpython/startup/locdownload.py:478
@@ -34922,6 +35180,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34968,6 +35227,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Make a copy of %s <%s>"
 msgstr "Copiare %s <%s>"
@@ -34986,6 +35248,7 @@ msgstr "Copiare %s <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35058,6 +35321,11 @@ msgstr "Copiare %s <%s>"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:1085
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1047
 =======
 #: ../gui/wxpython/startup/locdownload.py:563
@@ -35325,6 +35593,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35371,6 +35640,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "%s <%s> already exists in the current mapset. Do you want to overwrite it?"
@@ -35395,6 +35667,7 @@ msgstr "%s <%s> esiste già nel corrente mapset. Si vuole sovrascriverlo?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -35436,6 +35709,8 @@ msgstr "%s <%s> esiste già nel corrente mapset. Si vuole sovrascriverlo?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Unable to make copy of <%s>"
 msgstr "Impossibile copiare <%s>"
 
@@ -35684,6 +35959,7 @@ msgstr "Vettoriale <%s> aggiunto"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -35753,6 +36029,10 @@ msgstr "Vettoriale <%s> aggiunto"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Data file <%(name)s> imported successfully. The location's default region "
 "was set from this imported map."
@@ -35776,6 +36056,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -35826,6 +36107,9 @@ msgstr ""
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Current GRASS database is <%(dbase)s>.\n"
@@ -35847,6 +36131,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35884,6 +36169,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 msgid ""
@@ -36014,6 +36301,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36064,6 +36352,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/dbmgr/base.py:299
@@ -36245,6 +36535,7 @@ msgstr "GRASS SQL Builder (%(type)s) - <%(map)s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36317,6 +36608,11 @@ msgstr "GRASS SQL Builder (%(type)s) - <%(map)s>"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/sqlbuilder.py:486
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:484
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Column to show (SELECT clause)"
@@ -36344,6 +36640,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -36435,6 +36732,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:487
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:644
@@ -36455,6 +36757,7 @@ msgstr "Vincolo per l'interrogazione (clausola WHERE)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36487,6 +36790,8 @@ msgstr "Vincolo per l'interrogazione (clausola WHERE)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257
 #: ../gui/wxpython/dbmgr/base.py:1283
 =======
@@ -36503,6 +36808,7 @@ msgstr "Vincolo per l'interrogazione (clausola WHERE)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36535,6 +36841,8 @@ msgstr "Vincolo per l'interrogazione (clausola WHERE)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248
 #: ../gui/wxpython/dbmgr/base.py:1274
 =======
@@ -36580,6 +36888,7 @@ msgstr "Applica l'istruzione SELECT e ricarica i record dei dati"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36626,6 +36935,9 @@ msgstr "Applica l'istruzione SELECT e ricarica i record dei dati"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Example: %s"
 msgstr "Esempio: %s"
@@ -37195,6 +37507,7 @@ msgstr "Statistiche del campo <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37267,6 +37580,11 @@ msgstr "Statistiche del campo <%s>"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/dialogs.py:80
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:79
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:133
@@ -37445,6 +37763,7 @@ msgstr "Ricarica tutti gli attributi (elimina la selezione corrente)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37491,6 +37810,9 @@ msgstr "Ricarica tutti gli attributi (elimina la selezione corrente)"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "No attribute table found.\n"
@@ -37677,6 +37999,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37713,6 +38036,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Informazioni sulla vista 3d non disponibili  nel file di ambiente di lavoro "
 "<%s>."
 =======
@@ -37729,6 +38054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37761,6 +38087,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Informazioni sulla vista 3d non disponibili  nel file di ambiente di lavoro <"
 "%s>."
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -37804,6 +38132,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -37873,6 +38202,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Il server definito dall'utente ha lo stesso nome del server di default <"
 "%s> .\n"
 "Viene mantenuto il server definito dall'utente."
@@ -37936,6 +38269,7 @@ msgstr "File %s non trovato."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38008,6 +38342,11 @@ msgstr "File %s non trovato."
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/data.py:146
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/data.py:145
 =======
 #: ../gui/wxpython/web_services/dialogs.py:536
@@ -38102,6 +38441,7 @@ msgstr "La mappa di output può essere aggiunta solo al mapset corrente."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38148,6 +38488,9 @@ msgstr "La mappa di output può essere aggiunta solo al mapset corrente."
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Animation %d"
 msgstr "Animazione %d"
@@ -38186,6 +38529,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38258,6 +38602,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -38550,6 +38899,7 @@ msgstr "File"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38596,6 +38946,9 @@ msgstr "File"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -39249,6 +39602,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -39340,6 +39694,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 "Il file dell'animazione esportato <{file}> esiste. Si vuole sovrascriverlo?"
 
@@ -39899,6 +40258,7 @@ msgstr "Invalido"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39971,6 +40331,11 @@ msgstr "Invalido"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -39996,6 +40361,7 @@ msgstr "Stringa PROJ (richiesto):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -40087,6 +40453,11 @@ msgstr "Stringa PROJ (richiesto):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/provider.py:562
 msgid "Overlaying map layers"
@@ -40106,6 +40477,7 @@ msgstr "Sovrapposizione dei tematismi della mappa"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40178,6 +40550,11 @@ msgstr "Sovrapposizione dei tematismi della mappa"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -40888,6 +41265,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40934,6 +41312,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr "Directory {t} non rimossa."
@@ -42887,6 +43268,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -42978,6 +43360,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Not all characters are supported by ISO-8859-1 (Latin 1) encoding which is "
 "required by module ps.map."
@@ -43071,6 +43458,7 @@ msgstr "Anteprima non disponibile"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -43149,6 +43537,11 @@ msgstr "Anteprima non disponibile"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/psmap/frame.py:509
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:508
 =======
 #: ../gui/wxpython/psmap/frame.py:462
@@ -43165,6 +43558,7 @@ msgstr "Anteprima non disponibile"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -43184,6 +43578,8 @@ msgstr "Anteprima non disponibile"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -43195,6 +43591,7 @@ msgstr "Anteprima non disponibile"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -43274,6 +43671,8 @@ msgstr "Anteprima non disponibile"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Preview is not available probably because Ghostscript is not installed or "
 "not on PATH."
@@ -43362,6 +43761,7 @@ msgstr "etichette:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -43394,6 +43794,8 @@ msgstr "etichette:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "&Delete location"
 #~ msgstr "&Elimina location"
 
@@ -43424,6 +43826,7 @@ msgstr "etichette:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -43456,6 +43859,8 @@ msgstr "etichette:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Show comp. extent"
 #~ msgstr "Mostra regione computazionale"
 =======
@@ -43479,6 +43884,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -43570,6 +43976,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Display mode"
 #~ msgstr "Modalità di visualizzazione"
@@ -43600,6 +44011,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -43635,6 +44047,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "MASK"
 #~ msgstr "MASK"
 =======
@@ -43654,6 +44068,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -43705,6 +44120,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Do you really want to delete map <{m}> of type <{etype}> from mapset "
 "<{mapset}> in location <{loc}>?"
@@ -43728,6 +44145,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -43819,6 +44237,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Extent"
 #~ msgstr "Estensione"
@@ -43870,6 +44293,7 @@ msgstr "Layer da eliminare"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 <<<<<<< HEAD
@@ -43899,6 +44323,8 @@ msgstr "Layer da eliminare"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Download sample location"
 #~ msgstr "Scarica location di esempio"
 =======
@@ -43915,6 +44341,7 @@ msgstr "Layer da eliminare"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -43955,6 +44382,8 @@ msgstr "Layer da eliminare"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Map <{layer}> marked for copying. You can paste it to the current mapset "
 "<{mapset}>."
@@ -43974,6 +44403,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 msgid "Copy map"
 msgstr "Copia mappa"
@@ -44174,6 +44604,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #, fuzzy, python-format
 #~ msgid "Unable to rename location: %s"
@@ -44198,6 +44633,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -44232,6 +44668,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy, python-format
 #~ msgid "Unable to delete location: %s"
 #~ msgstr "Impossibile eliminare la location"
@@ -44250,6 +44688,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -44312,6 +44751,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Map <{map}> already exists in the current mapset. Do you want to overwrite "
 "it?"
@@ -44611,6 +45054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -44639,6 +45083,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Interrogazione del vettoriale <{map}> fallita. Controllare le impostazioni "
 "del database e la topologia."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -44658,6 +45104,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -44752,6 +45199,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Add text layer"
 msgstr "Aggiungi livello testo"
@@ -44818,6 +45267,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -44864,6 +45314,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #~ msgid "Command prompt"
 #~ msgstr "Prompt dei comandi"
@@ -45245,6 +45697,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -45336,6 +45789,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Invalid input data"
 #~ msgstr "Dati di input invalido"
@@ -45384,6 +45842,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -45475,6 +45934,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Univariate raster3D dataset statistics"
 #~ msgstr "Statistiche univariate del dataset raster 3D"
@@ -45510,6 +45974,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -45601,6 +46066,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #~ msgid "Unable to render overlay <%s>."
 #~ msgstr "Impossibile visualizzare <%s> sovrapposto"
@@ -45620,6 +46090,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -45991,6 +46462,8 @@ msgstr "Doppio click o Ctrl-Enter per eseguire il modulo selezionato"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Unpacks a raster map packed with r.pack."
 #~ msgstr "Estrai un raster compresso con r.pack"
 
@@ -46387,6 +46860,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -46416,6 +46890,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "GRASS GIS Raster Map Calculator"
 msgstr "GRASS GIS Calcolatore per Raster Map Algebra"
 
@@ -46677,6 +47153,7 @@ msgstr "GRASS GIS Strumento Istogramma (d.histogram)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -46873,6 +47350,8 @@ msgstr "GRASS GIS Strumento Istogramma (d.histogram)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Generates a raster map containing distances to nearest raster features."
 #~ msgstr "Genera un raster della distanza dagli elementi del layer di input."
@@ -46966,6 +47445,7 @@ msgstr "Ridimensiona legenda"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -46998,6 +47478,8 @@ msgstr "Ridimensiona legenda"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Unable to create location"
 #~ msgstr "Impossibile creare la location"
 =======
@@ -47014,6 +47496,7 @@ msgstr "Ridimensiona legenda"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -47046,6 +47529,8 @@ msgstr "Ridimensiona legenda"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII "
 #~ "characters excluding %(chars)s and space."
@@ -47076,6 +47561,7 @@ msgstr "Impossibile creare la location"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -47122,6 +47608,9 @@ msgstr "Impossibile creare la location"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Select EPSG code of spatial reference system"
 msgstr "Seleziona il codice EPSG del sistema di coordinate"
@@ -47186,6 +47675,7 @@ msgstr "Doppio click o Ctrl-Enter per eseguire il modulo selezionato"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -47215,6 +47705,8 @@ msgstr "Doppio click o Ctrl-Enter per eseguire il modulo selezionato"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Generates a raster map containing distances to nearest raster features."
 msgstr "Genera un raster della distanza dagli elementi del layer di input."
 
@@ -47317,6 +47809,7 @@ msgstr "Doppio click o Ctrl-Enter per eseguire il modulo selezionato"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -47359,3 +47852,5 @@ msgstr "Doppio click o Ctrl-Enter per eseguire il modulo selezionato"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_ja.po b/locale/po/grasswxpy_ja.po
index 50ccc27f5ca..8432c9ba6ba 100644
--- a/locale/po/grasswxpy_ja.po
+++ b/locale/po/grasswxpy_ja.po
@@ -18227,6 +18227,7 @@ msgstr "ラスターカテゴリー値またはパーセントの入力 "
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18261,6 +18262,8 @@ msgstr "ラスターカテゴリー値またはパーセントの入力 "
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/colorrules.py:983
 #: ../gui/wxpython/modules/colorrules.py:1685
 #: ../gui/wxpython/modules/colorrules.py:1691
@@ -18284,6 +18287,7 @@ msgid "Change"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18313,6 +18317,8 @@ msgid "Change"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/gmodeler/frame.py:450 ../gui/wxpython/gmodeler/frame.py:600
 msgid "Create new model?"
 msgstr "新しいモデルを作成しますか?"
@@ -18630,6 +18636,7 @@ msgid "This option is required"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18667,6 +18674,8 @@ msgid "This option is required"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -22040,6 +22049,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22131,6 +22141,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -23146,6 +23161,7 @@ msgstr "警告"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23237,6 +23253,11 @@ msgstr "警告"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -23343,6 +23364,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23421,6 +23443,11 @@ msgid "Text properties"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -23444,6 +23471,7 @@ msgid "Text properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -23490,6 +23518,9 @@ msgid "Text properties"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:226
@@ -23507,6 +23538,7 @@ msgid "Remove scale bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23553,6 +23585,8 @@ msgid "Remove scale bar"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -23574,6 +23608,7 @@ msgstr "実行するモデルの選択"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23646,6 +23681,11 @@ msgstr "実行するモデルの選択"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -23841,6 +23881,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23887,6 +23928,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -24124,6 +24168,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 =======
@@ -24167,6 +24212,8 @@ msgid "Histogram Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/photo2image/g.gui.photo2image.py:109
 msgid "Please provide a camera name (generated by i.ortho.camera)"
 msgstr ""
@@ -24479,6 +24526,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
@@ -24553,6 +24601,11 @@ msgid "Histogram Tool"
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/wxplot/histogram.py:43
+msgid "Histogram Tool"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/wxplot/histogram.py:51
@@ -24925,6 +24978,7 @@ msgid "Training"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24962,6 +25016,8 @@ msgid "Training"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -28614,6 +28670,7 @@ msgid "Interactive editing and digitization of vector maps."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -28664,6 +28721,9 @@ msgid "Interactive editing and digitization of vector maps."
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:2023
@@ -28729,6 +28789,7 @@ msgid "Add action (GRASS command) to model"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28766,6 +28827,8 @@ msgid "Add action (GRASS command) to model"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -28879,6 +28942,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -28908,6 +28972,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/menustrings.py:2093
 msgid "Map legend"
 msgstr "マップの凡例"
@@ -29046,6 +29112,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29083,6 +29150,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/locdownload.py:563
 msgid "Location Download"
 msgstr ""
@@ -29441,6 +29510,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29513,6 +29583,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/frame.py:141
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/frame.py:140
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "There were some issues when loading menu or Tools tab:"
@@ -29554,6 +29629,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29586,6 +29662,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -29603,6 +29681,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -29668,6 +29747,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Database connection for vector map <%s> is not defined in DB file. You can "
@@ -29690,6 +29771,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -29731,6 +29813,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "ベクトルマップ <%s> はDB接続の定義がされていません 接続の設定は レイヤー管"
 "理' タブで行ってください"
 =======
@@ -29749,6 +29833,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -29818,6 +29903,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/manager.py:123
 msgid "Please wait, loading attribute data..."
@@ -30488,6 +30577,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30560,6 +30650,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/dialogs.py:80
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:79
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:133
@@ -30734,6 +30829,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30780,6 +30876,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "No attribute table found.\n"
@@ -31042,6 +31141,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31114,6 +31214,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -31400,6 +31505,7 @@ msgstr "ファイル"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31446,6 +31552,9 @@ msgstr "ファイル"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -31971,6 +32080,7 @@ msgid "Lat/long projections"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32347,6 +32457,8 @@ msgid "Example"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/preferences.py:1830
@@ -32710,6 +32822,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32782,6 +32895,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:562
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:559
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Overlaying map layers"
@@ -32801,6 +32919,7 @@ msgid "&Clear"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33122,6 +33241,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/wrap.py:223
@@ -35432,6 +35553,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35464,6 +35586,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Location Name:"
 #~ msgstr "ロケーション名："
 
@@ -35489,6 +35613,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35521,6 +35646,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Show comp. extent"
 #~ msgstr "編集範囲表示"
 =======
@@ -35541,6 +35668,7 @@ msgid "Cartographic Composer - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -35591,6 +35719,9 @@ msgid "Cartographic Composer - GRASS GIS"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 msgid "Do you really want to delete map <{m}> of type <{etype}> from mapset <{mapset}> in location <{loc}>?"
@@ -35721,6 +35852,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35758,6 +35890,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -36562,6 +36696,7 @@ msgstr "GRASS ロケーションを作成しますか <%s>?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36621,6 +36756,10 @@ msgstr "GRASS ロケーションを作成しますか <%s>?"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #~ msgid "Create new location?"
 #~ msgstr "新しいロケーションを作成しますか？"
 
@@ -36652,6 +36791,7 @@ msgstr "新しいロケーションを作成しますか？"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -36681,6 +36821,8 @@ msgstr "新しいロケーションを作成しますか？"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Show/hide scale bar"
 msgstr "スケールと方位 表示/非表示"
 
@@ -37089,6 +37231,7 @@ msgstr "新しいロケーションを作成しますか？"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37148,3 +37291,6 @@ msgstr "新しいロケーションを作成しますか？"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_ko.po b/locale/po/grasswxpy_ko.po
index 58a31c89de8..4b5d84ae9ac 100644
--- a/locale/po/grasswxpy_ko.po
+++ b/locale/po/grasswxpy_ko.po
@@ -2392,6 +2392,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2440,6 +2441,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Create new mapset in current project"
 =======
 =======
@@ -2459,6 +2462,7 @@ msgid "Create new mapset in current project"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2538,6 +2542,11 @@ msgid "Create new mapset in current project"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Create new mapset in current location"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgstr ""
@@ -2567,6 +2576,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/datacatalog/toolbars.py:49
 msgid "Import raster data  [r.import]"
 msgstr ""
@@ -2597,6 +2607,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:46
 =======
 =======
@@ -2612,6 +2624,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/datacatalog/toolbars.py:46
@@ -2660,6 +2673,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:45
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Import raster data  [r.import]"
@@ -2691,6 +2706,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2720,6 +2736,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/datacatalog/toolbars.py:49
 msgid "Import raster data  [r.import]"
 msgstr ""
@@ -2738,6 +2756,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2780,6 +2799,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/datacatalog/toolbars.py:52
 msgid "Import vector data  [v.import]"
@@ -2803,6 +2824,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2835,6 +2857,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -2852,6 +2876,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -2917,6 +2942,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Select another import option"
 msgstr ""
 
@@ -2982,6 +3009,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3054,6 +3082,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031
 =======
 #: ../gui/wxpython/datacatalog/tree.py:104
@@ -3420,6 +3453,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3452,6 +3486,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -3469,6 +3505,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -3534,6 +3571,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -15950,6 +15989,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16022,6 +16062,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/statusbar.py:518
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/statusbar.py:516
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -19184,6 +19229,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19256,6 +19302,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/frame.py:163
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:178
 =======
 #: ../gui/wxpython/tplot/frame.py:848
@@ -19648,6 +19699,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19694,6 +19746,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to run command '%(command)s'. Details:\n"
@@ -19781,6 +19836,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19853,6 +19909,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/frame.py:1103
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:1136
 =======
 #: ../gui/wxpython/nviz/tools.py:2799
@@ -20912,6 +20973,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20958,6 +21020,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Failed to query vector map(s) <{maps}>. Check database settings and topology."
@@ -22092,6 +22157,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -22126,6 +22192,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:50
 msgid "Multiple import"
 =======
@@ -22146,6 +22214,7 @@ msgid "3D Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22198,6 +22267,9 @@ msgid "3D Raster Map Calculator"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/import_export.py:69
@@ -23521,6 +23593,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23612,6 +23685,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -23725,6 +23803,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23797,6 +23876,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/buffered.py:267
@@ -23963,6 +24047,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24009,6 +24094,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -24233,6 +24321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24311,6 +24400,11 @@ msgid "Histogram Tool"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Constrain map to region geometry?"
@@ -24636,6 +24730,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -24684,6 +24779,9 @@ msgid "Histogram Tool"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/wxplot/histogram.py:51
@@ -24805,6 +24903,7 @@ msgid "Select pairs of raster maps for bivariate scatterplots:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24842,6 +24941,8 @@ msgid "Select pairs of raster maps for bivariate scatterplots:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -24926,6 +25027,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -24967,6 +25069,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/toolbars.py:128
 #, fuzzy
 msgid "Add multiple map layers"
@@ -24991,6 +25095,7 @@ msgstr "다양한 중첩 추가"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -25060,6 +25165,10 @@ msgstr "다양한 중첩 추가"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iclass/frame.py:76
 msgid "Supervised Classification Tool"
 msgstr ""
@@ -25224,6 +25333,7 @@ msgid "Supervised Classification Tool - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -25274,6 +25384,9 @@ msgid "Supervised Classification Tool - GRASS GIS"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/iclass/g.gui.iclass.py:121
@@ -25824,6 +25937,7 @@ msgid "Converts a vector map to VTK ASCII output."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25861,6 +25975,8 @@ msgid "Converts a vector map to VTK ASCII output."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -25967,6 +26083,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26058,6 +26175,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/toolbars.py:158
 msgid "Add web service map"
@@ -26568,6 +26690,7 @@ msgid "Neighborhood analysis tool for vector point maps. Makes each cell value a
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -26618,6 +26741,9 @@ msgid "Neighborhood analysis tool for vector point maps. Makes each cell value a
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1291
@@ -29255,6 +29381,7 @@ msgid "Plot temporal values."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29292,6 +29419,8 @@ msgid "Plot temporal values."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -29326,6 +29455,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29378,6 +29508,8 @@ msgid "Launch Data Catalog."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/toolbars.py:222
 #, fuzzy
 msgid "New display"
@@ -29400,6 +29532,7 @@ msgid "Launch Data Catalog."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -29448,6 +29581,9 @@ msgid "Launch Data Catalog."
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:2007
@@ -29525,6 +29661,7 @@ msgid "Add data"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29562,6 +29699,8 @@ msgid "Add data"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -29637,6 +29776,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29728,6 +29868,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/pyshell.py:78
 msgid "Simple &editor"
@@ -30262,6 +30407,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30334,6 +30480,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -30360,6 +30511,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30406,6 +30558,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -31132,6 +31287,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31204,6 +31360,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -31490,6 +31651,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31536,6 +31698,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -32041,6 +32206,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32399,6 +32565,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gui_core/preferences.py:1739
 msgid "PROJ string (required):"
@@ -32743,6 +32911,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32815,6 +32984,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:562
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:559
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Overlaying map layers"
@@ -32836,6 +33010,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33194,6 +33369,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gui_core/dialogs.py:2111
 msgid "Symbol name:"
@@ -34599,6 +34776,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/g.gui.psmap.py:51
 msgid "Cartographic Composer - GRASS GIS"
 msgstr ""
@@ -34643,6 +34821,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "MASK"
 #~ msgstr "마스크"
 
@@ -34668,6 +34848,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -34697,6 +34878,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/psmap/g.gui.psmap.py:51
 msgid "Cartographic Composer - GRASS GIS"
 msgstr ""
@@ -34715,6 +34898,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34761,6 +34945,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #, fuzzy, python-format
 #~ msgid "Unable to rename location: %s"
@@ -34785,6 +34971,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34926,6 +35113,8 @@ msgstr "셸 프롬프트와 함께 GRASS를 종료할까요? 아니면 GUI만 
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 #~ msgid "Invalid map size %d,%d\n"
 #~ msgstr "무효한 지도 크기 %d,%d\n"
@@ -35105,6 +35294,7 @@ msgstr "GRASS GIS 주상도 도구 (d.histogram)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35169,6 +35359,10 @@ msgstr "GRASS GIS 주상도 도구 (d.histogram)"
 >>>>>>> osgeo-main
 =======
 
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 #~ msgid ""
@@ -35251,6 +35445,7 @@ msgstr "셸 프롬프트와 함께 GRASS를 종료할까요? 아니면 GUI만 
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -35280,6 +35475,8 @@ msgstr "셸 프롬프트와 함께 GRASS를 종료할까요? 아니면 GUI만 
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "GRASS GIS Raster Map Calculator"
 msgstr "GRASS GIS 래스터 지도 계산기"
 
@@ -35399,6 +35596,7 @@ msgstr "셸 프롬프트와 함께 GRASS를 종료할까요? 아니면 GUI만 
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35441,3 +35639,5 @@ msgstr "셸 프롬프트와 함께 GRASS를 종료할까요? 아니면 GUI만 
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_ml.po b/locale/po/grasswxpy_ml.po
index 1afd7a0a420..5e0e580a74d 100644
--- a/locale/po/grasswxpy_ml.po
+++ b/locale/po/grasswxpy_ml.po
@@ -2385,6 +2385,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2433,6 +2434,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 msgid "Create new mapset in current project"
 msgstr "പുതിയ മാപ്പ്സെറ്റ് ഉണ്ടാക്കുക"
@@ -2457,6 +2460,7 @@ msgid "Create new project (location) in current GRASS database"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2536,6 +2540,11 @@ msgid "Create new project (location) in current GRASS database"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Create new mapset in current location"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgstr ""
@@ -2572,6 +2581,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/datacatalog/toolbars.py:49
 msgid "Import raster data  [r.import]"
 msgstr ""
@@ -2619,6 +2629,8 @@ msgid "Import vector data  [v.import]"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:45
 msgid "Import raster data  [r.import]"
 msgstr ""
@@ -2646,6 +2658,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/datacatalog/toolbars.py:49
 msgid "Import raster data  [r.import]"
@@ -2683,6 +2696,8 @@ msgid "Import raster data  [r.import]"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -2700,6 +2715,7 @@ msgid "Import raster data  [r.import]"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2732,6 +2748,8 @@ msgid "Import raster data  [r.import]"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/toolbars.py:52
@@ -2749,6 +2767,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2805,6 +2824,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Import vector data  [v.import]"
 msgstr ""
 
@@ -2826,6 +2848,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2858,6 +2881,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:62
 #: ../gui/wxpython/history/browser.py:389 ../gui/wxpython/gui_core/menu.py:204
 =======
@@ -2874,6 +2899,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2906,6 +2932,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:61
 #: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -2929,6 +2957,7 @@ msgid "Search"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2967,6 +2996,8 @@ msgid "Type to search database by map type or name. Use Python regular expressio
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/toolbars.py:91
@@ -3030,6 +3061,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3102,6 +3134,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031
 =======
 #: ../gui/wxpython/datacatalog/tree.py:104
@@ -3465,6 +3502,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3511,6 +3549,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -3698,6 +3739,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3770,6 +3812,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/history/tree.py:191
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/tree.py:120
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -6130,6 +6177,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6202,6 +6250,11 @@ msgid ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+"Unable to create new project. Project <%(loc)s> not created.\n"
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 "Unable to create new location. Location <%(loc)s> not created.\n"
 =======
 "v.build failed:\n"
@@ -6359,6 +6412,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6405,6 +6459,9 @@ msgid ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "\n"
 "Details: %(err)s"
 msgstr ""
@@ -18477,6 +18534,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18549,6 +18607,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/core/render.py:1112
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1111
 =======
 #: ../gui/wxpython/lmgr/frame.py:1902
@@ -18583,6 +18646,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18629,6 +18693,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to zoom to raster map <%s>."
 msgstr ""
@@ -19278,6 +19345,7 @@ msgid "3D Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -19369,6 +19437,11 @@ msgid "3D Raster Map Calculator"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/import_export.py:69
@@ -20629,6 +20702,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20720,6 +20794,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -21359,6 +21438,7 @@ msgstr "എപ്പെളത്തെ വർക്സ്പേസ് ശേഖ
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21398,6 +21478,8 @@ msgid "Invalid mapset name"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/toolbars.py:58
 #, fuzzy
 msgid "New workspace"
@@ -21420,6 +21502,7 @@ msgid "Invalid mapset name"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -21495,6 +21578,10 @@ msgstr ""
 =======
 msgstr ""
 >>>>>>> osgeo-main
+=======
+=======
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:106
 msgid "Invalid location name"
@@ -21660,6 +21747,7 @@ msgid "Type %s to add raster or vector to the layer tree."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21689,6 +21777,8 @@ msgid "Type %s to add raster or vector to the layer tree."
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/guiutils.py:131
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:469
 #, python-format
@@ -21712,6 +21802,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21749,6 +21840,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:186
 msgid "Unable to create new mapset: {}"
 msgstr ""
@@ -22106,6 +22199,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22150,6 +22244,8 @@ msgid "Attribute table <%s> not found. For creating the table switch to 'Manage
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/startup/guiutils.py:743
@@ -22343,6 +22439,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22415,6 +22512,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -22441,6 +22543,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22487,6 +22590,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -23600,6 +23706,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23672,6 +23779,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -23695,6 +23807,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23786,6 +23899,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -23806,6 +23924,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23878,6 +23997,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -24541,6 +24665,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24587,6 +24712,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
diff --git a/locale/po/grasswxpy_pl.po b/locale/po/grasswxpy_pl.po
index 3f36f7732fb..4a471b19624 100644
--- a/locale/po/grasswxpy_pl.po
+++ b/locale/po/grasswxpy_pl.po
@@ -1768,7 +1768,10 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
 =======
@@ -1804,6 +1807,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -1854,6 +1858,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iclass/frame.py:1169
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -1876,6 +1882,7 @@ msgid "Data Catalog - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1928,6 +1935,9 @@ msgid "Data Catalog - GRASS GIS"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/iclass/frame.py:1175
@@ -2575,6 +2585,7 @@ msgstr "Przeładuj tylko bieżący Mapset GRASS-a"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/datacatalog/toolbars.py:31
 msgid "Restrict edits to the current mapset only"
 msgstr ""
@@ -2622,6 +2633,8 @@ msgid "Allow edits outside of the current mapset"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:26
 msgid "Restrict edits to the current mapset only"
 msgstr ""
@@ -2648,6 +2661,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/datacatalog/toolbars.py:31
 msgid "Restrict edits to the current mapset only"
@@ -2722,6 +2736,11 @@ msgid "Restrict edits to the current mapset only"
 #: ../gui/wxpython/datacatalog/toolbars.py:31
 msgid "Restrict edits to the current mapset only"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/datacatalog/toolbars.py:31
+msgid "Restrict edits to the current mapset only"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/toolbars.py:34
@@ -2738,6 +2757,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2775,6 +2795,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Allow edits outside of the current mapset"
 msgstr ""
 
@@ -2797,6 +2819,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2845,6 +2868,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 msgid "Create new mapset in current project"
 msgstr ""
@@ -2879,6 +2904,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2958,6 +2984,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Create new mapset in current location"
 msgstr ""
 
@@ -2986,6 +3017,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/datacatalog/toolbars.py:49
 msgid "Import raster data  [r.import]"
 =======
@@ -3061,6 +3093,12 @@ msgid "Import raster data  [r.import]"
 msgid "Import raster data  [r.import]"
 =======
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/toolbars.py:45
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+msgid "Import raster data  [r.import]"
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:49
 msgid "Import raster data  [r.import]"
 =======
@@ -3080,6 +3118,7 @@ msgid "Import raster data  [r.import]"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3169,6 +3208,8 @@ msgid "Import raster data  [r.import]"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/toolbars.py:52
@@ -3260,6 +3301,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3332,6 +3374,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031
 =======
 #: ../gui/wxpython/datacatalog/tree.py:104
@@ -3698,6 +3745,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3730,6 +3778,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -3747,6 +3797,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -3812,6 +3863,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -16593,6 +16646,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16773,6 +16827,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/nviztask.py:44 ../gui/wxpython/lmgr/frame.py:1431
 #, python-format
@@ -16905,6 +16961,7 @@ msgid "Animation Tool - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -16927,6 +16984,8 @@ msgid "Animation Tool - GRASS GIS"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/temporal_manager.py:110
@@ -16943,6 +17002,7 @@ msgid "It is not allowed to display data with different temporal types (absolute
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -16977,6 +17037,8 @@ msgid "It is not allowed to display data with different temporal types (absolute
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -17008,6 +17070,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17080,6 +17143,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/statusbar.py:518
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/statusbar.py:516
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -19909,6 +19977,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20000,6 +20069,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/mapdisp/toolbars.py:34
 msgid "Select vector feature(s)"
@@ -20141,6 +20215,7 @@ msgstr "Pokaż pasek stanu"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20213,6 +20288,11 @@ msgstr "Pokaż pasek stanu"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/frame.py:308 ../gui/wxpython/lmgr/layertree.py:1182
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:323 ../gui/wxpython/lmgr/layertree.py:1144
 =======
 #: ../gui/wxpython/nviz/tools.py:249
@@ -21204,6 +21284,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21250,6 +21331,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Unable to start wxGUI vector digitizer.\n"
@@ -21270,6 +21354,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21302,6 +21387,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:379
 msgid "Vector Digitizer Toolbar"
 msgstr "Narzędzia wektoryzacji"
@@ -21321,6 +21408,7 @@ msgstr "Narzędzia wektoryzacji"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21353,6 +21441,8 @@ msgstr "Narzędzia wektoryzacji"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:394
 msgid "Vector Digitizer Toolbar"
 msgstr "Narzędzia wektoryzacji"
@@ -21815,6 +21905,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21861,6 +21952,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Unable to switch to 3D display mode.\n"
@@ -22352,6 +22446,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22443,6 +22538,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -22824,6 +22924,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22915,6 +23016,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -23976,6 +24082,7 @@ msgstr "UWAGA"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -24067,6 +24174,11 @@ msgstr "UWAGA"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -24161,6 +24273,7 @@ msgid "Text properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24256,6 +24369,8 @@ msgid "Unable to draw registered graphics. The graphics was unregistered."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:226
@@ -24559,6 +24674,7 @@ msgstr "Usuń warstwę mapy"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24631,6 +24747,11 @@ msgstr "Usuń warstwę mapy"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Quit GRASS GUI"
@@ -26158,6 +26279,7 @@ msgid "Controls access to the current mapset for other users on the system. If n
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29183,6 +29305,8 @@ msgid "Calculates univariate statistics from the non-null cells for each registe
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:232
@@ -32270,6 +32394,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32361,6 +32486,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/layertree.py:64
 msgid "Add raster cell numbers"
@@ -32529,6 +32659,7 @@ msgstr "Utwórz kopię %s <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32601,6 +32732,11 @@ msgstr "Utwórz kopię %s <%s>"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:1085
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1047
 =======
 #: ../gui/wxpython/startup/locdownload.py:563
@@ -32866,6 +33002,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32912,6 +33049,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "%s <%s> already exists in the current mapset. Do you want to overwrite it?"
@@ -32936,6 +33076,7 @@ msgstr "Nie można otworzyć kopii <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33008,6 +33149,11 @@ msgstr "Nie można otworzyć kopii <%s>"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:1105
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1067
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -33263,6 +33409,7 @@ msgstr "Mapa wektorowa <%s> została dodana"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33354,6 +33501,11 @@ msgstr "Mapa wektorowa <%s> została dodana"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Current workspace is not empty. Do you want to store current settings to "
 "workspace file?"
@@ -33375,6 +33527,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33416,6 +33569,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Aktualny plik projektu nie jest pusty. Czy chcesz zapisać aktualne "
 "ustawienia do pliku projektu?"
 =======
@@ -33434,6 +33589,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -33503,6 +33659,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/workspace.py:76
 msgid "Create new workspace?"
@@ -33728,6 +33888,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33760,6 +33921,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257
 #: ../gui/wxpython/dbmgr/base.py:1283
 =======
@@ -33776,6 +33939,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33808,6 +33972,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248
 #: ../gui/wxpython/dbmgr/base.py:1274
 =======
@@ -33853,6 +34019,7 @@ msgstr "Zastosowanie instrukcji SELECT i ponowne wczytanie rekordów danych"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33899,6 +34066,9 @@ msgstr "Zastosowanie instrukcji SELECT i ponowne wczytanie rekordów danych"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Example: %s"
 msgstr "Przykład: %s"
@@ -34466,6 +34636,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34538,6 +34709,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/dialogs.py:80
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:79
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:133
@@ -34712,6 +34888,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34758,6 +34935,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "No attribute table found.\n"
@@ -35020,6 +35200,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35092,6 +35273,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -35378,6 +35564,7 @@ msgstr "Pliki"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35424,6 +35611,9 @@ msgstr "Pliki"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -35460,6 +35650,7 @@ msgstr "Odtwórz"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35532,6 +35723,11 @@ msgstr "Odtwórz"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/toolbars.py:30
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/toolbars.py:29
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Play back"
@@ -35553,6 +35749,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37157,6 +37354,8 @@ msgstr "Cofnij zmiany"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gui_core/simplelmgr.py:149
 msgid "Copy map names to clipboard (bottom to top)"
@@ -40609,6 +40808,7 @@ msgstr "etykiety:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40641,6 +40841,8 @@ msgstr "etykiety:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Location Name:"
 #~ msgstr "Nazwa lokacji:"
 
@@ -40666,6 +40868,7 @@ msgstr "etykiety:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40698,6 +40901,8 @@ msgstr "etykiety:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Show comp. extent"
 #~ msgstr "Pokaż bieżący region"
 =======
@@ -40718,6 +40923,7 @@ msgid "Cartographic Composer - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -40768,6 +40974,9 @@ msgid "Cartographic Composer - GRASS GIS"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 msgid "GRASS SVN revision"
@@ -40878,6 +41087,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40915,6 +41125,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -40991,6 +41203,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -41213,6 +41426,8 @@ msgstr "Utworzyć nową lokację?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Vector Toolbar"
 #~ msgstr "Narzędzia wektoryzacji"
 
@@ -41691,6 +41906,7 @@ msgstr "Nazwa lokacji"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -41723,6 +41939,8 @@ msgstr "Nazwa lokacji"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Unable to create location"
 #~ msgstr "Nie można utworzyć lokacji"
 =======
@@ -41739,6 +41957,7 @@ msgstr "Nazwa lokacji"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -41771,6 +41990,8 @@ msgstr "Nazwa lokacji"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII "
 #~ "characters excluding %(chars)s and space."
@@ -41797,6 +42018,7 @@ msgstr "Nie można utworzyć lokacji"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -41843,6 +42065,9 @@ msgstr "Nie można utworzyć lokacji"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Select EPSG code of spatial reference system"
 msgstr "Wybierz kod EPSG układu współrzędnych"
@@ -41880,6 +42105,7 @@ msgstr "Utworzyć nową lokację?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -41909,6 +42135,8 @@ msgstr "Utworzyć nową lokację?"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "GRASS GIS Raster Map Calculator"
 msgstr "Kalkulator Map GRASS GIS"
 
@@ -42109,6 +42337,7 @@ msgstr "Utworzyć nową lokację?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -42151,3 +42380,5 @@ msgstr "Utworzyć nową lokację?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_pt.po b/locale/po/grasswxpy_pt.po
index 3f748925cfb..e783db1e06c 100644
--- a/locale/po/grasswxpy_pt.po
+++ b/locale/po/grasswxpy_pt.po
@@ -22075,6 +22075,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22166,6 +22167,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "3D Raster Map Calculator"
 msgstr ""
 
@@ -23179,6 +23185,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23270,6 +23277,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -23363,6 +23375,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23435,6 +23448,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Tools Toolbar"
@@ -23473,6 +23491,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23564,6 +23583,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850
 msgid "Choose model to run"
@@ -23583,6 +23607,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23655,6 +23680,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -23850,6 +23880,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23896,6 +23927,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -24122,6 +24156,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 =======
@@ -24165,6 +24200,8 @@ msgid "Histogram Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/photo2image/g.gui.photo2image.py:99
 msgid "Please provide a group name to process"
 msgstr ""
@@ -24485,6 +24522,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
@@ -24559,6 +24597,11 @@ msgid "Histogram Tool"
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/wxplot/histogram.py:43
+msgid "Histogram Tool"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/wxplot/histogram.py:51
@@ -27394,6 +27437,7 @@ msgid "Topology maintenance"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27431,6 +27475,8 @@ msgid "Topology maintenance"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -27616,6 +27662,7 @@ msgid "Delete all text from the shell"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -27645,6 +27692,8 @@ msgid "Delete all text from the shell"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1637
 msgid "Extracts features of input map which overlay features of clip map."
 msgstr ""
@@ -29341,6 +29390,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29378,6 +29428,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/locdownload.py:563
 msgid "Location Download"
 msgstr ""
@@ -29917,6 +29969,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29989,6 +30042,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -30015,6 +30073,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30061,6 +30120,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -31278,6 +31340,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31948,6 +32011,8 @@ msgid "Select target vector map to display:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/preferences.py:1756
@@ -34951,6 +35016,7 @@ msgstr "Gestor das tabelas de atributos do GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35024,6 +35090,11 @@ msgstr "Gestor das tabelas de atributos do GRASS GIS"
 #~ msgstr "Não é possível criar a location"
 =======
 >>>>>>> osgeo-main
+=======
+#~ msgid "Unable to create location"
+#~ msgstr "Não é possível criar a location"
+=======
+>>>>>>> osgeo-main
 msgid "Unable to create location"
 msgstr "Não é possível criar a location"
 
@@ -35044,6 +35115,7 @@ msgstr "Pretende criar uma GRASS location <%s>?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -35073,6 +35145,8 @@ msgstr "Pretende criar uma GRASS location <%s>?"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #, fuzzy
 msgid "Name for the output raster map:"
 msgstr "Nombre para el nuevo mapa vectorial:"
@@ -35414,6 +35488,7 @@ msgstr "Pretende criar uma GRASS location <%s>?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35454,6 +35529,8 @@ msgstr "Criar nova location?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 msgid "Create new location?"
 msgstr "Criar nova location?"
@@ -35468,6 +35545,7 @@ msgstr "Criar nova location?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 msgid "Create new location?"
@@ -35506,3 +35584,5 @@ msgstr "Criar nova location?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_pt_BR.po b/locale/po/grasswxpy_pt_BR.po
index 04ed7ced858..c659aa521b1 100644
--- a/locale/po/grasswxpy_pt_BR.po
+++ b/locale/po/grasswxpy_pt_BR.po
@@ -393,6 +393,7 @@ msgstr "Exibição de Mapa"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -439,6 +440,9 @@ msgstr "Exibição de Mapa"
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 msgid ""
 "Adjusts the viewing height above the surface (angle of view automatically "
 "adjusts to maintain the same center of view)"
@@ -465,6 +469,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -520,6 +525,9 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/nviz/tools.py:403
 msgid "Adjusts the relative height of features above the plane of the surface"
@@ -561,6 +569,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -601,6 +610,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Falha ao executar o comando '%(command)s'. Detalhes:\n"
 "%(error)s"
 
@@ -635,6 +646,7 @@ msgstr "centro"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -702,6 +714,10 @@ msgstr "centro"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Não foi possível iniciar o digitalizador vetorial wxGUI.\n"
 "Detalhes: %s"
 
@@ -724,6 +740,7 @@ msgstr "Barra de ferramentas do Digitalizador Vetorial"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -822,6 +839,11 @@ msgstr "Barra de ferramentas do Digitalizador Vetorial"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/nviz/tools.py:482
 msgid "Resets the view to the original default center of view"
@@ -853,6 +875,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -888,6 +911,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Define o visualizador diretamente sobre a posição central da cena. Esta "
 "visualização top orienta aproximadamente norte ao sul."
 =======
@@ -907,6 +932,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -958,6 +984,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Não foi possível mudar para o modo de exibição 3D.\n"
 "A extensão Nviz python não foi encontrada ou carregada corretamente.\n"
 "Voltando para o modo de exibição 2D.\n"
@@ -980,6 +1008,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -1071,6 +1100,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/nviz/tools.py:498
 msgid "reset"
@@ -1090,6 +1124,7 @@ msgstr "redefinir"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1162,6 +1197,11 @@ msgstr "redefinir"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/nviz/tools.py:499
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:431
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "Reset to default view"
@@ -1183,6 +1223,7 @@ msgstr "Por favor aguarde, carregando dados..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3947,6 +3988,8 @@ msgstr "Por favor, selecione mapas ou conjunto de dados primeiramente."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/mapdisp/frame.py:451
 msgid "Please wait, unloading data..."
@@ -5392,6 +5435,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 msgid "Animation Tool - GRASS GIS"
@@ -5422,6 +5466,8 @@ msgstr "Barra de Ferramentas de Animação"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/temporal_manager.py:110
 msgid "It is not allowed to display data with different temporal types (absolute and relative)."
@@ -5640,6 +5686,9 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
 =======
@@ -5676,6 +5725,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #, fuzzy
 =======
@@ -5743,6 +5793,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/dialogs.py:581
 msgid "End region:"
@@ -6092,6 +6144,7 @@ msgstr "Cor de fundo:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6164,6 +6217,11 @@ msgstr "Cor de fundo:"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/nviz/tools.py:562
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:494
 =======
 #: ../gui/wxpython/animation/dialogs.py:1990
@@ -6222,6 +6280,7 @@ msgstr "Inválido"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Animation Tool"
 msgstr ""
 =======
@@ -6293,6 +6352,10 @@ msgstr ""
 msgid "Animation Tool"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Animation Tool"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/frame.py:157 ../gui/wxpython/mapswipe/frame.py:290
 msgid "Main Toolbar"
@@ -6487,6 +6550,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6533,6 +6597,9 @@ msgstr ""
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 msgid ""
 "Press 'Record' button and start changing the view. It is recommended to use "
 "fly-through mode (Map Display toolbar) to achieve smooth motion."
@@ -6554,6 +6621,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -6595,6 +6663,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Pressione o botão 'Gravar' e comece a mudar a visualização. Recomenda-se "
 "usar o modo fly-through (barra de ferramentas Map Display) para obter um "
 "movimento suave."
@@ -6613,6 +6683,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -6682,6 +6753,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "A Ferramenta Gráfico de Dispersão Interativo não pode ser usada.\n"
 "O número de células (linhas*colunas) <%d> na região atual é maior que o limite máximo <%d>.\n"
 "\n"
@@ -6703,6 +6778,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -6794,6 +6870,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/nviz/tools.py:574
 msgid "Record"
@@ -6882,6 +6963,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -6923,6 +7005,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Os nomes dos arquivos gerados serão semelhantes a este: prefixo_1.ppm, "
 "prefixo_2.ppm,..."
 
@@ -6944,6 +7028,7 @@ msgstr "Formato do arquivo:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -7013,6 +7098,10 @@ msgstr "Formato do arquivo:"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "O número de células (linhas*cols) <%d> na região atual é maior que o limite recomendado <%d>.\n"
 "É altamente recomendável reduzir o número de células na região atual para um número abaixo do limite recomendado.\n"
 "Isso pode ser feito pelo comando .\n"
@@ -7031,6 +7120,7 @@ msgstr "Formato do arquivo:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7085,6 +7175,8 @@ msgstr "Um gráfico de dispersão com a mesma combinação de bandas (independen
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/iscatt/controllers.py:287
 msgid "Scatter plot with same band combination (regardless x y order) is already displayed."
@@ -7103,6 +7195,7 @@ msgstr "Um gráfico de dispersão com a mesma combinação de bandas (independen
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
@@ -7149,6 +7242,8 @@ msgstr "Um gráfico de dispersão com a mesma combinação de bandas (independen
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/nviz/tools.py:758 ../gui/wxpython/nviz/tools.py:2417
 #: ../gui/wxpython/nviz/preferences.py:438
@@ -7173,6 +7268,7 @@ msgstr "Superfície constante"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7245,6 +7341,11 @@ msgstr "Superfície constante"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/nviz/tools.py:777 ../gui/wxpython/nviz/preferences.py:557
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:707 ../gui/wxpython/nviz/preferences.py:557
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "Vector"
@@ -7578,6 +7679,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Timeline Tool - GRASS GIS"
 msgstr ""
 =======
@@ -7649,6 +7751,10 @@ msgstr ""
 msgid "Timeline Tool - GRASS GIS"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Timeline Tool - GRASS GIS"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/timeline/frame.py:38
 #, python-brace-format
@@ -7670,6 +7776,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Timeline Tool"
 msgstr ""
 =======
@@ -7741,6 +7848,10 @@ msgstr ""
 msgid "Timeline Tool"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Timeline Tool"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/timeline/frame.py:134 ../gui/wxpython/tplot/frame.py:353
 #: ../gui/wxpython/nviz/preferences.py:405 ../gui/wxpython/nviz/tools.py:847
@@ -9907,6 +10018,7 @@ msgstr "Sim"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Graphical Modeler - GRASS GIS"
 msgstr ""
 =======
@@ -9978,6 +10090,10 @@ msgstr ""
 msgid "Graphical Modeler - GRASS GIS"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Graphical Modeler - GRASS GIS"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gmodeler/frame.py:78 ../gui/wxpython/lmgr/toolbars.py:155
 #: ../gui/wxpython/gui_core/forms.py:1458
@@ -10429,6 +10545,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Create a generic cartesian coordinate system (XY)"
 msgstr ""
 =======
@@ -10500,6 +10617,10 @@ msgstr ""
 msgid "Create a generic cartesian coordinate system (XY)"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Create a generic cartesian coordinate system (XY)"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/location_wizard/wizard.py:357
 #: ../gui/wxpython/location_wizard/wizard.py:1437
@@ -10531,6 +10652,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Additional methods:"
 msgstr ""
 =======
@@ -10602,6 +10724,10 @@ msgstr ""
 msgid "Additional methods:"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Additional methods:"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/location_wizard/wizard.py:500
 #: ../gui/wxpython/location_wizard/wizard.py:1018
@@ -10708,6 +10834,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Select CRS from a list"
 msgstr ""
 =======
@@ -10779,6 +10906,10 @@ msgstr ""
 msgid "Select CRS from a list"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Select CRS from a list"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/location_wizard/wizard.py:1514
 msgid "Filter by EPSG code or description:"
@@ -10799,6 +10930,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Find more information at:"
 msgstr ""
 =======
@@ -10870,6 +11002,10 @@ msgstr ""
 msgid "Find more information at:"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Find more information at:"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/location_wizard/wizard.py:1531
 #: ../gui/wxpython/location_wizard/wizard.py:1744
@@ -10893,6 +11029,7 @@ msgstr "Parâmetros"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -10984,6 +11121,11 @@ msgstr "Parâmetros"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/datacatalog/infomanager.py:58
 #, python-brace-format
@@ -11138,6 +11280,7 @@ msgstr "Código IAU ausente."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -11178,6 +11321,8 @@ msgstr "Código IAU ausente."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/datacatalog/infomanager.py:96
@@ -11886,6 +12031,7 @@ msgstr "Arquivo <%s> não encontrado."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
@@ -11920,6 +12066,8 @@ msgstr "Arquivo <%s> não encontrado."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/history/tree.py:191
@@ -11947,6 +12095,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12019,6 +12168,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/history/tree.py:491
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/tree.py:195
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 #, fuzzy
@@ -12063,6 +12217,7 @@ msgstr "&Definir região"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 #: ../gui/wxpython/location_wizard/dialogs.py:140
 =======
@@ -12105,6 +12260,8 @@ msgstr "&Definir região"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/history/browser.py:40
@@ -12511,6 +12668,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12596,6 +12754,8 @@ msgstr "Clique aqui para ocultar as configurações 3D"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Não foi possível renomear o mapset.\n"
 "\n"
 "%s"
@@ -12613,6 +12773,7 @@ msgstr "Clique aqui para ocultar as configurações 3D"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12643,6 +12804,8 @@ msgstr "Clique aqui para ocultar as configurações 3D"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 #: ../gui/wxpython/location_wizard/dialogs.py:140
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -12655,6 +12818,7 @@ msgstr "Clique aqui para ocultar as configurações 3D"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -12680,6 +12844,8 @@ msgstr "Clique aqui para ocultar as configurações 3D"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Invalid location selected."
 msgstr "Location inválida selecionada."
 
@@ -12707,6 +12873,7 @@ msgstr "Clique aqui para ocultar as configurações 3D"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12744,6 +12911,8 @@ msgstr "Clique aqui para ocultar as configurações 3D"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 
@@ -12946,6 +13115,7 @@ msgstr "Linhas: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -13037,6 +13207,11 @@ msgstr "Linhas: %d"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:662
@@ -13059,6 +13234,7 @@ msgstr "Linhas: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13105,6 +13281,9 @@ msgstr "Linhas: %d"
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 msgid ""
 "Data file <%(name)s> imported successfully. The project's default region was "
 "set from this imported map."
@@ -13131,6 +13310,7 @@ msgstr "Colunas: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -13222,6 +13402,11 @@ msgstr "Colunas: %d"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:693
@@ -13258,6 +13443,7 @@ msgstr "Células: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -13349,6 +13535,11 @@ msgstr "Células: %d"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:712
 #: ../gui/wxpython/lmgr/workspace.py:159
@@ -13379,6 +13570,7 @@ msgstr "Profundidade: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
@@ -13413,6 +13605,8 @@ msgstr "Profundidade: %d"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/startup/guiutils.py:711
@@ -13453,6 +13647,7 @@ msgstr "Profundidade: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13490,6 +13685,8 @@ msgstr "Profundidade: %d"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Current mapset is <%s>."
 msgstr "Mapset atual é <%s>."
 
@@ -13666,6 +13863,7 @@ msgstr "Gerenciar Pontos de Controle no Solo"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -13735,6 +13933,10 @@ msgstr "Gerenciar Pontos de Controle no Solo"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "3D Cells: %d"
 msgstr "Células 3D: %d"
 
@@ -13869,6 +14071,7 @@ msgstr "A gravação do arquivo POINTS falhou"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13915,6 +14118,9 @@ msgstr "A gravação do arquivo POINTS falhou"
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 #, python-format
 msgid "At least %d GCPs required. Operation canceled."
 msgstr "São necessários pelo menos %d GCPs. Operação cancelada."
@@ -14013,6 +14219,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "Pontos insuficientes definidos e ativos (marcados) para o método de retificação selecionado (ordem: %d).\n"
 =======
 <<<<<<< HEAD
@@ -14055,6 +14262,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Pontos insuficientes definidos e ativos (marcados) para o método de "
 "retificação selecionado (ordem: %d).\n"
 =======
@@ -14074,6 +14283,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "Pontos insuficientes definidos e ativos (marcados) para o método de retificação selecionado (ordem: %d).\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -14157,6 +14367,11 @@ msgstr ""
 "Pontos insuficientes definidos e ativos (marcados) para o método de retificação selecionado (ordem: %d).\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"Pontos insuficientes definidos e ativos (marcados) para o método de retificação selecionado (ordem: %d).\n"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "3+ pontos necessários para 1ª ordem,\n"
 "6+ pontos para 2ª ordem e\n"
 "Mais de 10 pontos para a 3ª ordem."
@@ -14186,6 +14401,7 @@ msgstr "Retificando imagens, por favor aguarde..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14218,6 +14434,8 @@ msgstr "Retificando imagens, por favor aguarde..."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:1895
 #: ../gui/wxpython/image2target/ii2t_manager.py:1836
 =======
@@ -14234,6 +14452,7 @@ msgstr "Retificando imagens, por favor aguarde..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14266,6 +14485,8 @@ msgstr "Retificando imagens, por favor aguarde..."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:1894
 #: ../gui/wxpython/image2target/ii2t_manager.py:1822
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
@@ -14293,6 +14514,7 @@ msgstr "Gravando imagem de saída para o grupo, por favor, aguarde..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -14384,6 +14606,11 @@ msgstr "Gravando imagem de saída para o grupo, por favor, aguarde..."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gcp/manager.py:1901
 #: ../gui/wxpython/image2target/ii2t_manager.py:1842
@@ -14468,6 +14695,7 @@ msgstr "uso"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14500,6 +14728,8 @@ msgstr "uso"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:2474 ../gui/wxpython/gcp/manager.py:2493
 #: ../gui/wxpython/image2target/ii2t_manager.py:2412
 #: ../gui/wxpython/image2target/ii2t_manager.py:2433
@@ -14517,6 +14747,7 @@ msgstr "uso"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14549,6 +14780,8 @@ msgstr "uso"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:2470 ../gui/wxpython/gcp/manager.py:2489
 #: ../gui/wxpython/image2target/ii2t_manager.py:2395
 #: ../gui/wxpython/image2target/ii2t_manager.py:2416
@@ -14591,6 +14824,7 @@ msgstr "origem X"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14656,6 +14890,8 @@ msgstr "destino Y"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/photo2image/ip2i_manager.py:1527
 #: ../gui/wxpython/photo2image/ip2i_manager.py:1545
@@ -14685,6 +14921,7 @@ msgstr "destino Y"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
@@ -14731,6 +14968,8 @@ msgstr "destino Y"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gcp/manager.py:2478 ../gui/wxpython/gcp/manager.py:2497
 #: ../gui/wxpython/image2target/ii2t_manager.py:2418
@@ -14768,6 +15007,7 @@ msgstr "Valor de coordenada inválido. Operação cancelada."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14800,6 +15040,8 @@ msgstr "Valor de coordenada inválido. Operação cancelada."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:2690
 #: ../gui/wxpython/image2target/ii2t_manager.py:2636
 =======
@@ -14816,6 +15058,7 @@ msgstr "Valor de coordenada inválido. Operação cancelada."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14848,6 +15091,8 @@ msgstr "Valor de coordenada inválido. Operação cancelada."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:2686
 #: ../gui/wxpython/image2target/ii2t_manager.py:2619
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
@@ -14875,6 +15120,7 @@ msgstr "Selecione o(s) mapa(s) vetorial(is) para adicionar ao grupo:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14953,6 +15199,8 @@ msgstr "destino Y:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Edit GCP"
 msgstr "Edite GCP"
 
@@ -14991,6 +15239,7 @@ msgstr "destino Y:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
@@ -15037,6 +15286,8 @@ msgstr "destino Y:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gcp/manager.py:2831
 #: ../gui/wxpython/image2target/ii2t_manager.py:2772
@@ -15147,6 +15398,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15179,6 +15431,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:3048
 #: ../gui/wxpython/image2target/ii2t_manager.py:2996
 #: ../gui/wxpython/photo2image/ip2i_manager.py:2118
@@ -15196,6 +15450,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15228,6 +15483,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:3043
 #: ../gui/wxpython/image2target/ii2t_manager.py:2978
 #: ../gui/wxpython/photo2image/ip2i_manager.py:2112
@@ -15289,6 +15546,7 @@ msgstr "Cor para o GCP selecionado:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15351,6 +15609,8 @@ msgstr "Cor para o GCP selecionado:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/photo2image/ip2i_manager.py:2011
 #: ../gui/wxpython/gcp/manager.py:2924
@@ -15415,6 +15675,7 @@ msgstr "Retificação"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -15578,6 +15839,11 @@ msgstr "Retificação"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 #: ../gui/wxpython/gcp/manager.py:3100
@@ -15679,6 +15945,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15751,6 +16018,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/gcp/manager.py:3285
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:3280
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "overwrite result map"
@@ -15779,6 +16051,7 @@ msgstr "Extensão para mapas de saída:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -15870,6 +16143,11 @@ msgstr "Extensão para mapas de saída:"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gcp/manager.py:3331
 #: ../gui/wxpython/image2target/ii2t_manager.py:3282
@@ -16029,6 +16307,7 @@ msgstr "Salvar a geometria de exibição na região nomeada"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/tplot/frame.py:98
 msgid "Temporal Plot Tool"
 =======
@@ -16070,6 +16349,8 @@ msgid "Temporal Plot Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/statusbar.py:36
 #: ../gui/wxpython/image2target/ii2t_statusbar.py:36
 #: ../gui/wxpython/photo2image/ip2i_statusbar.py:36
@@ -16085,6 +16366,7 @@ msgid "Temporal Plot Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -16127,6 +16409,8 @@ msgid "Temporal Plot Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/statusbar.py:37
 #: ../gui/wxpython/image2target/ii2t_statusbar.py:37
 #: ../gui/wxpython/photo2image/ip2i_statusbar.py:37
@@ -16151,6 +16435,7 @@ msgid "Temporal Plot Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/tplot/frame.py:98
 msgid "Temporal Plot Tool"
@@ -16223,6 +16508,11 @@ msgid "Temporal Plot Tool"
 #: ../gui/wxpython/tplot/frame.py:98
 msgid "Temporal Plot Tool"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/tplot/frame.py:98
+msgid "Temporal Plot Tool"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/tplot/frame.py:184
@@ -16242,6 +16532,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16299,6 +16590,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -16834,6 +17127,7 @@ msgstr "Problema ao obter dados do conjunto de dados temporais vetoriais. Lista
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16979,6 +17273,8 @@ msgstr "Este módulo requer o módulo NumPy, que não pôde ser importado. Prova
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/tplot/frame.py:848
 msgid "Problem getting data from vector temporal dataset. Empty list of values."
@@ -17063,6 +17359,7 @@ msgstr "Este módulo requer o módulo NumPy, que não pôde ser importado. Prova
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17100,6 +17397,8 @@ msgstr "Este módulo requer o módulo NumPy, que não pôde ser importado. Prova
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/location_wizard/wizard.py:2722
@@ -17134,6 +17433,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17170,6 +17470,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/location_wizard/dialogs.py:40
 msgid "Set default region extent and resolution"
@@ -17221,6 +17523,7 @@ msgstr "Mapa vetorial <%s> não encontrado"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -17312,6 +17615,11 @@ msgstr "Mapa vetorial <%s> não encontrado"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/location_wizard/dialogs.py:202
 #: ../gui/wxpython/location_wizard/dialogs.py:594
@@ -17347,6 +17655,7 @@ msgstr "Mapa raster 3d <%s> não encontrado"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17573,6 +17882,8 @@ msgstr "A imagem é muito grande, sua implementação OpenGL suporta o tamanho m
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/nviz/preferences.py:35
 msgid "3D view default settings"
@@ -17763,6 +18074,7 @@ msgstr "A imagem é muito grande, sua implementação OpenGL suporta o tamanho m
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
@@ -17809,6 +18121,8 @@ msgstr "A imagem é muito grande, sua implementação OpenGL suporta o tamanho m
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/location_wizard/dialogs.py:251
 #: ../gui/wxpython/location_wizard/dialogs.py:598
@@ -17856,6 +18170,7 @@ msgstr "Leste"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17928,6 +18243,11 @@ msgstr "Leste"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/location_wizard/dialogs.py:428
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/dialogs.py:415
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "South"
@@ -18177,6 +18497,7 @@ msgstr "Não é possível descarregar o mapa raster"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18217,6 +18538,8 @@ msgstr "Não é possível descarregar o mapa raster"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/gmodeler/preferences.py:695
@@ -18698,6 +19021,7 @@ msgstr "Incapaz de descarregar o mapa raster 3d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18729,6 +19053,8 @@ msgstr "Incapaz de descarregar o mapa raster 3d"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/nviz/mapwindow.py:1696
 msgid "3d raster map"
@@ -18778,6 +19104,7 @@ msgstr "Não é possível definir as propriedades da camada de dados (id = %d)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18853,6 +19180,8 @@ msgstr "Não é possível definir as propriedades da camada de dados (id = %d)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/gmodeler/toolbars.py:76
@@ -19090,6 +19419,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "Falha ao definir as propriedades da camada de dados.\n"
 =======
 <<<<<<< HEAD
@@ -19132,6 +19462,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "O modelo não é válido. Quer rodar assim mesmo?\n"
 =======
 "Falha ao definir as propriedades da camada de dados.\n"
@@ -19150,6 +19482,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "Falha ao definir as propriedades da camada de dados.\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -19233,6 +19566,11 @@ msgstr ""
 "Falha ao definir as propriedades da camada de dados.\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"Falha ao definir as propriedades da camada de dados.\n"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "\n"
 "%s"
 
@@ -19254,6 +19592,7 @@ msgstr "Rodar modelo?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19326,6 +19665,11 @@ msgstr "Rodar modelo?"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/gmodeler/model.py:696
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gmodeler/model.py:688
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "Variables below not defined:"
@@ -19975,6 +20319,7 @@ msgstr "Nenhuma"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -20066,6 +20411,11 @@ msgstr "Nenhuma"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gmodeler/frame.py:85 ../gui/wxpython/gui_core/forms.py:1520
 #: ../gui/wxpython/lmgr/toolbars.py:208
@@ -20239,6 +20589,7 @@ msgstr "Editar ponto"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 msgid "Vector Network Analysis Tool"
@@ -20290,6 +20641,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 #, fuzzy
 msgid "{} script contains local modifications"
@@ -20308,6 +20661,7 @@ msgstr "O script Python contém modificações locais"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -20337,6 +20691,8 @@ msgstr "O script Python contém modificações locais"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Vector Network Analysis Tool"
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20354,6 +20710,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -20383,6 +20740,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Vector Network Analysis Tool"
 msgstr ""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -20400,6 +20759,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20448,6 +20808,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 #: ../gui/wxpython/gmodeler/frame.py:260 ../gui/wxpython/gmodeler/frame.py:2239
@@ -20563,6 +20925,7 @@ msgstr "Estilo da tabela de cores:%s"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -20654,6 +21017,11 @@ msgstr "Estilo da tabela de cores:%s"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gmodeler/frame.py:311 ../gui/wxpython/core/gconsole.py:715
 #, python-format
@@ -20672,6 +21040,7 @@ msgstr "Estilo da tabela de cores:%s"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20711,6 +21080,8 @@ msgstr "Inverter cores %s:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "%(min)d min %(sec)d sec"
 msgstr "%(min)d minutos %(sec)d segundos"
 
@@ -20742,6 +21113,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20774,6 +21146,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gmodeler/frame.py:364
 msgid "Quit Graphical Modeler"
@@ -20963,6 +21337,7 @@ msgstr "Inverter cores %s:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
@@ -20997,6 +21372,8 @@ msgstr "Inverter cores %s:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/gmodeler/frame.py:1786
@@ -21022,6 +21399,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21084,6 +21462,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gmodeler/frame.py:1791
 #: ../gui/wxpython/gmodeler/frame.py:1853
@@ -21126,6 +21508,7 @@ msgstr "Cor para ponto de Início/De/Origem/Usado:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -21182,6 +21565,9 @@ msgstr "Cor para ponto de Início/De/Origem/Usado:"
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gmodeler/frame.py:1807
 msgid "string"
@@ -21267,6 +21653,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21329,6 +21716,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 #: ../gui/wxpython/gmodeler/frame.py:2056
@@ -21355,6 +21746,7 @@ msgstr "Cor para o ponto selecionado:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -21395,6 +21787,8 @@ msgstr "Cor para o ponto selecionado:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/gmodeler/frame.py:2078
@@ -21423,6 +21817,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -21455,6 +21850,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gmodeler/frame.py:2114
 msgid "Update"
@@ -21504,6 +21901,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21566,6 +21964,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/menustrings.py:3 ../gui/wxpython/menustrings.py:2055
 #: ../gui/wxpython/menustrings.py:2105
@@ -21846,6 +22248,7 @@ msgstr "Número máximo de resultados no histórico:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -21902,6 +22305,9 @@ msgstr "Número máximo de resultados no histórico:"
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/menustrings.py:63 ../gui/wxpython/menustrings.py:1101
 msgid "WMS/WMTS import"
@@ -21920,6 +22326,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -21982,6 +22389,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 <<<<<<< HEAD
 #: ../gui/wxpython/menustrings.py:64 ../gui/wxpython/menustrings.py:1102
@@ -22010,6 +22421,7 @@ msgstr "Salvar o resultado da análise"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -22050,6 +22462,8 @@ msgstr "Salvar o resultado da análise"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/menustrings.py:65 ../gui/wxpython/menustrings.py:1105
@@ -30866,6 +31280,7 @@ msgstr "O mapa vetorial '%s' não existe."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -30907,6 +31322,8 @@ msgstr "O mapa vetorial '%s' não existe."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/vnet/vnet_data.py:166
 msgid "Vector map was not chosen."
@@ -30931,6 +31348,7 @@ msgstr "O mapa vetorial não foi escolhido."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31000,6 +31418,10 @@ msgstr "O mapa vetorial não foi escolhido."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/vnet/vnet_data.py:172
 msgid "Vector map was not chosen."
@@ -31020,6 +31442,7 @@ msgstr "O mapa vetorial não foi escolhido."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31066,6 +31489,9 @@ msgstr "O mapa vetorial não foi escolhido."
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 msgid "arc layer"
 msgstr "camada de arco"
 
@@ -31102,6 +31528,7 @@ msgstr "%s '%s' escolhido não existe no mapa vetorial '%s'.\n"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31143,6 +31570,8 @@ msgstr "%s '%s' escolhido não existe no mapa vetorial '%s'.\n"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/vnet/vnet_data.py:188
 #, python-format
@@ -31177,6 +31606,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31246,6 +31676,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/vnet/vnet_data.py:195
 #, python-format
@@ -31276,6 +31710,7 @@ msgstr "tipo"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31322,6 +31757,9 @@ msgstr "tipo"
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 msgid "topology"
 msgstr "topologia"
 
@@ -31449,6 +31887,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "O mapa temporário '%s' com o resultado foi alterado fora da ferramenta de análise de rede vetorial.\n"
 =======
 <<<<<<< HEAD
@@ -31491,6 +31930,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "O mapa temporário '%s' com o resultado foi alterado fora da ferramenta de "
 "análise de rede vetorial.\n"
 =======
@@ -31510,6 +31951,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "O mapa temporário '%s' com o resultado foi alterado fora da ferramenta de análise de rede vetorial.\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31593,6 +32035,11 @@ msgstr ""
 "O mapa temporário '%s' com o resultado foi alterado fora da ferramenta de análise de rede vetorial.\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"O mapa temporário '%s' com o resultado foi alterado fora da ferramenta de análise de rede vetorial.\n"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "O resultado mostrado pode não corresponder ao resultado da análise original."
 
 #: ../gui/wxpython/vnet/vnet_core.py:233
@@ -31657,6 +32104,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "O mapa de entrada '%s' para análise foi alterado fora da ferramenta de análise de rede vetorial.\n"
 =======
 <<<<<<< HEAD
@@ -31699,6 +32147,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "O mapa de entrada '%s' para análise foi alterado fora da ferramenta de "
 "análise de rede vetorial.\n"
 =======
@@ -31718,6 +32168,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "O mapa de entrada '%s' para análise foi alterado fora da ferramenta de análise de rede vetorial.\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31801,6 +32252,11 @@ msgstr ""
 "O mapa de entrada '%s' para análise foi alterado fora da ferramenta de análise de rede vetorial.\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"O mapa de entrada '%s' para análise foi alterado fora da ferramenta de análise de rede vetorial.\n"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "A coluna de topologia pode não corresponder à situação alterada."
 
 #: ../gui/wxpython/vnet/vnet_core.py:958
@@ -31856,6 +32312,7 @@ msgstr "Substituir mapa"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -31899,6 +32356,8 @@ msgstr "Substituir mapa"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/vnet/toolbars.py:50
 msgid "Insert points from Map Display"
@@ -31939,6 +32398,7 @@ msgid "Raster map <{}> not found in current mapset."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32030,6 +32490,11 @@ msgid "Raster map <{}> not found in current mapset."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/vnet/toolbars.py:59
@@ -32258,6 +32723,7 @@ msgstr "Digitalizar área"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32298,6 +32764,8 @@ msgstr "Digitalizar área"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/rdigit/controller.py:122
@@ -32357,6 +32825,7 @@ msgstr "Digitalizar área"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32393,6 +32862,8 @@ msgstr "Digitalizar área"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rdigit/toolbars.py:29
 msgid "Digitize line"
@@ -32414,6 +32885,7 @@ msgstr "Digitalizar linha"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32455,6 +32927,8 @@ msgstr "Digitalizar linha"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rdigit/toolbars.py:30
 msgid "Digitize point"
@@ -32484,6 +32958,7 @@ msgstr "Desfazer"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -32553,6 +33028,10 @@ msgstr "Desfazer"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rdigit/toolbars.py:31
 msgid "Digitize point"
@@ -32616,6 +33095,7 @@ msgstr "Largura da linha atualmente digitalizada ou diâmetro de um ponto digita
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -32707,6 +33187,11 @@ msgstr "Largura da linha atualmente digitalizada ou diâmetro de um ponto digita
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rdigit/toolbars.py:168
 msgid "New raster map"
@@ -32911,6 +33396,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "GRASS GIS"
 msgstr ""
 =======
@@ -32982,6 +33468,10 @@ msgstr ""
 msgid "GRASS GIS"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "GRASS GIS"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/frame.py:129
 msgid "There were some issues when loading menu or Modules tab:"
@@ -33022,6 +33512,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Rename current Map Display"
 msgstr ""
 =======
@@ -33093,6 +33584,10 @@ msgstr ""
 msgid "Rename current Map Display"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Rename current Map Display"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/frame.py:362
 #: ../gui/wxpython/gui_core/preferences.py:322
@@ -33612,6 +34107,7 @@ msgstr "Não foi possível configurar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33684,6 +34180,11 @@ msgstr "Não foi possível configurar"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/core/settings.py:1153 ../gui/wxpython/core/settings.py:1174
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/settings.py:1149 ../gui/wxpython/core/settings.py:1170
 =======
 #: ../gui/wxpython/lmgr/frame.py:1913
@@ -33714,6 +34215,7 @@ msgstr "Adicionar camadas selecionadas na árvore de camadas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33760,6 +34262,9 @@ msgstr "Adicionar camadas selecionadas na árvore de camadas"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to parse settings '%s'"
 msgstr "Não foi possível interpretar a configuração '%s'"
@@ -33843,6 +34348,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33915,6 +34421,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/core/render.py:1112
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1111
 =======
 #: ../gui/wxpython/lmgr/frame.py:2481
@@ -34141,6 +34652,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34187,6 +34699,9 @@ msgstr ""
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to zoom to raster map <%s>."
 msgstr "Não foi possível fazer o zoom no raster <%s>."
@@ -34520,6 +35035,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34592,6 +35108,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/mapdisp/frame.py:163
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/frame.py:178
 =======
 #: ../gui/wxpython/mapswipe/toolbars.py:29
@@ -34694,6 +35215,7 @@ msgstr "Deslizar a Tela"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34740,6 +35262,9 @@ msgstr "Deslizar a Tela"
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to run command '%(command)s'. Details:\n"
@@ -35268,6 +35793,7 @@ msgstr "Reprojetar camadas selecionadas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -35359,6 +35885,11 @@ msgstr "Reprojetar camadas selecionadas"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -35485,6 +36016,7 @@ msgstr "aparar linhas/fronteiras"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -35563,6 +36095,11 @@ msgstr "aparar linhas/fronteiras"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/extensions.py:227
 >>>>>>> osgeo-main
@@ -35912,6 +36449,7 @@ msgstr "Mapeamento temático para mapa vetorial em visualização 3D"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "3D Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -36009,6 +36547,11 @@ msgid "3D Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+msgid "3D Raster Map Calculator"
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 msgstr "Calculadora de mapa raster"
 =======
@@ -36028,6 +36571,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgstr ""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -36111,6 +36655,11 @@ msgstr ""
 msgstr ""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+msgstr ""
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -36792,6 +37341,7 @@ msgstr "Nome para o novo arquivo de configuração a ser criado"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -36884,6 +37434,11 @@ msgstr "Nome para o novo arquivo de configuração a ser criado"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:519
 msgid "Raster map to use to select areas"
@@ -36905,6 +37460,7 @@ msgstr "Mapa raster a ser usado para selecionar áreas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -36996,6 +37552,11 @@ msgstr "Mapa raster a ser usado para selecionar áreas"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:530
 msgid "Raster map to use to select areas"
@@ -37061,6 +37622,7 @@ msgid "Vector %s has no table connected, please select another vector"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr "O vetor %s não tem uma tabela conectada, por favor selecione outro vetor"
 =======
 <<<<<<< HEAD
@@ -37103,6 +37665,8 @@ msgstr "O vetor %s não tem uma tabela conectada, por favor selecione outro veto
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "O vetor %s não tem uma tabela conectada, por favor selecione outro vetor"
 =======
@@ -37122,6 +37686,7 @@ msgstr "O vetor %s não tem uma tabela conectada, por favor selecione outro veto
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgstr "O vetor %s não tem uma tabela conectada, por favor selecione outro vetor"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -37205,6 +37770,11 @@ msgstr "O vetor %s não tem uma tabela conectada, por favor selecione outro veto
 msgstr "O vetor %s não tem uma tabela conectada, por favor selecione outro vetor"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+msgstr "O vetor %s não tem uma tabela conectada, por favor selecione outro vetor"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:763
 msgid "Insert sampling frame parameter"
@@ -37300,6 +37870,7 @@ msgid "Do you want to overwrite existing temporal maps if they exist?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgstr "Você deseja substituir os mapas temporais existentes, se eles existirem?"
 =======
 <<<<<<< HEAD
@@ -37342,6 +37913,8 @@ msgstr "Você deseja substituir os mapas temporais existentes, se eles existirem
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 "Você deseja substituir os mapas temporais existentes, se eles existirem?"
 =======
@@ -37361,6 +37934,7 @@ msgstr "Você deseja substituir os mapas temporais existentes, se eles existirem
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 msgstr "Você deseja substituir os mapas temporais existentes, se eles existirem?"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -37444,6 +38018,11 @@ msgstr "Você deseja substituir os mapas temporais existentes, se eles existirem
 msgstr "Você deseja substituir os mapas temporais existentes, se eles existirem?"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+msgstr "Você deseja substituir os mapas temporais existentes, se eles existirem?"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1044
 msgid "Do you want to check vector areas?"
@@ -37480,6 +38059,7 @@ msgstr "Analisando vetor"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -37572,6 +38152,11 @@ msgstr "Analisando vetor"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1080
 msgid "All feature are been analyzed."
@@ -37616,6 +38201,7 @@ msgstr "Desenhe a região de amostragem"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -37707,6 +38293,11 @@ msgstr "Desenhe a região de amostragem"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1180
 msgid "All feature are been analyzed."
@@ -37806,6 +38397,7 @@ msgid "Systematic contiguos"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -37897,6 +38489,11 @@ msgid "Systematic contiguos"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr "Contiguo sistemático"
 
 #: ../gui/wxpython/rlisetup/wizard.py:1353
@@ -37926,6 +38523,7 @@ msgid "Systematic non contiguos"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -38017,6 +38615,11 @@ msgid "Systematic non contiguos"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr "Não contiguo sistemático"
 
 #: ../gui/wxpython/rlisetup/wizard.py:1355
@@ -38043,6 +38646,7 @@ msgstr "Qual número de unidades de amostragem usar?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -38135,6 +38739,11 @@ msgstr "Qual número de unidades de amostragem usar?"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1322
 msgid "Insert number of row strates"
@@ -38172,6 +38781,7 @@ msgstr "Definir janelas móveis"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -38263,6 +38873,11 @@ msgstr "Definir janelas móveis"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1451
 msgid "Insert number of row strates"
@@ -38303,6 +38918,7 @@ msgstr "Desenhar unidades de amostragem"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38340,6 +38956,8 @@ msgstr "Desenhar unidades de amostragem"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1624
 msgid "Number of sampling area to draw:"
@@ -38368,6 +38986,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -38397,6 +39016,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 #: ../gui/wxpython/rlisetup/wizard.py:1469
 msgid "Number of sampling area to draw:"
@@ -38416,6 +39037,7 @@ msgstr "Número da área de amostragem a ser desenhada:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38475,6 +39097,9 @@ msgstr "Número da área de amostragem a ser desenhada:"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1566
 msgid "Draw Sampling "
@@ -38515,6 +39140,7 @@ msgstr "Selecione a área de amostra"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -38606,6 +39232,11 @@ msgstr "Selecione a área de amostra"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1865
 #: ../gui/wxpython/rlisetup/functions.py:156
@@ -38637,6 +39268,7 @@ msgstr "O mapa raster <%s> já existe. Remova ou renomeie os mapas com o prefixo
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -38728,6 +39360,11 @@ msgstr "O mapa raster <%s> já existe. Remova ou renomeie os mapas com o prefixo
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/wizard.py:1920
 #: ../gui/wxpython/rlisetup/functions.py:140
@@ -38897,6 +39534,7 @@ msgstr "ATENÇÃO: "
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -38988,6 +39626,11 @@ msgstr "ATENÇÃO: "
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -39067,6 +39710,7 @@ msgstr "Defina o novo nome para o arquivo de configuração %s \"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -39158,6 +39802,11 @@ msgstr "Defina o novo nome para o arquivo de configuração %s \"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/rlisetup/frame.py:279
 msgid "Rename configuration file"
@@ -39179,6 +39828,7 @@ msgstr "Renomear arquivo de configuração"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -39220,6 +39870,8 @@ msgstr "Renomear arquivo de configuração"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:125 ../gui/wxpython/lmgr/frame.py:109
 msgid "GRASS GIS"
@@ -39252,6 +39904,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39324,6 +39977,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:484
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:430 ../gui/wxpython/lmgr/frame.py:483
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 #, python-brace-format
@@ -39424,6 +40082,7 @@ msgstr "Área: {area} {unit}\n"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -39464,6 +40123,8 @@ msgstr "Área: {area} {unit}\n"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/main_window/frame.py:526
@@ -39486,6 +40147,7 @@ msgstr "Fechar Exibição do Mapa {}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39539,6 +40201,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/mapwin/decorations.py:183
 #: ../gui/wxpython/mapwin/decorations.py:297
@@ -39578,6 +40242,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39650,6 +40315,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:688 ../gui/wxpython/lmgr/frame.py:639
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:691 ../gui/wxpython/lmgr/frame.py:638
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "Console"
@@ -39675,6 +40345,7 @@ msgstr "Remover texto"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -39766,6 +40437,11 @@ msgstr "Remover texto"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798
 #, fuzzy
@@ -39786,6 +40462,7 @@ msgstr "Deslizar a Tela"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39818,6 +40495,8 @@ msgstr "Deslizar a Tela"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850
 msgid "Choose model to run"
 msgstr "Escolha o modelo para rodar"
@@ -39837,6 +40516,7 @@ msgstr "Escolha o modelo para rodar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39869,6 +40549,8 @@ msgstr "Escolha o modelo para rodar"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:952 ../gui/wxpython/lmgr/frame.py:849
 msgid "Choose model to run"
 msgstr "Escolha o modelo para rodar"
@@ -40072,6 +40754,7 @@ msgstr "Substituir arquivo?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40118,6 +40801,9 @@ msgstr "Substituir arquivo?"
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -40350,6 +41036,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40422,6 +41109,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2449 ../gui/wxpython/lmgr/frame.py:2355
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2413 ../gui/wxpython/lmgr/frame.py:2341
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "Constrain map to region geometry?"
@@ -40528,6 +41220,7 @@ msgstr "Nenhum arquivo gerado."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40556,6 +41249,8 @@ msgstr "Nenhum arquivo gerado."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/wxplot/profile.py:416
 msgid "Statistics for Profile(s)"
@@ -40569,6 +41264,7 @@ msgstr "Estatísticas para Perfil(is)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 033a57360f (libpython: Save and load benchmark results (#1711))
 
 <<<<<<< HEAD
@@ -40657,6 +41353,10 @@ msgstr "Estatísticas para Perfil(is)"
 >>>>>>> osgeo-main
 =======
 
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:55
@@ -40707,6 +41407,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40759,6 +41460,9 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/layertree.py:72
 msgid "Add grid layer"
@@ -41320,6 +42024,7 @@ msgstr "Configurações de plotagem salvas no arquivo '%s'."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -41360,6 +42065,8 @@ msgstr "Configurações de plotagem salvas no arquivo '%s'."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/lmgr/toolbars.py:93
@@ -41402,6 +42109,7 @@ msgstr "Gerente de classe"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -41442,6 +42150,8 @@ msgstr "Gerente de classe"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/lmgr/toolbars.py:107
@@ -45708,6 +46418,7 @@ msgstr "Gerenciador de tabela de atributos"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 msgid "Launch Data Catalog."
@@ -45759,6 +46470,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 #, fuzzy
 msgid "Delete map layer"
@@ -45781,6 +46494,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -45810,6 +46524,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Launch Data Catalog."
 msgstr ""
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -45827,6 +46543,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -45869,6 +46586,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/toolbars.py:203
 msgid "Start new map display"
@@ -45901,6 +46620,7 @@ msgid "Interactive editing and digitization of vector maps."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -45992,6 +46712,11 @@ msgid "Interactive editing and digitization of vector maps."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/lmgr/toolbars.py:215 ../gui/wxpython/lmgr/pyshell.py:80
@@ -46366,6 +47091,7 @@ msgstr "A location chamada <%s> já existe, download cancelado"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -46406,6 +47132,8 @@ msgstr "A location chamada <%s> já existe, download cancelado"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/lmgr/pyshell.py:50
@@ -46466,6 +47194,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -46502,6 +47231,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Download failed: %s"
 msgstr "Falha no download: %s"
 
@@ -46529,6 +47260,7 @@ msgstr "A location chamada <%s> já existe, renomeie primeiro"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Location Download"
 msgstr ""
 =======
@@ -46600,6 +47332,10 @@ msgstr ""
 msgid "Location Download"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Location Download"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/locdownload.py:611
 msgid "Do you want to cancel location download?"
@@ -46624,6 +47360,7 @@ msgstr "Abortar download"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Invalid mapset name"
 msgstr ""
 =======
@@ -46695,6 +47432,10 @@ msgstr ""
 msgid "Invalid mapset name"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Invalid mapset name"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:106
 msgid "Invalid location name"
@@ -46725,6 +47466,7 @@ msgstr "Nome para o novo mapset:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Unable to create new mapset: {}"
 msgstr ""
 =======
@@ -46796,6 +47538,10 @@ msgstr ""
 msgid "Unable to create new mapset: {}"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Unable to create new mapset: {}"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:212
 #, fuzzy
@@ -46823,6 +47569,7 @@ msgstr "Importar dados?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -46879,6 +47626,9 @@ msgstr "Importar dados?"
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/workspace.py:72
 msgid ""
@@ -47151,6 +47901,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "A importação de <%(name)s> falhou.\n"
 "Razão:%(msg)s"
 =======
@@ -47194,6 +47945,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Leitura do arquivo de área de trabalho <%s> falhou.\n"
 "Arquivo inválido, não consegui verificar documento XML."
 =======
@@ -47214,6 +47967,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -47243,6 +47997,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 "A importação de <%(name)s> falhou.\n"
 "Razão:%(msg)s"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -47260,6 +48016,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -47302,6 +48059,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/workspace.py:191
 msgid "Please wait, loading workspace..."
@@ -47355,6 +48114,7 @@ msgstr "Arquivo de dados <%(name)s> importado com sucesso. A região padrão do
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -47477,6 +48237,14 @@ msgstr "Arquivo de dados <%(name)s> importado com sucesso. A região padrão do
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
+<<<<<<< HEAD
+#: ../gui/wxpython/lmgr/frame.py:141
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+
 <<<<<<< HEAD
 #: ../gui/wxpython/lmgr/frame.py:141
 =======
@@ -47526,6 +48294,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -47558,6 +48327,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -47575,6 +48346,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -47640,6 +48412,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 <<<<<<< HEAD
@@ -47678,6 +48452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "Location atual é <%(loc)s>.\n"
 "Mapset atual é <%(mapset)s>."
@@ -47761,6 +48536,8 @@ msgstr "Codificação {enc} incorreta usada. Defina a codificação em Configura
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:743
 #, python-format
@@ -47799,6 +48576,7 @@ msgstr "Codificação {enc} incorreta usada. Defina a codificação em Configura
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
@@ -47845,6 +48623,8 @@ msgstr "Codificação {enc} incorreta usada. Defina a codificação em Configura
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/manager.py:144
 msgid "Manage layers"
@@ -47864,6 +48644,7 @@ msgstr "Gerenciar camadas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -47936,6 +48717,11 @@ msgstr "Gerenciar camadas"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/manager.py:155
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/manager.py:154
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "Close Attribute Table Manager"
@@ -47961,6 +48747,7 @@ msgstr "Limite de visualização: 100000 registros."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -48052,6 +48839,11 @@ msgstr "Limite de visualização: 100000 registros."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/manager.py:157
 msgid "Reload currently selected attribute data"
@@ -48163,6 +48955,7 @@ msgid "Slope steepness of 3D line"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -48592,6 +49385,8 @@ msgid "Set SQL statement to default"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/dbmgr/base.py:511
@@ -49119,6 +49914,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -49191,6 +49987,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -49217,6 +50018,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -49263,6 +50065,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -49316,6 +50121,7 @@ msgstr "Limite de visualização: 100000 registros."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -49388,6 +50194,11 @@ msgstr "Limite de visualização: 100000 registros."
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:392
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:385
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 msgid "Unknown value"
@@ -49680,6 +50491,7 @@ msgstr "Procurar nos dados"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -49711,6 +50523,8 @@ msgstr "Procurar nos dados"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/manager.py:123
 msgid "Manage tables"
@@ -49747,6 +50561,7 @@ msgstr "Recarregar todos os dados de atributos (descartar a seleção atual)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -49809,6 +50624,8 @@ msgstr "Recarregar todos os dados de atributos (descartar a seleção atual)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 
 #: ../gui/wxpython/dbmgr/base.py:2672
@@ -50005,6 +50822,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "Você deseja criar uma nova tabela de atributos e definir um link para o mapa vetorial <%s>?"
 =======
 <<<<<<< HEAD
@@ -50047,6 +50865,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Você deseja criar uma nova tabela de atributos e definir um link para o mapa "
 "vetorial <%s>?"
 =======
@@ -50066,6 +50886,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "Você deseja criar uma nova tabela de atributos e definir um link para o mapa vetorial <%s>?"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -50149,6 +50970,11 @@ msgstr ""
 "Você deseja criar uma nova tabela de atributos e definir um link para o mapa vetorial <%s>?"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"Você deseja criar uma nova tabela de atributos e definir um link para o mapa vetorial <%s>?"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/dialogs.py:85
 msgid "Create table?"
@@ -50177,6 +51003,7 @@ msgstr "Nenhum atributo encontrado"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -50295,6 +51122,11 @@ msgstr "Mostrar atributos"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/dialogs.py:121
 msgid "Define attributes"
@@ -50317,6 +51149,7 @@ msgstr "Mostrar atributos"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
@@ -50363,6 +51196,8 @@ msgstr "Mostrar atributos"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/dialogs.py:128
 msgid "Define attributes"
@@ -50579,6 +51414,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -50651,6 +51487,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -50937,6 +51778,7 @@ msgstr "Arquivos"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -50983,6 +51825,9 @@ msgstr "Arquivos"
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -51718,6 +52563,7 @@ msgstr "&Anterior"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 #: ../gui/wxpython/gui_core/vselect.py:48
 msgid "category"
@@ -51837,6 +52683,11 @@ msgstr "O mapa vetorial <%s> foi criado"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/dialogs.py:1676
 msgid "Multiple raster maps"
@@ -52361,6 +53212,7 @@ msgstr "Código EPSG:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -52523,6 +53375,16 @@ msgstr "Código EPSG:"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
+<<<<<<< HEAD
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+>>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+
 <<<<<<< HEAD
 #: ../gui/wxpython/animation/provider.py:444
 =======
@@ -52553,6 +53415,7 @@ msgstr "String PROJ (obrigatório):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 #: ../gui/wxpython/gui_core/preferences.py:1756
 msgid "EPSG file:"
@@ -52641,6 +53504,11 @@ msgstr "Arquivo EPSG:"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/provider.py:562
 msgid "Overlaying map layers"
@@ -52661,6 +53529,7 @@ msgstr "Sobrepondo camadas do mapa"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -52808,6 +53677,16 @@ msgstr "Carregue os códigos EPSG (seja paciente), digite o código EPSG ou insi
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+#: ../gui/wxpython/animation/provider.py:789
+=======
+#: ../gui/wxpython/gui_core/preferences.py:1773
+msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string directly."
+msgstr "Carregue os códigos EPSG (seja paciente), digite o código EPSG ou insira a seqüência PROJ diretamente."
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gui_core/preferences.py:1781
 msgid "&Load EPSG codes"
@@ -53333,6 +54212,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "&Run..."
 msgstr ""
 =======
@@ -53404,6 +54284,10 @@ msgstr ""
 msgid "&Run..."
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "&Run..."
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gui_core/menu.py:165
 msgid "Run selected module from the tree"
@@ -53561,6 +54445,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -53607,6 +54492,9 @@ msgstr ""
 =======
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
 #, python-brace-format
 <<<<<<< HEAD
 msgid "The {map_type} map {map_name} exists. Do you want to overwrite?"
@@ -53630,6 +54518,7 @@ msgstr "O diretório {t} não foi removido."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -53702,6 +54591,11 @@ msgstr "O diretório {t} não foi removido."
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/frame.py:50
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/frame.py:49
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Animation Tool"
@@ -53727,6 +54621,7 @@ msgstr "Transformando <%s>..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -53763,6 +54658,8 @@ msgstr "Transformando <%s>..."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
 #: ../gui/wxpython/animation/frame.py:193
@@ -53802,6 +54699,7 @@ msgstr "Transformando <%s>..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -53838,6 +54736,8 @@ msgstr "Transformando <%s>..."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gcp/manager.py:1790
 #: ../gui/wxpython/image2target/ii2t_manager.py:1706
@@ -54223,6 +55123,7 @@ msgstr "Pontos insuficientes para linha"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Vector Digitizer - GRASS GIS"
 msgstr ""
 =======
@@ -54294,6 +55195,10 @@ msgstr ""
 msgid "Vector Digitizer - GRASS GIS"
 msgstr ""
 >>>>>>> osgeo-main
+=======
+msgid "Vector Digitizer - GRASS GIS"
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/vdigit/g.gui.vdigit.py:83
 #, python-format
@@ -56850,6 +57755,7 @@ msgstr "rótulos:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -56965,6 +57871,8 @@ msgstr "Exporta uma camada de mapa vetorial para qualquer um dos formatos vetori
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 #~ msgid "Digitize"
 #~ msgstr "Digitalizar"
@@ -57158,6 +58066,7 @@ msgstr "Clique duas vezes ou Ctrl-Enter para executar o módulo selecionado"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -57445,6 +58354,16 @@ msgstr "Digitalizador vetorial do GRASS GIS"
 msgid "GRASS GIS Animation tool"
 msgstr "Ferramenta de Animação GRASS GIS"
 
+>>>>>>> osgeo-main
+=======
+
+=======
+msgid "GRASS GIS Vector Digitizer"
+msgstr "Digitalizador vetorial do GRASS GIS"
+
+msgid "GRASS GIS Animation tool"
+msgstr "Ferramenta de Animação GRASS GIS"
+
 >>>>>>> osgeo-main
 msgid "Start region:"
 msgstr "Região de partida:"
@@ -57554,6 +58473,7 @@ msgstr "Deslizar a Tela GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -57691,6 +58611,8 @@ msgstr "Deslizar a Tela GRASS GIS"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Allocates subnets for nearest centers (direction from center). center "
 #~ "node must be opened (costs >= 0). Costs of center node are used in "
@@ -57736,6 +58658,7 @@ msgstr "Deslizar a Tela GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -57765,6 +58688,8 @@ msgstr "Deslizar a Tela GRASS GIS"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Allocates subnets for nearest centers (direction from center). center node must be opened (costs >= 0). Costs of center node are used in calculation"
 msgstr "Aloca sub-redes para os centros mais próximos (direção do centro). o nó central deve ser aberto (custos >= 0). Os custos do nó central são usados ​​no cálculo"
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -57782,6 +58707,7 @@ msgstr "Aloca sub-redes para os centros mais próximos (direção do centro). o
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -57811,6 +58737,8 @@ msgstr "Aloca sub-redes para os centros mais próximos (direção do centro). o
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Allocates subnets for nearest centers (direction from center). center node must be opened (costs >= 0). Costs of center node are used in calculation"
 msgstr "Aloca sub-redes para os centros mais próximos (direção do centro). o nó central deve ser aberto (custos >= 0). Os custos do nó central são usados ​​no cálculo"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -57828,6 +58756,7 @@ msgstr "Aloca sub-redes para os centros mais próximos (direção do centro). o
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -57868,6 +58797,8 @@ msgstr "Aloca sub-redes para os centros mais próximos (direção do centro). o
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Splits net 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 a rede por isolinhas de custo. Divide a rede em bandas entre as isolinhas de custo (direção do centro). O nó central deve ser aberto (custos >= 0). Os custos do nó central são usados ​​no cálculo."
@@ -57887,6 +58818,7 @@ msgstr "Anexa, exclui ou relata categorias de vetores para mapear a geometria."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 033a57360f (libpython: Save and load benchmark results (#1711))
 =======
 >>>>>>> osgeo-main
@@ -58000,6 +58932,8 @@ msgstr "Registra mapas raster, vetoriais e raster3d em conjuntos de dados de esp
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Creates a Voronoi diagram in current region from an input vector map containing points or centroids."
 msgstr "Cria um diagrama de Voronoi na região atual de um mapa vetorial de entrada contendo pontos ou centroides."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58023,6 +58957,7 @@ msgstr "Relatórios e estatísticas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -58087,6 +59022,8 @@ msgstr "Relatórios e estatísticas"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Registers raster, vector and raster3d maps in a space time datasets."
 <<<<<<< HEAD
 #~ msgstr ""
@@ -58109,6 +59046,7 @@ msgstr "Relatórios e estatísticas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -58138,6 +59076,8 @@ msgstr "Relatórios e estatísticas"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Registers raster, vector and raster3d maps in a space time datasets."
 msgstr "Registra mapas raster, vetoriais e raster3d em conjuntos de dados de espaço-tempo."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58155,6 +59095,7 @@ msgstr "Registra mapas raster, vetoriais e raster3d em conjuntos de dados de esp
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -58184,6 +59125,8 @@ msgstr "Registra mapas raster, vetoriais e raster3d em conjuntos de dados de esp
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Registers raster, vector and raster3d maps in a space time datasets."
 msgstr "Registra mapas raster, vetoriais e raster3d em conjuntos de dados de espaço-tempo."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -58201,6 +59144,7 @@ msgstr "Registra mapas raster, vetoriais e raster3d em conjuntos de dados de esp
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58249,6 +59193,8 @@ msgstr "Registra mapas raster, vetoriais e raster3d em conjuntos de dados de esp
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Documents"
 msgstr "Documentos"
@@ -58316,6 +59262,7 @@ msgstr "Definir o banco de dados GRASS e o Nome da Location"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 msgid "This option allows setting default computation region immediately after new location is created. Default computation region can be defined later using g.region based on imported data."
@@ -58368,6 +59315,8 @@ msgstr "Esta opção permite definir a região de computação padrão imediatam
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "This option allows setting default computation region immediately after "
 #~ "new location is created. Default computation region can be defined later "
@@ -58394,6 +59343,7 @@ msgstr "Esta opção permite definir a região de computação padrão imediatam
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -58423,6 +59373,8 @@ msgstr "Esta opção permite definir a região de computação padrão imediatam
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "This option allows setting default computation region immediately after new location is created. Default computation region can be defined later using g.region based on imported data."
 msgstr "Esta opção permite definir a região de computação padrão imediatamente após a criação da nova location. A região de computação padrão pode ser definida posteriormente usando g.region com base nos dados importados."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58440,6 +59392,7 @@ msgstr "Esta opção permite definir a região de computação padrão imediatam
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -58469,6 +59422,8 @@ msgstr "Esta opção permite definir a região de computação padrão imediatam
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "This option allows setting default computation region immediately after new location is created. Default computation region can be defined later using g.region based on imported data."
 msgstr "Esta opção permite definir a região de computação padrão imediatamente após a criação da nova location. A região de computação padrão pode ser definida posteriormente usando g.region com base nos dados importados."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -58486,6 +59441,7 @@ msgstr "Esta opção permite definir a região de computação padrão imediatam
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58534,6 +59490,8 @@ msgstr "Esta opção permite definir a região de computação padrão imediatam
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Create user mapset"
 msgstr "Criar mapset do usuário"
@@ -58564,6 +59522,7 @@ msgstr "Título da Location"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58605,6 +59564,8 @@ msgstr "Título da Location"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Optional location title, you can leave this field blank."
 <<<<<<< HEAD
 #~ msgstr ""
@@ -58638,6 +59599,7 @@ msgstr "Título da Location"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -58755,6 +59717,11 @@ msgstr "Escolha o método para criar uma nova location"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Optional location title, you can leave this field blank."
 msgstr "Título da location é opcional, você pode deixar este campo em branco."
 
@@ -58769,6 +59736,7 @@ msgstr "Título da location é opcional, você pode deixar este campo em branco.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
@@ -58821,6 +59789,8 @@ msgstr "Título da location é opcional, você pode deixar este campo em branco.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 476ef44553 (libpython: Save and load benchmark results (#1711))
 #~ msgid "Unable to create location"
 #~ msgstr "Não foi possível criar location"
@@ -58840,6 +59810,7 @@ msgstr "Nome <%(name)s> não é um nome válido para location. Use apenas caract
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58863,6 +59834,8 @@ msgstr "Nome <%(name)s> não é um nome válido para location. Use apenas caract
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58880,6 +59853,7 @@ msgstr "Nome <%(name)s> não é um nome válido para location. Use apenas caract
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58914,6 +59888,8 @@ msgstr "Nome <%(name)s> não é um nome válido para location. Use apenas caract
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Unable to create location"
 msgstr "Não foi possível criar location"
@@ -58933,6 +59909,7 @@ msgstr "Escolha o método para criar uma nova location"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -58965,6 +59942,8 @@ msgstr "Escolha o método para criar uma nova location"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Select EPSG code of spatial reference system"
 msgstr "Selecione o código EPSG do sistema de referência espacial"
 
@@ -58985,6 +59964,7 @@ msgstr "Selecione o código EPSG do sistema de referência espacial"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -59026,6 +60006,8 @@ msgstr "Selecione o código EPSG do sistema de referência espacial"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Read projection and datum terms from a georeferenced data file"
 <<<<<<< HEAD
 #~ msgstr ""
@@ -59049,6 +60031,7 @@ msgstr "Selecione o código EPSG do sistema de referência espacial"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59072,6 +60055,8 @@ msgstr "Selecione o código EPSG do sistema de referência espacial"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #~ msgid "Read projection and datum terms from a Well Known Text (WKT) .prj file"
 #~ msgstr "Leia os termos de projeção e dado de um arquivo Well Known Text (WKT) .prj"
@@ -59083,6 +60068,7 @@ msgstr "Selecione o código EPSG do sistema de referência espacial"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 033a57360f (libpython: Save and load benchmark results (#1711))
 =======
 >>>>>>> osgeo-main
@@ -59230,6 +60216,14 @@ msgstr "Leia os termos de projeção e dado de um arquivo de dados georreferenci
 msgid "Read projection and datum terms from a georeferenced data file"
 msgstr "Leia os termos de projeção e dado de um arquivo de dados georreferenciados"
 
+>>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+msgid "Read projection and datum terms from a georeferenced data file"
+msgstr "Leia os termos de projeção e dado de um arquivo de dados georreferenciados"
+
 >>>>>>> osgeo-main
 msgid "Read projection and datum terms from a Well Known Text (WKT) .prj file"
 msgstr "Leia os termos de projeção e dado de um arquivo Well Known Text (WKT) .prj"
@@ -59248,6 +60242,7 @@ msgstr "Leia os termos de projeção e dado de um arquivo Well Known Text (WKT)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -59301,6 +60296,8 @@ msgstr "Leia os termos de projeção e dado de um arquivo Well Known Text (WKT)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Select coordinate system parameters from a list"
 msgstr "Selecione os parâmetros do sistema de coordenadas de uma lista"
 
@@ -59321,6 +60318,7 @@ msgstr "Selecione os parâmetros do sistema de coordenadas de uma lista"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Specify projection and datum terms using custom PROJ.4 parameters"
 msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 personalizados"
 =======
@@ -59364,6 +60362,8 @@ msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 person
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Specify projection and datum terms using custom PROJ.4 parameters"
 <<<<<<< HEAD
 #~ msgstr ""
@@ -59386,6 +60386,7 @@ msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 person
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -59415,6 +60416,8 @@ msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 person
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Specify projection and datum terms using custom PROJ.4 parameters"
 msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 personalizados"
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -59432,6 +60435,7 @@ msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 person
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -59461,6 +60465,8 @@ msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 person
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Specify projection and datum terms using custom PROJ.4 parameters"
 msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 personalizados"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59478,6 +60484,7 @@ msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 person
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59526,6 +60533,8 @@ msgstr "Especifique termos de projeção e dado usando parâmetros PROJ.4 person
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Create a generic Cartesian coordinate system (XY)"
 msgstr "Crie um sistema de coordenadas cartesianas genérico (XY)"
@@ -59571,6 +60580,7 @@ msgstr "Escolha o arquivo de códigos EPSG"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Choose method of specifying georeferencing parameters"
 msgstr "Escolha o método de especificação de parâmetros de georreferenciamento"
 =======
@@ -59614,6 +60624,8 @@ msgstr "Escolha o método de especificação de parâmetros de georreferenciamen
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Choose method of specifying georeferencing parameters"
 <<<<<<< HEAD
 #~ msgstr ""
@@ -59635,6 +60647,7 @@ msgstr "Escolha o método de especificação de parâmetros de georreferenciamen
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -59664,6 +60677,8 @@ msgstr "Escolha o método de especificação de parâmetros de georreferenciamen
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Choose method of specifying georeferencing parameters"
 msgstr "Escolha o método de especificação de parâmetros de georreferenciamento"
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -59681,6 +60696,7 @@ msgstr "Escolha o método de especificação de parâmetros de georreferenciamen
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -59710,6 +60726,8 @@ msgstr "Escolha o método de especificação de parâmetros de georreferenciamen
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Choose method of specifying georeferencing parameters"
 msgstr "Escolha o método de especificação de parâmetros de georreferenciamento"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59727,6 +60745,7 @@ msgstr "Escolha o método de especificação de parâmetros de georreferenciamen
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59775,6 +60794,8 @@ msgstr "Escolha o método de especificação de parâmetros de georreferenciamen
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "Location Title:"
 msgstr "Título da Location:"
@@ -59809,6 +60830,7 @@ msgstr "Assistente de location cancelado. A location não foi criada."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 msgid "Location <%(loc)s> will be created in GIS data directory <%(dir)s>. You will need to change the default GIS data directory in the GRASS startup screen."
@@ -59861,6 +60883,8 @@ msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Location <%(loc)s> will be created in GIS data directory <%(dir)s>. You "
 #~ "will need to change the default GIS data directory in the GRASS startup "
@@ -59887,6 +60911,7 @@ msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -59916,6 +60941,8 @@ msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>.
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Location <%(loc)s> will be created in GIS data directory <%(dir)s>. You will need to change the default GIS data directory in the GRASS startup screen."
 msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>. Você precisará alterar o diretório de dados GIS padrão na tela de inicialização do GRASS."
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -59933,6 +60960,7 @@ msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -59962,6 +60990,8 @@ msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>.
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Location <%(loc)s> will be created in GIS data directory <%(dir)s>. You will need to change the default GIS data directory in the GRASS startup screen."
 msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>. Você precisará alterar o diretório de dados GIS padrão na tela de inicialização do GRASS."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59979,6 +61009,7 @@ msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -60027,6 +61058,8 @@ msgstr "A location <%(loc)s> será criada no diretório de dados GIS <%(dir)s>.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 msgid "New GIS data directory"
 msgstr "Novo diretório de dados GIS"
@@ -60054,6 +61087,7 @@ msgstr "Clique aqui para mostrar o mecanismo do módulo de pesquisa"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 msgid "Click here to hide search module engine"
 msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 =======
@@ -60097,6 +61131,8 @@ msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Click here to hide search module engine"
 #~ msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 <<<<<<< HEAD
@@ -60143,6 +61179,7 @@ msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -60172,6 +61209,8 @@ msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Click here to hide search module engine"
 msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -60189,6 +61228,7 @@ msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -60218,6 +61258,8 @@ msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Click here to hide search module engine"
 msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -60235,6 +61277,7 @@ msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -60283,3 +61326,5 @@ msgstr "Clique aqui para ocultar o mecanismo do módulo de pesquisa"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_ro.po b/locale/po/grasswxpy_ro.po
index 1d96087a51e..45941aa2e14 100644
--- a/locale/po/grasswxpy_ro.po
+++ b/locale/po/grasswxpy_ro.po
@@ -18366,6 +18366,7 @@ msgstr "Introduceți valorile de categorie raster sau procente"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18400,6 +18401,8 @@ msgstr "Introduceți valorile de categorie raster sau procente"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/colorrules.py:983
 #: ../gui/wxpython/modules/colorrules.py:1685
 #: ../gui/wxpython/modules/colorrules.py:1691
@@ -18423,6 +18426,7 @@ msgid "Change"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18452,6 +18456,8 @@ msgid "Change"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/gmodeler/frame.py:450 ../gui/wxpython/gmodeler/frame.py:600
 msgid "Create new model?"
 msgstr "Creați model nou?"
@@ -18771,6 +18777,7 @@ msgid "This option is required"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18808,6 +18815,8 @@ msgid "This option is required"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -18967,6 +18976,7 @@ msgid "Select CRS from a list"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -19017,6 +19027,9 @@ msgid "Select CRS from a list"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:1514
@@ -19034,6 +19047,7 @@ msgid "Filter by EPSG code or description:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19071,6 +19085,8 @@ msgid "Filter by EPSG code or description:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -19100,6 +19116,7 @@ msgid "Find more information at:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -19150,6 +19167,9 @@ msgid "Find more information at:"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:1531
@@ -19175,6 +19195,7 @@ msgid "Unable to read EPGS codes: {0}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19212,6 +19233,8 @@ msgid "Unable to read EPGS codes: {0}"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -21876,6 +21899,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -21967,6 +21991,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Histogram Tool  [d.histogram]"
 msgstr ""
 
@@ -22352,6 +22381,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22443,6 +22473,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
 msgid "3D Raster Map Calculator"
@@ -23458,6 +23493,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23549,6 +23585,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -23655,6 +23696,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23733,6 +23775,11 @@ msgid "Text properties"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:921 ../gui/wxpython/lmgr/frame.py:798
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:900 ../gui/wxpython/lmgr/frame.py:797
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -23756,6 +23803,7 @@ msgid "Text properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -23802,6 +23850,9 @@ msgid "Text properties"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:226
@@ -23819,6 +23870,7 @@ msgid "Remove scale bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23865,6 +23917,8 @@ msgid "Remove scale bar"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -23886,6 +23940,7 @@ msgstr "Alege model pentru a rula"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23958,6 +24013,11 @@ msgstr "Alege model pentru a rula"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -24153,6 +24213,7 @@ msgstr "Suprascrieți fișierul?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24199,6 +24260,9 @@ msgstr "Suprascrieți fișierul?"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -24410,6 +24474,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24482,6 +24547,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:2352 ../gui/wxpython/lmgr/frame.py:2242
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2316 ../gui/wxpython/lmgr/frame.py:2228
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Do you want to remove selected map layer(s) from layer tree?"
@@ -29230,6 +29300,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29302,6 +29373,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:1085
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1047
 =======
 #: ../gui/wxpython/startup/locdownload.py:563
@@ -29567,6 +29643,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29613,6 +29690,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "%s <%s> already exists in the current mapset. Do you want to overwrite it?"
@@ -29637,6 +29717,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29709,6 +29790,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/layertree.py:1105
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/layertree.py:1067
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -29964,6 +30050,7 @@ msgstr "Harta vectorială <%s> adăugată"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30055,6 +30142,11 @@ msgstr "Harta vectorială <%s> adăugată"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Current workspace is not empty. Do you want to store current settings to "
 "workspace file?"
@@ -30076,6 +30168,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -30117,6 +30210,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Spațiul de lucru curent nu este gol. Doriți să stocați setările curente "
 "pentru fișierul din spațiul de lucru?"
 =======
@@ -30135,6 +30230,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -30204,6 +30300,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/workspace.py:76
 msgid "Create new workspace?"
@@ -30433,6 +30533,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30465,6 +30566,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:507 ../gui/wxpython/dbmgr/base.py:1257
 #: ../gui/wxpython/dbmgr/base.py:1283
 =======
@@ -30481,6 +30584,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30513,6 +30617,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:505 ../gui/wxpython/dbmgr/base.py:1248
 #: ../gui/wxpython/dbmgr/base.py:1274
 =======
@@ -30548,6 +30654,7 @@ msgstr "Aplică declarația SELECT și reîncarcă datele înregistrate"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30594,6 +30701,9 @@ msgstr "Aplică declarația SELECT și reîncarcă datele înregistrate"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Example: %s"
 msgstr "Examplu: %s"
@@ -31160,6 +31270,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31232,6 +31343,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/dialogs.py:80
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:79
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:133
@@ -31406,6 +31522,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31452,6 +31569,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "No attribute table found.\n"
@@ -31718,6 +31838,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31790,6 +31911,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -32076,6 +32202,7 @@ msgstr "Fișiere"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32122,6 +32249,9 @@ msgstr "Fișiere"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr ""
@@ -32671,6 +32801,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32743,6 +32874,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/dialogs.py:105
@@ -33345,6 +33481,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33391,6 +33528,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
@@ -35431,6 +35571,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
@@ -35466,6 +35607,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Location Name:"
 #~ msgstr "Numele locației:"
 
@@ -35493,6 +35636,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -35570,6 +35714,11 @@ msgstr ""
 <<<<<<< HEAD
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+<<<<<<< HEAD
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #~ msgid "Show comp. extent"
 #~ msgstr "Afișează gama"
 =======
@@ -35591,6 +35740,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35627,6 +35777,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
 #~ msgid "Display mode"
@@ -35673,6 +35825,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35709,6 +35862,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #, fuzzy
 #~ msgid "Unable to display the map"
@@ -36474,6 +36629,7 @@ msgstr "(doar citire)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36506,6 +36662,8 @@ msgstr "(doar citire)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Unable to create location"
 #~ msgstr "Nu s-a putut crea locația"
 =======
@@ -36522,6 +36680,7 @@ msgstr "(doar citire)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36554,6 +36713,8 @@ msgstr "(doar citire)"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid ""
 #~ "Name <%(name)s> is not a valid name for location. Please use only ASCII "
 #~ "characters excluding %(chars)s and space."
@@ -36580,6 +36741,7 @@ msgstr "Nu s-a putut crea locația"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36626,6 +36788,9 @@ msgstr "Nu s-a putut crea locația"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Select EPSG code of spatial reference system"
 msgstr "Selectați codul EPSG a sistemului de referință spațial"
@@ -36677,6 +36842,7 @@ msgstr "Creați locație nouă?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -36706,6 +36872,8 @@ msgstr "Creați locație nouă?"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Numeric column:"
 msgstr "Coloană numerică:"
 
@@ -37208,6 +37376,7 @@ msgstr "Creați locație nouă?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -37267,3 +37436,6 @@ msgstr "Creați locație nouă?"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_ru.po b/locale/po/grasswxpy_ru.po
index d2ea694cf7f..5ce7573e805 100644
--- a/locale/po/grasswxpy_ru.po
+++ b/locale/po/grasswxpy_ru.po
@@ -29,6 +29,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -61,6 +62,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 =======
@@ -77,6 +80,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -109,6 +113,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -7815,6 +7821,7 @@ msgid "Text properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -7865,6 +7872,9 @@ msgid "Text properties"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:226
@@ -7882,6 +7892,7 @@ msgid "Remove scale bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7919,6 +7930,8 @@ msgid "Remove scale bar"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -7948,6 +7961,7 @@ msgid "Scale bar properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -7998,6 +8012,9 @@ msgid "Scale bar properties"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:239
@@ -8015,6 +8032,7 @@ msgid "Remove north arrow"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8052,6 +8070,8 @@ msgid "Remove north arrow"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -8140,6 +8160,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8186,6 +8207,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Space time dataset <%s> not found."
 msgstr "Пространственно-временной набор данных <%s> не найден."
@@ -13966,6 +13990,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/locdownload.py:563
 msgid "Location Download"
 msgstr ""
@@ -13996,6 +14021,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/locdownload.py:422
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:584
 =======
@@ -14012,6 +14039,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/startup/locdownload.py:422
@@ -14063,6 +14091,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/locdownload.py:415
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:583
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -14093,6 +14123,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -14122,6 +14153,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/locdownload.py:563
 msgid "Location Download"
 msgstr ""
@@ -14140,6 +14173,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14182,6 +14216,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/locdownload.py:447
 #, fuzzy
@@ -14217,6 +14253,7 @@ msgstr "Отмена загрузки"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:80
 msgid "Invalid mapset name"
 msgstr ""
@@ -14261,6 +14298,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:85
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Invalid mapset name"
@@ -14284,6 +14323,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -14313,6 +14353,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/guiutils.py:80
 msgid "Invalid mapset name"
 msgstr ""
@@ -14331,6 +14373,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14373,6 +14416,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:112
 #, fuzzy
@@ -14400,6 +14445,7 @@ msgstr "Имя для нового набора:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:186
 msgid "Unable to create new mapset: {}"
 =======
@@ -14441,6 +14487,8 @@ msgid "Unable to create new mapset: {}"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:134 ../gui/wxpython/menustrings.py:250
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:638
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:1042
@@ -14456,6 +14504,7 @@ msgid "Unable to create new mapset: {}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -14498,6 +14547,8 @@ msgid "Unable to create new mapset: {}"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:135 ../gui/wxpython/menustrings.py:250
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:637
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:1041
@@ -14525,6 +14576,7 @@ msgid "Unable to create new mapset: {}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/startup/guiutils.py:186
 msgid "Unable to create new mapset: {}"
@@ -14597,6 +14649,11 @@ msgid "Unable to create new mapset: {}"
 #: ../gui/wxpython/startup/guiutils.py:186
 msgid "Unable to create new mapset: {}"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/startup/guiutils.py:186
+msgid "Unable to create new mapset: {}"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/startup/guiutils.py:212
@@ -14620,6 +14677,7 @@ msgid "Import data?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14672,6 +14730,8 @@ msgid "Import data?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -14717,6 +14777,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:269
 msgid "Unable to rename selected mapset"
 msgstr ""
@@ -14747,6 +14808,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:234
 =======
 =======
@@ -14762,6 +14825,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/startup/guiutils.py:234
@@ -14810,6 +14874,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:235
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Unable to rename selected mapset"
@@ -14833,6 +14899,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -14862,6 +14929,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/guiutils.py:269
 msgid "Unable to rename selected mapset"
 msgstr ""
@@ -14880,6 +14949,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14922,6 +14992,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:245
 #: ../gui/wxpython/startup/guiutils.py:299
@@ -14948,6 +15020,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -14980,6 +15053,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:246
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:236
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:707
@@ -14997,6 +15072,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15029,6 +15105,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:247
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:235
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:706
@@ -15082,6 +15160,7 @@ msgstr "Ошибка"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -15114,6 +15193,8 @@ msgstr "Ошибка"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -15131,6 +15212,7 @@ msgstr "Ошибка"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -15196,6 +15278,8 @@ msgstr "Ошибка"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Unable to rename mapset.\n"
 "\n"
@@ -15218,6 +15302,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -15259,6 +15344,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Не удалось переименовать набор.\n"
 "\n"
 "{}"
@@ -15278,6 +15365,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -15347,6 +15435,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:284
 #, fuzzy, python-brace-format
@@ -15380,6 +15472,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:323
 msgid "Unable to rename selected location"
 msgstr ""
@@ -15424,6 +15517,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:288
 #, fuzzy
 msgid "Unable to rename selected project"
@@ -15440,6 +15535,7 @@ msgstr "Не удалось переименовать выбранный наб
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -15482,6 +15578,8 @@ msgstr "Не удалось переименовать выбранный наб
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:289
 msgid "Unable to rename selected location"
 msgstr "Не удалось переименовать выбранную область"
@@ -15519,6 +15617,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -15577,6 +15676,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/guiutils.py:323
 msgid "Unable to rename selected location"
 msgstr ""
@@ -15597,6 +15700,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -15656,6 +15760,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Unable to rename project.\n"
 "\n"
@@ -15678,6 +15785,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -15705,6 +15813,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Не удалось переименовать набор.\n"
 =======
 =======
@@ -15720,6 +15830,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 "Не удалось переименовать набор.\n"
@@ -15768,6 +15879,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Не удалось переименовать область.\n"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 "\n"
@@ -15788,6 +15901,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -15857,6 +15971,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:374
 #, python-brace-format
@@ -15890,6 +16008,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:414
 msgid "Unable to delete selected mapsets"
 msgstr ""
@@ -15934,6 +16053,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:378
 msgid "Unable to delete selected mapsets"
 msgstr "Не удалось удалить выбранные наборы"
@@ -15951,6 +16072,7 @@ msgstr "Не удалось удалить выбранные наборы"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -15993,6 +16115,8 @@ msgstr "Не удалось удалить выбранные наборы"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:379
 msgid "Unable to delete selected mapsets"
 msgstr "Не удалось удалить выбранные наборы"
@@ -16020,6 +16144,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -16078,6 +16203,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/guiutils.py:414
 msgid "Unable to delete selected mapsets"
 msgstr ""
@@ -16098,6 +16227,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16157,6 +16287,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Do you want to continue with deleting one or more of the following mapsets?\n"
@@ -16182,6 +16315,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 #: ../gui/wxpython/startup/guiutils.py:435
 msgid "Delete selected mapsets"
@@ -16226,6 +16360,8 @@ msgid "Delete selected mapsets"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Продолжить удаление одного или нескольких наборов?\n"
 "\n"
 "{deletes}\n"
@@ -16249,6 +16385,7 @@ msgstr "Удалить выбранные наборы"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16330,6 +16467,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:435
 msgid "Delete selected mapsets"
@@ -16352,6 +16491,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -16387,6 +16527,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:412
 msgid "Error when deleting mapsets"
@@ -16439,6 +16581,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:499
 msgid "Unable to delete selected locations"
 msgstr ""
@@ -16483,6 +16626,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:463
 #, fuzzy
 msgid "Unable to delete selected projects"
@@ -16502,6 +16647,7 @@ msgstr "Не удалось удалить выбранные наборы"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -16544,6 +16690,8 @@ msgstr "Не удалось удалить выбранные наборы"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:464
 msgid "Unable to delete selected locations"
 msgstr "Не удалось удалить выбранные области"
@@ -16570,6 +16718,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -16599,6 +16748,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/guiutils.py:499
 msgid "Unable to delete selected locations"
 msgstr ""
@@ -16619,6 +16770,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -16661,6 +16813,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid ""
@@ -16688,6 +16842,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -16715,6 +16870,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Продолжить удаление одного или нескольких наборов?\n"
 =======
 =======
@@ -16730,6 +16887,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 "Продолжить удаление одного или нескольких наборов?\n"
@@ -16778,6 +16936,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Продолжить удаление одной или нескольких из следующих областей?\n"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 "\n"
@@ -16814,6 +16974,7 @@ msgstr "Ошибка при удалении областей"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -16908,6 +17069,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:520
 msgid "Delete selected locations"
@@ -16934,6 +17099,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
@@ -16998,6 +17164,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:499
 #, fuzzy, python-brace-format
@@ -17046,6 +17214,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:572
 msgid "Unable to delete selected GRASS database"
 msgstr ""
@@ -17076,6 +17245,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:536
 =======
 =======
@@ -17091,6 +17262,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/startup/guiutils.py:536
@@ -17139,6 +17311,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:537
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Unable to delete selected GRASS database"
@@ -17162,6 +17336,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -17191,6 +17366,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/guiutils.py:572
 msgid "Unable to delete selected GRASS database"
 msgstr ""
@@ -17209,6 +17386,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17251,6 +17429,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:544
 #, python-brace-format
@@ -17284,6 +17464,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:585
 msgid "Delete selected GRASS database"
 =======
@@ -17313,6 +17494,8 @@ msgid "Delete selected GRASS database"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:549
 =======
 =======
@@ -17328,6 +17511,7 @@ msgid "Delete selected GRASS database"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/startup/guiutils.py:549
@@ -17376,6 +17560,8 @@ msgid "Delete selected GRASS database"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:550
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Delete selected GRASS database"
@@ -17397,6 +17583,7 @@ msgid "Delete selected GRASS database"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/startup/guiutils.py:585
 msgid "Delete selected GRASS database"
@@ -17469,6 +17656,11 @@ msgid "Delete selected GRASS database"
 #: ../gui/wxpython/startup/guiutils.py:585
 msgid "Delete selected GRASS database"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/startup/guiutils.py:585
+msgid "Delete selected GRASS database"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/startup/guiutils.py:597
@@ -17486,6 +17678,7 @@ msgid "Error when deleting GRASS database"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17532,6 +17725,8 @@ msgid "Error when deleting GRASS database"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -17598,6 +17793,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/startup/guiutils.py:641
 msgid "Mapset is in use"
 =======
@@ -17627,6 +17823,8 @@ msgid "Mapset is in use"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:603
 =======
 =======
@@ -17642,6 +17840,7 @@ msgid "Mapset is in use"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/startup/guiutils.py:603
@@ -17690,6 +17889,8 @@ msgid "Mapset is in use"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:604
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Mapset is in use"
@@ -17711,6 +17912,7 @@ msgid "Mapset is in use"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/startup/guiutils.py:641
 msgid "Mapset is in use"
@@ -17783,6 +17985,11 @@ msgid "Mapset is in use"
 #: ../gui/wxpython/startup/guiutils.py:641
 msgid "Mapset is in use"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/startup/guiutils.py:641
+msgid "Mapset is in use"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/startup/guiutils.py:653
@@ -17800,6 +18007,7 @@ msgid "Error when removing lock file"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -17846,6 +18054,8 @@ msgid "Error when removing lock file"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -18603,6 +18813,7 @@ msgstr "Номер категории"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18962,6 +19173,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/base.py:2369 ../gui/wxpython/dbmgr/dialogs.py:802
 msgid "Length"
@@ -19288,6 +19501,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -19366,6 +19580,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gcp/statusbar.py:52
 #: ../gui/wxpython/image2target/ii2t_statusbar.py:52
@@ -19856,6 +20075,7 @@ msgstr "Строки: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:56
 msgid "Attribute Table Manager - GRASS GIS"
 =======
@@ -19885,6 +20105,8 @@ msgid "Attribute Table Manager - GRASS GIS"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/dialogs.py:202
 #: ../gui/wxpython/location_wizard/dialogs.py:594
 =======
@@ -19901,6 +20123,7 @@ msgid "Attribute Table Manager - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/location_wizard/dialogs.py:202
@@ -19952,6 +20175,8 @@ msgid "Attribute Table Manager - GRASS GIS"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/dialogs.py:201
 #: ../gui/wxpython/location_wizard/dialogs.py:581
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -20133,6 +20358,7 @@ msgid "Attribute Table Manager - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:56
 msgid "Attribute Table Manager - GRASS GIS"
@@ -20207,6 +20433,11 @@ msgid "Attribute Table Manager - GRASS GIS"
 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:56
 msgid "Attribute Table Manager - GRASS GIS"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:56
+msgid "Attribute Table Manager - GRASS GIS"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/web_services/widgets.py:136
@@ -20224,6 +20455,7 @@ msgid " Requested data settings "
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -20261,6 +20493,8 @@ msgid " Requested data settings "
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -27654,6 +27888,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27705,6 +27940,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gui_core/preferences.py:1706
 msgid ""
@@ -27772,6 +28009,7 @@ msgstr "Файл EPSG:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27844,6 +28082,11 @@ msgstr "Файл EPSG:"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/gui_core/preferences.py:1873
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gui_core/preferences.py:1826
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid ""
@@ -27868,6 +28111,7 @@ msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string direc
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27959,6 +28203,11 @@ msgid "Load EPSG codes (be patient), enter EPSG code or insert PROJ string direc
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 "Загрузить коды EPSG (подождите), введите код EPSG или напрямую введите "
 "строку PROJ."
@@ -28379,6 +28628,7 @@ msgid "Do you want to quit GRASS GIS?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -28429,6 +28679,9 @@ msgid "Do you want to quit GRASS GIS?"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/dialogs.py:2448
@@ -28450,6 +28703,7 @@ msgid "Character encoding:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28529,6 +28783,11 @@ msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+msgstr ""
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gui_core/wrap.py:258
 msgid "Clear"
@@ -28790,6 +29049,7 @@ msgstr "Скопировать выбранные файлы"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28862,6 +29122,11 @@ msgstr "Скопировать выбранные файлы"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/gui_core/query.py:135 ../gui/wxpython/gui_core/query.py:139
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gui_core/query.py:134 ../gui/wxpython/gui_core/query.py:138
 =======
 #: ../gui/wxpython/gui_core/menu.py:164
@@ -28895,6 +29160,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28941,6 +29207,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Copy '%s'"
 msgstr "Скопировать «%s»"
@@ -38263,6 +38532,7 @@ msgstr "подписи:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38350,6 +38620,8 @@ msgstr "Создать новую область?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 #~ msgid "Download file from <{url}>, return status code {code}, "
 #~ msgstr "Загрузка файла с <{url}>, возврат кода состояния {code}, "
@@ -38866,6 +39138,7 @@ msgstr "Создать новую область?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -38895,6 +39168,8 @@ msgstr "Создать новую область?"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Define GRASS Database and Location Name"
 msgstr "Укажите базу данных GRASS и название области"
 
@@ -38960,6 +39235,7 @@ msgstr "Создать новую область?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39002,3 +39278,5 @@ msgstr "Создать новую область?"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_si.po b/locale/po/grasswxpy_si.po
index 18bf2794252..25e947648e6 100644
--- a/locale/po/grasswxpy_si.po
+++ b/locale/po/grasswxpy_si.po
@@ -18599,6 +18599,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18671,6 +18672,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -18694,6 +18700,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18785,6 +18792,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -18805,6 +18817,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18877,6 +18890,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -19540,6 +19558,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19586,6 +19605,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
diff --git a/locale/po/grasswxpy_sl.po b/locale/po/grasswxpy_sl.po
index 2445cdb2862..2876be5053b 100644
--- a/locale/po/grasswxpy_sl.po
+++ b/locale/po/grasswxpy_sl.po
@@ -24,6 +24,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 =======
 <<<<<<< HEAD
@@ -52,6 +53,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
 =======
 =======
@@ -67,6 +70,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
@@ -115,6 +119,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
@@ -134,6 +140,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -171,6 +178,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -189,6 +198,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -230,6 +240,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -255,6 +267,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -296,6 +309,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:109 ../gui/wxpython/nviz/preferences.py:65
 #: ../gui/wxpython/nviz/preferences.py:69
 msgid "View"
@@ -2173,6 +2188,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2242,6 +2258,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/toolbars.py:29
 #: ../gui/wxpython/mapswipe/toolbars.py:31
 msgid "Query raster/vector map(s)"
@@ -2773,6 +2793,7 @@ msgid "Status bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2864,6 +2885,11 @@ msgid "Status bar"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/infomanager.py:36
@@ -2904,6 +2930,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:563
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1093
 =======
@@ -2933,6 +2960,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109
 #: ../gui/wxpython/modules/import_export.py:578
 =======
@@ -2949,6 +2978,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109
@@ -3000,6 +3030,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107
 #: ../gui/wxpython/modules/import_export.py:562
 =======
@@ -3021,6 +3053,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -3079,6 +3112,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:563
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1093
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3096,6 +3133,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3155,6 +3193,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Import vector data"
 msgstr ""
 
@@ -3176,6 +3217,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:421
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1060
 =======
@@ -3205,6 +3247,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074
 =======
 =======
@@ -3220,6 +3264,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074
@@ -3268,6 +3313,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/modules/import_export.py:416
@@ -3289,6 +3336,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3318,6 +3366,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:421
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1060
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3335,6 +3385,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3377,6 +3428,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Import raster data"
 msgstr ""
 
@@ -3458,6 +3511,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3499,6 +3553,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/catalog.py:51
 msgid "Data catalog"
 msgstr ""
@@ -3573,6 +3629,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3635,6 +3692,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/g.gui.datacatalog.py:50
 msgid "Data Catalog - GRASS GIS"
 msgstr ""
@@ -3655,6 +3716,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3677,6 +3739,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/tree.py:96
 =======
 =======
@@ -3692,6 +3756,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/datacatalog/tree.py:96
 =======
@@ -3739,6 +3804,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/tree.py:95
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -4064,6 +4131,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4126,6 +4194,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:23
 msgid "Reload GRASS projects"
 msgstr ""
@@ -4191,6 +4263,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4225,6 +4298,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/modules/extensions.py:76
@@ -4246,6 +4321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4275,6 +4351,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/extensions.py:76
 #: ../gui/wxpython/gui_core/menu.py:163
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4290,6 +4368,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4327,6 +4406,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Search"
 msgstr ""
 
@@ -4357,6 +4438,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4391,6 +4473,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:927
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Reprojection"
@@ -4427,6 +4511,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4489,6 +4574,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:924
 msgid "Reprojection"
 msgstr ""
@@ -4522,6 +4611,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -4544,6 +4634,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -4561,6 +4653,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
@@ -4625,6 +4718,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Map layer <{ml}> needs to be reprojected.\n"
@@ -4647,6 +4742,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4669,6 +4765,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/dialogs.py:124
 =======
 =======
@@ -4684,6 +4782,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/datacatalog/dialogs.py:124
 =======
@@ -4731,6 +4830,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/dialogs.py:125
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Estimated resolution:"
@@ -4764,6 +4865,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -4787,6 +4889,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/datacatalog/dialogs.py:126
 msgid "Estimated resolution:"
@@ -5167,6 +5271,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6101,6 +6206,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2007
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -6120,6 +6227,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -6185,6 +6293,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -6209,6 +6319,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -6250,6 +6361,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:87
 msgid "Map Swipe Tool - GRASS GIS"
 msgstr ""
@@ -18320,6 +18433,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -18389,6 +18503,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:186
 #, python-format
 msgid "<%(name)s>: layer type <%(type)s> is not supported"
@@ -18473,6 +18591,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18498,6 +18617,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1119
 =======
 =======
@@ -18512,6 +18633,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
@@ -18621,6 +18743,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1113 ../gui/wxpython/core/render.py:1120
 #: ../gui/wxpython/core/render.py:1127 ../gui/wxpython/core/gcmd.py:421
 msgid "Details:"
@@ -18643,6 +18770,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18734,6 +18862,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1118
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -18764,6 +18897,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18805,6 +18939,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Unable to get current geographic extent. Force quitting wxGUI. Please "
 "manually run g.region to fix the problem."
 msgstr ""
@@ -18825,6 +18961,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -18894,6 +19031,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Unable to get current geographic extent. Force quiting wxGUI. Please "
 "manually run g.region to fix the problem."
 msgstr ""
@@ -19229,6 +19370,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -19320,6 +19462,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to open file <%s> for reading."
 msgstr ""
@@ -19341,6 +19488,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/core/workspace.py:1726
 =======
 <<<<<<< HEAD
@@ -19383,6 +19531,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/workspace.py:1770
 =======
 #: ../gui/wxpython/core/workspace.py:1726
@@ -19401,6 +19551,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/core/workspace.py:1726
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -19484,6 +19635,11 @@ msgstr ""
 #: ../gui/wxpython/core/workspace.py:1726
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/core/workspace.py:1726
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Some lines were skipped when reading settings from file <%(file)s>.\n"
@@ -19509,6 +19665,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/core/workspace.py:1976
 =======
 <<<<<<< HEAD
@@ -19551,6 +19708,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/workspace.py:2019
 =======
 #: ../gui/wxpython/core/workspace.py:1976
@@ -19569,6 +19728,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/core/workspace.py:1976
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -19652,6 +19812,11 @@ msgstr ""
 #: ../gui/wxpython/core/workspace.py:1976
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/core/workspace.py:1976
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid " row %d:"
 msgstr ""
@@ -19673,6 +19838,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -19714,6 +19880,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/main.py:190
 #, python-format
 msgid "Unsupported command %s."
@@ -20313,6 +20481,7 @@ msgid "Thematic mapping for vector map in 3D view"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -20382,6 +20551,10 @@ msgid "Thematic mapping for vector map in 3D view"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/menutree.py:162
 #, python-format
 msgid "Unknow tag %s"
@@ -26290,6 +26463,7 @@ msgid "Map <%s> not found. "
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26381,6 +26555,11 @@ msgid "Map <%s> not found. "
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/import_export.py:50
@@ -26418,6 +26597,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26445,6 +26625,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:985
 =======
 =======
@@ -26460,6 +26642,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/modules/import_export.py:985
@@ -26508,6 +26691,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:968
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "right click to (un)select all"
@@ -26528,6 +26713,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26597,6 +26783,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:965
 msgid "right click to (un)select all"
 msgstr ""
@@ -26629,6 +26819,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26720,6 +26911,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:82
 msgid "Name for output GRASS map (editable)"
 msgstr ""
@@ -26740,6 +26936,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -26832,6 +27029,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:85
 #: ../gui/wxpython/gui_core/forms.py:2248 ../gui/wxpython/psmap/dialogs.py:2216
 msgid "Feature type"
@@ -26860,6 +27062,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26951,6 +27154,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:96
 msgid "Override projection check (use current location's projection)"
 msgstr ""
@@ -26972,6 +27180,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27013,6 +27222,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:127
 #: ../gui/wxpython/modules/import_export.py:435
 <<<<<<< HEAD
@@ -27034,6 +27245,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -27103,6 +27315,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:113
 #: ../gui/wxpython/gui_core/forms.py:705
 msgid "Close dialog on finish"
@@ -27128,6 +27344,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27160,6 +27377,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -27177,6 +27396,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -27242,6 +27462,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "&Import"
 msgstr ""
 
@@ -27263,6 +27485,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:441
 #: ../gui/wxpython/modules/import_export.py:583
 =======
@@ -27306,6 +27529,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:436
 <<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:598
@@ -27330,6 +27555,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -27388,6 +27614,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:441
 #: ../gui/wxpython/modules/import_export.py:583
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -27405,6 +27635,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27464,6 +27695,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Import selected layers"
 msgstr ""
 
@@ -27488,6 +27722,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27529,6 +27764,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:160
 msgid "Import settings"
 msgstr ""
@@ -27549,6 +27786,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -27618,6 +27856,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:161
 msgid "Import settings"
 msgstr ""
@@ -27640,6 +27882,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27731,6 +27974,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map names %(names)s exist. "
 msgstr ""
@@ -27752,6 +28000,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:259
 =======
 <<<<<<< HEAD
@@ -27794,6 +28043,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:258
 =======
 #: ../gui/wxpython/modules/import_export.py:259
@@ -27812,6 +28063,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/modules/import_export.py:259
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -27895,6 +28147,11 @@ msgstr ""
 #: ../gui/wxpython/modules/import_export.py:259
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/modules/import_export.py:259
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map name <%(name)s> exist. "
 msgstr ""
@@ -27916,6 +28173,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27957,6 +28215,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:423
 #: ../gui/wxpython/modules/import_export.py:585
 msgid "Add linked layers into layer tree"
@@ -28038,6 +28298,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -28107,6 +28368,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:419
 #: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1189
 msgid "Link external raster data"
@@ -28197,6 +28462,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -28229,6 +28495,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -28246,6 +28514,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -28311,6 +28580,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Projection of following layers do not match with projection of current "
 "location. "
@@ -28333,6 +28604,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -28360,6 +28632,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:983
 =======
 =======
@@ -28375,6 +28649,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/modules/import_export.py:983
@@ -28423,6 +28698,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:966
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Layers to be reprojected"
@@ -28557,6 +28834,7 @@ msgid "Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -28626,6 +28904,10 @@ msgid "Raster Map Calculator"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:963
 msgid "Layers to be reprojected"
 msgstr ""
@@ -29099,6 +29381,7 @@ msgid "Thematic mapping for vector map in 3D view"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29190,6 +29473,11 @@ msgid "Thematic mapping for vector map in 3D view"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
@@ -29232,6 +29520,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -29324,6 +29613,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:174
 #: ../gui/wxpython/gui_core/forms.py:2054
 msgid "&Load"
@@ -29346,6 +29640,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29437,6 +29732,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:175
 msgid "Load expression from file"
 msgstr ""
@@ -29457,6 +29757,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -29549,6 +29850,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:176
 #: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1198
 #: ../gui/wxpython/gui_core/forms.py:634
@@ -29577,6 +29883,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29668,6 +29975,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:181
 msgid "exponent"
 msgstr ""
@@ -29843,6 +30155,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -29870,6 +30183,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iscatt/plots.py:45
 =======
 =======
@@ -29885,6 +30200,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/iscatt/plots.py:45
@@ -29933,6 +30249,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iscatt/plots.py:44
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -30351,6 +30669,7 @@ msgid "Setup for r.li modules - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -30420,6 +30739,10 @@ msgid "Setup for r.li modules - GRASS GIS"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/extensions.py:45
 msgid "Fetch & install extension from GRASS Addons"
 msgstr ""
@@ -30530,6 +30853,7 @@ msgid "Extension"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30621,6 +30945,11 @@ msgid "Extension"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/rlisetup/wizard.py:66
@@ -30682,6 +31011,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:981
 =======
 <<<<<<< HEAD
@@ -30724,6 +31054,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:982
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:981
@@ -30742,6 +31074,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:981
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -30825,6 +31158,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:981
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:981
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Whole map layer"
 msgstr ""
 
@@ -30858,6 +31196,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:708
 =======
 <<<<<<< HEAD
@@ -30900,6 +31239,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:709
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:708
@@ -30918,6 +31259,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:708
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31001,6 +31343,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:708
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:708
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s was not found, please select another vector"
 msgstr ""
@@ -31022,6 +31369,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:713
 =======
 <<<<<<< HEAD
@@ -31064,6 +31412,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:714
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:713
@@ -31082,6 +31432,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:713
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31165,6 +31516,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:713
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:713
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s has no areas, please select another vector"
 msgstr ""
@@ -31186,6 +31542,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:719
 =======
 <<<<<<< HEAD
@@ -31228,6 +31585,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:720
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:719
@@ -31246,6 +31605,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:719
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31329,6 +31689,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:719
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:719
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s has no table connected, please select another vector"
 msgstr ""
@@ -31350,6 +31715,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31391,6 +31757,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:763
 msgid "Insert sampling frame parameter"
 msgstr ""
@@ -31436,6 +31804,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31505,6 +31874,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:762
 msgid "Insert sampling frame parameter"
 msgstr ""
@@ -31562,6 +31935,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31653,6 +32027,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Select areas from the\n"
 "overlaid vector map"
@@ -31675,6 +32054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31716,6 +32096,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:998
 msgid "Choose a method"
 msgstr ""
@@ -31784,6 +32166,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31853,6 +32236,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:997
 msgid "Choose a method"
 msgstr ""
@@ -31923,6 +32310,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32014,6 +32402,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Draw sampling regions"
 msgstr ""
 
@@ -32035,6 +32428,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32076,6 +32470,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Draw sample region {count} of {num_regions}"
 msgstr ""
@@ -32113,6 +32509,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -32182,6 +32579,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Draw sample region "
 msgstr ""
 
@@ -32226,6 +32627,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32317,6 +32719,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/toolbars.py:105
 msgid "Rectangle"
 msgstr ""
@@ -32338,6 +32745,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32379,6 +32787,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1307
 #: ../gui/wxpython/rlisetup/wizard.py:1499
 #: ../gui/wxpython/rlisetup/wizard.py:1612
@@ -32497,6 +32907,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32529,6 +32940,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:156
 =======
 =======
@@ -32546,6 +32959,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32593,6 +33007,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1309
 #: ../gui/wxpython/rlisetup/wizard.py:1501
 #: ../gui/wxpython/rlisetup/wizard.py:1614
@@ -32713,6 +33129,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32804,6 +33221,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:155
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -32829,6 +33251,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:1928
 =======
 <<<<<<< HEAD
@@ -32903,6 +33326,12 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+#: ../gui/wxpython/rlisetup/wizard.py:1920
+<<<<<<< HEAD
+#: ../gui/wxpython/rlisetup/functions.py:140
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/rlisetup/wizard.py:1928
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32920,6 +33349,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -32998,6 +33428,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:139
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "The polygon seems to have 0 areas"
@@ -33020,6 +33452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33061,6 +33494,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1923
 msgid "Select sample area 1 of "
 msgstr ""
@@ -33150,6 +33585,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -33219,6 +33655,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1931
 msgid "Select sample area 1 of "
 msgstr ""
@@ -33352,6 +33792,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33443,6 +33884,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:26
 msgid "Modify the configuration file"
 msgstr ""
@@ -33469,6 +33915,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/frame.py:97
 =======
 <<<<<<< HEAD
@@ -33511,6 +33958,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:101
 =======
 #: ../gui/wxpython/rlisetup/frame.py:97
@@ -33529,6 +33978,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/frame.py:97
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -33612,6 +34062,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/frame.py:97
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/frame.py:97
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Are you sure that you want modify r.li configuration file {name}?\n"
@@ -33635,6 +34090,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33676,6 +34132,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:106
 msgid "WARNING"
 msgstr ""
@@ -33729,6 +34187,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -33798,6 +34257,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:102
 msgid "WARNING"
 msgstr ""
@@ -33858,6 +34321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33949,6 +34413,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Do you want remove r.li configuration file <%s>?"
 msgstr ""
@@ -33970,6 +34439,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -34011,6 +34481,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:245
 msgid "Remove new r.li configuration file?"
 msgstr ""
@@ -34031,6 +34503,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -34100,6 +34573,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:241
 msgid "Remove new r.li configuration file?"
 msgstr ""
@@ -34122,6 +34599,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -34213,6 +34691,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Set the new name for %s \"                                            "
@@ -34236,6 +34719,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -34277,6 +34761,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:279
 msgid "Rename configuration file"
 msgstr ""
@@ -35112,6 +35598,7 @@ msgid "There were some issues when loading menu or Tools tab:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -35179,6 +35666,10 @@ msgid "There were some issues when loading menu or Tools tab:"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:275
 msgid "Rename configuration file"
 msgstr ""
@@ -41601,6 +42092,7 @@ msgid "Dbf driver does not support usage of SQL functions."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -48099,6 +48591,11 @@ msgid "Dbf driver does not support usage of SQL functions."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/lmgr/frame.py:1305
@@ -48166,6 +48663,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -48205,6 +48703,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/manager.py:237 ../gui/wxpython/dbmgr/base.py:369
 #: ../gui/wxpython/dbmgr/base.py:961 ../gui/wxpython/dbmgr/base.py:1132
 #: ../gui/wxpython/dbmgr/base.py:1486 ../gui/wxpython/dbmgr/base.py:2180
@@ -48220,6 +48720,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -48262,6 +48763,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/manager.py:236 ../gui/wxpython/dbmgr/base.py:362
 #: ../gui/wxpython/dbmgr/base.py:952 ../gui/wxpython/dbmgr/base.py:1123
 #: ../gui/wxpython/dbmgr/base.py:1477 ../gui/wxpython/dbmgr/base.py:2170
@@ -48283,6 +48786,7 @@ msgid "Number of loaded records: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -48352,6 +48856,10 @@ msgid "Number of loaded records: %d"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:81
 #, python-format
 msgid ""
@@ -48423,6 +48931,7 @@ msgid "Category"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -48514,6 +49023,11 @@ msgid "Category"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51
@@ -48542,6 +49056,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -48569,6 +49084,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362
 =======
 =======
@@ -48584,6 +49101,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362
@@ -48632,6 +49150,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Database connection"
@@ -49906,6 +50426,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -49975,6 +50496,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/web_services/widgets.py:140
 msgid " Requested data settings "
 msgstr ""
@@ -53091,6 +53616,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -53182,6 +53708,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Unable to open file\n"
@@ -53205,6 +53736,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:535
 =======
 <<<<<<< HEAD
@@ -53247,6 +53779,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:530
 =======
 #: ../gui/wxpython/psmap/instructions.py:535
@@ -53265,6 +53799,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:535
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53348,6 +53883,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:535
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:535
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Instruction file will be loaded with following region: %s\n"
 msgstr ""
@@ -53369,6 +53909,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:541
 =======
 <<<<<<< HEAD
@@ -53411,6 +53952,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:536
 =======
 #: ../gui/wxpython/psmap/instructions.py:541
@@ -53429,6 +53972,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:541
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53512,6 +54056,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:541
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:541
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Region cannot be set\n"
@@ -53535,6 +54084,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -53576,6 +54126,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:706
 <<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:929
@@ -53616,6 +54168,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -53685,6 +54238,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:711
 #: ../gui/wxpython/psmap/instructions.py:925
 #: ../gui/wxpython/psmap/instructions.py:1053
@@ -53714,6 +54271,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -53746,6 +54304,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -53763,6 +54323,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -53828,6 +54389,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %s"
 msgstr ""
@@ -53849,6 +54412,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:727
 =======
 <<<<<<< HEAD
@@ -53891,6 +54455,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:722
 =======
 #: ../gui/wxpython/psmap/instructions.py:727
@@ -53909,6 +54475,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:727
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53992,6 +54559,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:727
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:727
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Scale has changed, old value: %(old)s\n"
@@ -54015,6 +54587,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:732
 =======
 <<<<<<< HEAD
@@ -54057,6 +54630,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:727
 =======
 #: ../gui/wxpython/psmap/instructions.py:732
@@ -54075,6 +54650,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:732
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54158,6 +54734,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:732
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:732
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to read instruction %s.\n"
@@ -54181,6 +54762,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:746
 =======
 <<<<<<< HEAD
@@ -54223,6 +54805,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:741
 =======
 #: ../gui/wxpython/psmap/instructions.py:746
@@ -54241,6 +54825,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:746
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54324,6 +54909,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:746
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:746
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Map frame position changed, old value: %(old1)s %(old2)s\n"
@@ -54347,6 +54937,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:764
 =======
 <<<<<<< HEAD
@@ -54375,6 +54966,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:765
 =======
 =======
@@ -54390,6 +54983,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:765
@@ -54438,6 +55032,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:759
 =======
 #: ../gui/wxpython/psmap/instructions.py:764
@@ -54457,6 +55053,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:764
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54494,6 +55091,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54512,6 +55111,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -54553,6 +55153,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Map frame size changed, old value: %(old1)s %(old2)s\n"
@@ -54576,6 +55178,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:837
 =======
 <<<<<<< HEAD
@@ -54604,6 +55207,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:840
 =======
 =======
@@ -54619,6 +55224,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:840
@@ -54667,6 +55273,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:832
 =======
 #: ../gui/wxpython/psmap/instructions.py:837
@@ -54686,6 +55294,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:837
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54723,6 +55332,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54741,6 +55352,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -54782,6 +55394,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to read instruction %(file)s.\n"
@@ -54805,6 +55419,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:852
 =======
 <<<<<<< HEAD
@@ -54833,6 +55448,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:856
 =======
 =======
@@ -54848,6 +55465,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:856
@@ -54896,6 +55514,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:847
 =======
 #: ../gui/wxpython/psmap/instructions.py:852
@@ -54915,6 +55535,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:852
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54952,6 +55573,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54970,6 +55593,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -55011,6 +55635,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %s."
 msgstr ""
@@ -55032,6 +55658,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:1132
 =======
 <<<<<<< HEAD
@@ -55060,6 +55687,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:1136
 =======
 =======
@@ -55075,6 +55704,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:1136
@@ -55123,6 +55753,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:1127
 =======
 #: ../gui/wxpython/psmap/instructions.py:1132
@@ -55142,6 +55774,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:1132
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -55179,6 +55812,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -55197,6 +55832,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -55238,6 +55874,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %(inst)s: file %(file)s not found."
 msgstr ""
@@ -55259,6 +55897,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55300,6 +55939,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/g.gui.psmap.py:52
 msgid "Cartographic Composer - GRASS GIS"
 msgstr ""
@@ -55360,6 +56001,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55429,6 +56071,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/toolbars.py:86
 msgid "Full extent"
 msgstr ""
@@ -55478,6 +56124,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55519,6 +56166,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:267
 msgid "Units:"
 msgstr ""
@@ -55539,6 +56188,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55608,6 +56258,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/utils.py:102
 msgid "inch"
 msgstr ""
@@ -55662,6 +56316,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -55753,6 +56408,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Position of the top left corner\n"
 "from the top left edge of the paper"
@@ -55775,6 +56435,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55816,6 +56477,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:311
 msgid "Position is given:"
 msgstr ""
@@ -55844,6 +56507,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55913,6 +56577,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:313
 msgid "Position is given:"
 msgstr ""
@@ -55943,6 +56611,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56034,6 +56703,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Position from the top left\n"
 "edge of the paper"
@@ -56056,6 +56730,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -56083,6 +56758,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:462
 =======
 =======
@@ -56098,6 +56775,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:462
@@ -56146,6 +56824,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:453
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Font:"
@@ -56286,6 +56966,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -56355,6 +57036,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:455
 msgid "Font:"
 msgstr ""
@@ -56493,6 +57178,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56525,6 +57211,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -56542,6 +57230,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -56607,6 +57296,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Map max resolution (dpi):"
 msgstr ""
 
@@ -56629,6 +57320,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -56656,6 +57348,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684
 =======
 =======
@@ -56671,6 +57365,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684
@@ -56719,6 +57414,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Border"
@@ -56755,6 +57452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -56824,6 +57522,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1125 ../gui/wxpython/psmap/dialogs.py:3641
 msgid "Border"
 msgstr ""
@@ -56858,6 +57560,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56890,6 +57593,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -56907,6 +57612,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -56972,6 +57678,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Region is set to match this map,\n"
 "raster or vector map must be added later"
@@ -56994,6 +57702,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -57021,6 +57730,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1296
 =======
 =======
@@ -57036,6 +57747,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:1296
@@ -57084,6 +57796,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1269
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Region selection"
@@ -57176,6 +57890,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -57245,6 +57960,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1272
 msgid "Region selection"
 msgstr ""
@@ -57335,6 +58054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -57367,6 +58087,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -57384,6 +58106,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -57449,6 +58172,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%s properties"
 msgstr ""
@@ -57470,6 +58195,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -57497,6 +58223,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2249
 =======
 =======
@@ -57512,6 +58240,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:2249
@@ -57560,6 +58289,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2218
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Data selection"
@@ -57742,6 +58473,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -57811,6 +58543,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2208
 msgid "Data selection"
 msgstr ""
@@ -57991,6 +58727,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58023,6 +58760,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58040,6 +58779,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58105,6 +58845,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%(rast)s: type %(type)s"
 msgstr ""
@@ -58126,6 +58868,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58153,6 +58896,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3498
 =======
 =======
@@ -58168,6 +58913,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:3498
@@ -58216,6 +58962,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3459
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Type of legend"
@@ -58292,6 +59040,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -58361,6 +59110,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3455
 msgid "Type of legend"
 msgstr ""
@@ -58435,6 +59188,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58467,6 +59221,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58484,6 +59240,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58549,6 +59306,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Width of the color symbol (for lines)\n"
 "in front of the legend text"
@@ -58571,6 +59330,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58598,6 +59358,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028
 =======
 =======
@@ -58613,6 +59375,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028
@@ -58661,6 +59424,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Columns:"
@@ -58689,6 +59454,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -58758,6 +59524,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3813 ../gui/wxpython/psmap/dialogs.py:3976
 msgid "Columns:"
 msgstr ""
@@ -58784,6 +59554,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58816,6 +59587,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58833,6 +59606,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58898,6 +59672,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Column separation distance between the left edges\n"
 "of two columns in a multicolumn legend"
@@ -58920,6 +59696,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58947,6 +59724,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4133
 =======
 =======
@@ -58962,6 +59741,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:4133
@@ -59010,6 +59790,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4085
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Edit legend label:"
@@ -59166,6 +59948,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -59235,6 +60018,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4081
 msgid "Edit legend label:"
 msgstr ""
@@ -59389,6 +60176,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -59421,6 +60209,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -59438,6 +60228,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -59503,6 +60294,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "PIL\n"
 "missing"
@@ -59525,6 +60318,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/dialogs.py:5956
 =======
 <<<<<<< HEAD
@@ -59553,6 +60347,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6007
 =======
 =======
@@ -59568,6 +60364,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6007
@@ -59616,6 +60413,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:5954
 =======
 #: ../gui/wxpython/psmap/dialogs.py:5956
@@ -59635,6 +60434,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/dialogs.py:5956
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59672,6 +60472,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -59690,6 +60492,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59731,6 +60534,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
@@ -59752,6 +60557,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/dialogs.py:6019
 =======
 <<<<<<< HEAD
@@ -59780,6 +60586,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6070
 =======
 =======
@@ -59795,6 +60603,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6070
@@ -59843,6 +60652,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6017
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6019
@@ -59862,6 +60673,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6019
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59899,6 +60711,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -59917,6 +60731,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59958,6 +60773,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "size: %(width)s x %(height)s pts"
 msgstr ""
@@ -59979,6 +60796,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -60006,6 +60824,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6092
 =======
 =======
@@ -60021,6 +60841,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6092
@@ -60069,6 +60890,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6039
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "No image selected."
@@ -60109,6 +60932,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -60178,6 +61002,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6041
 msgid "No image selected."
 msgstr ""
@@ -60216,6 +61044,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -60248,6 +61077,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -60265,6 +61096,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -60330,6 +61162,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Note: Selected symbol is not displayed\n"
 "in draft mode (only in preview mode)"
@@ -60352,6 +61186,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -60379,6 +61214,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619
 =======
 =======
@@ -60394,6 +61231,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619
@@ -60442,6 +61280,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Outline color:"
@@ -60503,6 +61343,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -60572,6 +61413,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6568
 msgid "Outline color:"
 msgstr ""
@@ -60634,6 +61479,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -60725,6 +61571,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Python Imaging Library is not available.\n"
 "'Preview' functionality won't work."
@@ -60747,6 +61598,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:275
 =======
 <<<<<<< HEAD
@@ -60789,6 +61641,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:281
 =======
 #: ../gui/wxpython/psmap/frame.py:275
@@ -60807,6 +61661,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:275
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -60890,6 +61745,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/frame.py:275
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/frame.py:275
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Characters on position %s are not supported by ISO-8859-1 (Latin 1) encoding "
@@ -60913,6 +61773,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:283
 =======
 <<<<<<< HEAD
@@ -60955,6 +61816,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:289
 =======
 #: ../gui/wxpython/psmap/frame.py:283
@@ -60973,6 +61836,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:283
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -61056,6 +61920,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/frame.py:283
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/frame.py:283
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Not all characters are supported by ISO-8859-1 (Latin 1) encoding which is "
 "required by module ps.map."
@@ -61078,6 +61947,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -61119,6 +61989,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:320
 msgid "Program ps2pdf is not available. Please install it first to create PDF."
 msgstr ""
@@ -61154,6 +62026,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -61223,6 +62096,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:314
 msgid "Program ps2pdf is not available. Please install it first to create PDF."
 msgstr ""
@@ -61257,6 +62134,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -61289,6 +62167,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -61306,6 +62186,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -61371,6 +62252,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Ps.map exited with return code %s"
 msgstr ""
@@ -61392,6 +62275,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:438
 =======
 <<<<<<< HEAD
@@ -61420,6 +62304,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:437
 =======
 =======
@@ -61435,6 +62321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:437
@@ -61483,6 +62370,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:436
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Program {} is not available."
@@ -61524,6 +62413,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:438
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -61561,6 +62451,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -61579,6 +62471,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -61620,6 +62513,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%(prg)s exited with return code %(code)s"
 msgstr ""
@@ -61641,6 +62536,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -61668,6 +62564,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:464
 =======
 =======
@@ -61683,6 +62581,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:464
@@ -61731,6 +62630,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:463
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "PDF generated"
@@ -61771,6 +62672,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -61840,6 +62742,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:442
 msgid "PDF generated"
 msgstr ""
@@ -61882,6 +62788,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -61914,6 +62821,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -61931,6 +62840,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -61996,6 +62906,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Preview is not available probably because Ghostscript is not installed or "
 "not on PATH."
@@ -62018,6 +62930,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -62045,6 +62958,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:514
 =======
 =======
@@ -62060,6 +62975,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:514
@@ -62108,6 +63024,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:512
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -62141,6 +63059,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -62210,6 +63129,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:488
 msgid "Please follow instructions on GRASS Trac Wiki."
 msgstr ""
@@ -62240,6 +63163,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -62272,6 +63196,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -62289,6 +63215,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -62354,6 +63281,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read file %s."
 msgstr ""
@@ -62375,6 +63304,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -62402,6 +63332,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:794
 =======
 =======
@@ -62417,6 +63349,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:794
@@ -62465,6 +63398,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:792
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Scalebar is not appropriate for this projection"
@@ -62528,6 +63463,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -62597,6 +63533,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:761
 msgid "Scalebar is not appropriate for this projection"
 msgstr ""
@@ -62665,6 +63605,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -62756,3 +63697,8 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_ta.po b/locale/po/grasswxpy_ta.po
index c8b0d2ac199..2a5a286a401 100644
--- a/locale/po/grasswxpy_ta.po
+++ b/locale/po/grasswxpy_ta.po
@@ -28632,6 +28632,7 @@ msgid "Launch Data Catalog."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -28682,6 +28683,9 @@ msgid "Launch Data Catalog."
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:2007
@@ -28946,6 +28950,7 @@ msgid "Archive file is unreadable: {0}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28983,6 +28988,8 @@ msgid "Archive file is unreadable: {0}"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -30684,6 +30691,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30756,6 +30764,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -30779,6 +30792,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30870,6 +30884,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -30890,6 +30909,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30962,6 +30982,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -31625,6 +31650,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31671,6 +31697,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
@@ -32747,6 +32776,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32787,6 +32817,8 @@ msgstr "GRASS GIS தகவல் அட்டவணை"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy, python-format
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 #~ msgid "Unable to rename location: %s"
@@ -32813,6 +32845,7 @@ msgstr "GRASS GIS தகவல் அட்டவணை"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32842,6 +32875,8 @@ msgstr "GRASS GIS தகவல் அட்டவணை"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "GRASS GIS Data Catalog"
 msgstr "GRASS GIS தகவல் அட்டவணை"
 
@@ -32860,6 +32895,7 @@ msgstr "GRASS GIS தகவல் அட்டவணை"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32902,5 +32938,7 @@ msgstr "GRASS GIS தகவல் அட்டவணை"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Search:"
 msgstr "தேடு:"
diff --git a/locale/po/grasswxpy_th.po b/locale/po/grasswxpy_th.po
index c3920de6e7e..b93de319bc4 100644
--- a/locale/po/grasswxpy_th.po
+++ b/locale/po/grasswxpy_th.po
@@ -21860,6 +21860,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -21951,6 +21952,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "3D Raster Map Calculator"
 msgstr ""
 
@@ -23252,6 +23258,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -23279,6 +23286,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306
 =======
 =======
@@ -23294,6 +23303,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/main_window/frame.py:2400 ../gui/wxpython/lmgr/frame.py:2306
@@ -23342,6 +23352,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2364 ../gui/wxpython/lmgr/frame.py:2292
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Quit GRASS GUI"
@@ -23674,6 +23686,7 @@ msgid "Remove MASK"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -23743,6 +23756,10 @@ msgid "Remove MASK"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 msgstr ""
@@ -27882,6 +27899,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27921,6 +27939,8 @@ msgid "Invalid mapset name"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/toolbars.py:58
 #, fuzzy
 msgid "New workspace"
@@ -27943,6 +27963,7 @@ msgid "Invalid mapset name"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -28018,6 +28039,10 @@ msgstr ""
 =======
 msgstr ""
 >>>>>>> osgeo-main
+=======
+=======
+msgstr ""
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/startup/guiutils.py:106
 msgid "Invalid location name"
@@ -28186,6 +28211,7 @@ msgid "Type %s to add raster or vector to the layer tree."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -28215,6 +28241,8 @@ msgid "Type %s to add raster or vector to the layer tree."
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/startup/guiutils.py:131
 #: ../gui/wxpython/image2target/ii2t_gis_set.py:469
 #, python-format
@@ -28238,6 +28266,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28275,6 +28304,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/guiutils.py:186
 msgid "Unable to create new mapset: {}"
 msgstr ""
@@ -28357,6 +28388,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28389,6 +28421,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/workspace.py:159
 #, python-format
 msgid ""
@@ -28411,6 +28445,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28443,6 +28478,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/workspace.py:179
 #: ../gui/wxpython/animation/nviztask.py:40
 =======
@@ -28877,6 +28914,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28949,6 +28987,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -28975,6 +29018,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29021,6 +29065,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -30134,6 +30181,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30206,6 +30254,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -30229,6 +30282,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30320,6 +30374,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -30340,6 +30399,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30412,6 +30472,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -31075,6 +31140,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31121,6 +31187,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
diff --git a/locale/po/grasswxpy_tr.po b/locale/po/grasswxpy_tr.po
index 0c98cdd0429..96d32c7905f 100644
--- a/locale/po/grasswxpy_tr.po
+++ b/locale/po/grasswxpy_tr.po
@@ -2389,6 +2389,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2437,6 +2438,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, fuzzy
 msgid "Create new mapset in current project"
 msgstr "Yeni harita takımı oluştur"
@@ -2461,6 +2464,7 @@ msgid "Create new project (location) in current GRASS database"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2540,6 +2544,11 @@ msgid "Create new project (location) in current GRASS database"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Create new mapset in current location"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgstr ""
@@ -2569,6 +2578,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/datacatalog/toolbars.py:52
 msgid "Import vector data  [v.import]"
 =======
@@ -2696,6 +2706,17 @@ msgid "Import vector data  [v.import]"
 msgid "Import vector data  [v.import]"
 =======
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/toolbars.py:49
+=======
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+<<<<<<< HEAD
+#: ../gui/wxpython/datacatalog/toolbars.py:48
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+msgid "Import vector data  [v.import]"
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:52
 msgid "Import vector data  [v.import]"
 =======
@@ -2714,6 +2735,7 @@ msgid "Import vector data  [v.import]"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2822,6 +2844,8 @@ msgid "Import vector data  [v.import]"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/toolbars.py:55
@@ -2905,6 +2929,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2977,6 +3002,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2036
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2031
 =======
 #: ../gui/wxpython/datacatalog/tree.py:104
@@ -3343,6 +3373,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3375,6 +3406,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -3392,6 +3425,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -3457,6 +3491,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -3636,6 +3672,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3668,6 +3705,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/tree.py:77
 msgid "No time info"
 msgstr ""
@@ -3687,6 +3726,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3719,6 +3759,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/tree.py:79
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -4022,6 +4064,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4094,6 +4137,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/history/tree.py:492
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/tree.py:196
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, fuzzy
@@ -4117,6 +4165,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4462,6 +4511,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/dialogs.py:967 ../gui/wxpython/nviz/tools.py:779
 msgid "Decorations"
@@ -4771,6 +4822,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
@@ -4817,6 +4869,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/history/tree.py:495
 msgid "Removing <{}>"
@@ -5877,6 +5931,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5909,6 +5964,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:3100
 #: ../gui/wxpython/image2target/ii2t_manager.py:3048
 #: ../gui/wxpython/photo2image/ip2i_manager.py:2170
@@ -5926,6 +5983,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5958,6 +6016,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gcp/manager.py:3095
 #: ../gui/wxpython/image2target/ii2t_manager.py:3030
 #: ../gui/wxpython/photo2image/ip2i_manager.py:2164
@@ -6162,6 +6222,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -6253,6 +6314,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gcp/statusbar.py:52
 #: ../gui/wxpython/image2target/ii2t_statusbar.py:52
@@ -6418,6 +6484,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6450,6 +6517,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:314
 msgid "Existing project path"
 =======
@@ -6466,6 +6535,7 @@ msgid "Existing project path"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6498,6 +6568,8 @@ msgid "Existing project path"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:313
 msgid "Existing location path"
 =======
@@ -6520,6 +6592,7 @@ msgid "Timeline Tool - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -6556,6 +6629,8 @@ msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -6571,6 +6646,9 @@ msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -6600,6 +6678,7 @@ msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
@@ -6688,6 +6767,8 @@ msgid "The Timeline Tool needs the \"matplotlib\" (python-matplotlib and on some
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:346
@@ -10809,6 +10890,7 @@ msgid "Find more information at:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -10859,6 +10941,9 @@ msgid "Find more information at:"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:1531
@@ -10884,6 +10969,7 @@ msgid "Unable to read EPGS codes: {0}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10921,6 +11007,8 @@ msgid "Unable to read EPGS codes: {0}"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -11084,6 +11172,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/tplot/frame.py:209 ../gui/wxpython/tplot/frame.py:264
 msgid "Show simple linear regression line"
 msgstr ""
@@ -11114,6 +11203,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478
 =======
 =======
@@ -11129,6 +11220,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1478
@@ -11177,6 +11269,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:513 ../gui/wxpython/menustrings.py:1476
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Interpolate surfaces"
@@ -11389,6 +11483,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -11418,6 +11513,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/tplot/frame.py:209 ../gui/wxpython/tplot/frame.py:264
 msgid "Show simple linear regression line"
 msgstr ""
@@ -11436,6 +11533,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -11478,6 +11576,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/menustrings.py:556 ../gui/wxpython/menustrings.py:1521
 msgid "Calculates linear regression from two raster maps: y = a + b*x."
@@ -11766,6 +11866,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -11838,6 +11939,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1597
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:632 ../gui/wxpython/menustrings.py:1595
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Point analysis"
@@ -12570,6 +12676,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -12661,6 +12768,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/menustrings.py:804 ../gui/wxpython/menustrings.py:1769
 msgid "Support Vector Machines classification (SVM)"
@@ -19490,6 +19602,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19562,6 +19675,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/core/render.py:1112
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1111
 =======
 #: ../gui/wxpython/lmgr/frame.py:1902
@@ -19596,6 +19714,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19642,6 +19761,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to zoom to raster map <%s>."
 msgstr ""
@@ -20783,6 +20905,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20874,6 +20997,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "3D Raster Map Calculator"
 msgstr ""
 
@@ -21887,6 +22015,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -21978,6 +22107,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -22071,6 +22205,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22143,6 +22278,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:592 ../gui/wxpython/lmgr/frame.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:595 ../gui/wxpython/lmgr/frame.py:184
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Tools Toolbar"
@@ -22181,6 +22321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22272,6 +22413,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/main_window/frame.py:973 ../gui/wxpython/lmgr/frame.py:850
 msgid "Choose model to run"
@@ -22291,6 +22437,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22363,6 +22510,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -22558,6 +22710,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -22604,6 +22757,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -22816,6 +22972,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 =======
@@ -22845,6 +23002,8 @@ msgid "Histogram Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344
 =======
 =======
@@ -22860,6 +23019,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/main_window/frame.py:2438 ../gui/wxpython/lmgr/frame.py:2344
@@ -22908,6 +23068,8 @@ msgid "Histogram Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:2402 ../gui/wxpython/lmgr/frame.py:2330
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid ""
@@ -23240,6 +23402,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
@@ -23314,6 +23477,11 @@ msgid "Histogram Tool"
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/wxplot/histogram.py:43
+msgid "Histogram Tool"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/wxplot/histogram.py:51
@@ -26440,6 +26608,7 @@ msgid "Splits subnets for nearest centers by cost isolines. Splits net to bands
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26477,6 +26646,8 @@ msgid "Splits subnets for nearest centers by cost isolines. Splits net to bands
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -26662,6 +26833,7 @@ msgid "Delete all text from the shell"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -26691,6 +26863,8 @@ msgid "Delete all text from the shell"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/menustrings.py:692 ../gui/wxpython/menustrings.py:1637
 msgid "Extracts features of input map which overlay features of clip map."
 msgstr ""
@@ -28387,6 +28561,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -28424,6 +28599,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/locdownload.py:563
 msgid "Location Download"
 msgstr ""
@@ -28805,6 +28982,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -28837,6 +29015,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -28854,6 +29034,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -28919,6 +29100,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Database connection for vector map <%s> is not defined in DB file. You can "
@@ -28941,6 +29124,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -28982,6 +29166,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "VT dosyasında <%s> vektör haritası için veritabanı bağlantısı belirlenemedi. "
 "Katmanları yönetme sekmesinde yeni bir bağlantı belirleyebilirsiniz."
 =======
@@ -29000,6 +29186,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -29069,6 +29256,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/dbmgr/manager.py:123
 msgid "Please wait, loading attribute data..."
@@ -29253,6 +29444,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29325,6 +29517,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -29351,6 +29548,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29397,6 +29595,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -30611,6 +30812,7 @@ msgid "EPSG file:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31277,6 +31479,8 @@ msgid "Select target vector map to display:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -34351,6 +34555,7 @@ msgstr "Mevki oluşturulamıyor"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34384,6 +34589,8 @@ msgstr "Mevki oluşturulamıyor"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Do you want to create GRASS location <%s>?"
 msgstr "<%s> GRASS mevkisini oluşturmak istiyormusun?"
 
@@ -34412,6 +34619,7 @@ msgstr "Yeni Mevki oluşturayım mı?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -34441,6 +34649,8 @@ msgstr "Yeni Mevki oluşturayım mı?"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 msgid "Input Data"
 msgstr "Veri Girişi"
 
@@ -34822,6 +35032,7 @@ msgstr "Yeni Mevki oluşturayım mı?"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34881,3 +35092,6 @@ msgstr "Yeni Mevki oluşturayım mı?"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_uk.po b/locale/po/grasswxpy_uk.po
index b5e7749ea32..1f8a941cbd6 100644
--- a/locale/po/grasswxpy_uk.po
+++ b/locale/po/grasswxpy_uk.po
@@ -18600,6 +18600,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18672,6 +18673,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -18695,6 +18701,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18786,6 +18793,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -18806,6 +18818,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18878,6 +18891,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -19541,6 +19559,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19587,6 +19606,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
diff --git a/locale/po/grasswxpy_vi.po b/locale/po/grasswxpy_vi.po
index 11432bcf268..d6659ca7431 100644
--- a/locale/po/grasswxpy_vi.po
+++ b/locale/po/grasswxpy_vi.po
@@ -22269,6 +22269,7 @@ msgid "3D Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22360,6 +22361,11 @@ msgid "3D Raster Map Calculator"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/import_export.py:69
@@ -23620,6 +23626,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23711,6 +23718,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -29190,6 +29202,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29281,6 +29294,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/lmgr/toolbars.py:138
 msgid "Add various raster maps"
@@ -29892,6 +29910,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -29964,6 +29983,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -29990,6 +30014,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -30036,6 +30061,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -31149,6 +31177,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31221,6 +31250,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -31244,6 +31278,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31335,6 +31370,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -31355,6 +31395,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31427,6 +31468,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -32090,6 +32136,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32136,6 +32183,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
diff --git a/locale/po/grasswxpy_zh.po b/locale/po/grasswxpy_zh.po
index d1cb4587786..318e56bf75f 100644
--- a/locale/po/grasswxpy_zh.po
+++ b/locale/po/grasswxpy_zh.po
@@ -129,6 +129,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -201,6 +202,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/nviz/tools.py:498
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:430
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "reset"
@@ -222,6 +228,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1836,6 +1843,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/mapdisp/frame.py:367
 msgid "Please wait, loading data..."
@@ -3436,6 +3445,7 @@ msgstr "重置为默认视图"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3508,6 +3518,11 @@ msgstr "重置为默认视图"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/nviz/tools.py:510 ../gui/wxpython/nviz/preferences.py:223
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:442 ../gui/wxpython/nviz/preferences.py:223
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Image Appearance"
@@ -3529,6 +3544,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3904,6 +3920,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/animation/dialogs.py:561
 msgid "Set spatial extent in 2D view"
@@ -4268,6 +4286,7 @@ msgstr "背景色："
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4340,6 +4359,11 @@ msgstr "背景色："
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/nviz/tools.py:562
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:494
 =======
 #: ../gui/wxpython/animation/dialogs.py:1990
@@ -4580,6 +4604,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4626,6 +4651,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Press 'Record' button and start changing the view. It is recommended to use "
 "fly-through mode (Map Display toolbar) to achieve smooth motion."
@@ -4759,6 +4787,7 @@ msgstr "栅格地图"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4831,6 +4860,11 @@ msgstr "栅格地图"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/nviz/tools.py:942 ../gui/wxpython/nviz/tools.py:2045
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:848 ../gui/wxpython/nviz/tools.py:1947
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/nviz/preferences.py:444 ../gui/wxpython/tplot/frame.py:399
@@ -7132,6 +7166,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:55
 msgid "Graphical Modeler - GRASS GIS"
 msgstr ""
@@ -7162,6 +7197,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/tree.py:2153
 =======
 =======
@@ -7177,6 +7214,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/datacatalog/tree.py:2153
@@ -7225,6 +7263,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/tree.py:2178
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "&Copy path to mapset"
@@ -7294,6 +7334,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7323,6 +7364,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/gmodeler/g.gui.gmodeler.py:55
 msgid "Graphical Modeler - GRASS GIS"
 msgstr ""
@@ -7341,6 +7384,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7383,6 +7427,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/datacatalog/tree.py:2267 ../gui/wxpython/history/tree.py:201
 msgid "No available options"
@@ -9004,6 +9050,7 @@ msgstr "定义新GRASS地点"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9082,6 +9129,11 @@ msgstr "定义新GRASS地点"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/location_wizard/wizard.py:198
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:197
 =======
 #: ../gui/wxpython/location_wizard/wizard.py:186
@@ -9098,6 +9150,7 @@ msgstr "定义新GRASS地点"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -9117,6 +9170,8 @@ msgstr "定义新GRASS地点"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -9128,6 +9183,7 @@ msgstr "定义新GRASS地点"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -9207,6 +9263,8 @@ msgstr "定义新GRASS地点"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Change"
 msgstr ""
 
@@ -9229,6 +9287,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9307,6 +9366,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/location_wizard/wizard.py:218
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:217
 =======
 #: ../gui/wxpython/location_wizard/wizard.py:205
@@ -9323,6 +9387,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -9342,6 +9407,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -9353,6 +9420,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -9432,6 +9500,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "(optional)"
 msgstr ""
 
@@ -9479,6 +9549,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/location_wizard/wizard.py:253
 msgid "Location will be created in GRASS database:"
 msgstr ""
@@ -9524,6 +9595,8 @@ msgid "Name '{}' is not a valid name for location. Please use only ASCII charact
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:271
 #, fuzzy
 msgid "Project will be created in GRASS database:"
@@ -9540,6 +9613,7 @@ msgstr "该地点已存在于GRASS数据库中."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -9582,6 +9656,8 @@ msgstr "该地点已存在于GRASS数据库中."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:270
 msgid "Location will be created in GRASS database:"
 msgstr ""
@@ -9605,6 +9681,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9670,6 +9747,8 @@ msgid "Name '{}' is not a valid name for location. Please use only ASCII charact
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr "地点名称<%(name)s>无效.请使用除(%(chars)s)之外的ASCII字及防空格命名."
 =======
 =======
@@ -9687,6 +9766,7 @@ msgid "Location will be created in GRASS database:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9717,6 +9797,8 @@ msgid "Location will be created in GRASS database:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:277
@@ -9731,6 +9813,7 @@ msgid "Name '{}' is not a valid name for location. Please use only ASCII charact
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9785,6 +9868,11 @@ msgid "Location will be created in GRASS database:"
 #: ../gui/wxpython/location_wizard/wizard.py:253
 msgid "Location will be created in GRASS database:"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/location_wizard/wizard.py:253
+msgid "Location will be created in GRASS database:"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:277
@@ -9800,6 +9888,7 @@ msgid "Name '{}' is not a valid name for location. Please use only ASCII charact
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -9846,6 +9935,9 @@ msgid "Name '{}' is not a valid name for location. Please use only ASCII charact
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -9890,6 +9982,7 @@ msgstr "地点标签长度限制1行256个字符串。多出部分将被忽略
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/location_wizard/wizard.py:335
 msgid "Select Coordinate Reference System (CRS)"
 msgstr ""
@@ -9920,6 +10013,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:357
 =======
 =======
@@ -9935,6 +10030,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/location_wizard/wizard.py:357
@@ -9983,6 +10079,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:356
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Select Coordinate Reference System (CRS)"
@@ -10019,6 +10117,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -10048,6 +10147,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/location_wizard/wizard.py:335
 msgid "Select Coordinate Reference System (CRS)"
 msgstr ""
@@ -10066,6 +10167,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10108,6 +10210,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/location_wizard/wizard.py:346
 msgid "Select CRS from a list by EPSG or description"
@@ -10136,6 +10240,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -10168,6 +10273,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -10185,6 +10292,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -10250,6 +10358,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Create a generic cartesian coordinate system (XY)"
 msgstr ""
 
@@ -10387,6 +10497,7 @@ msgstr "选择地理配准文件"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/location_wizard/wizard.py:1450
 msgid "Enter WKT parameters string:"
 msgstr ""
@@ -10432,6 +10543,8 @@ msgid "Select CRS from a list"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:1535
 msgid "Enter WKT parameters string:"
 msgstr ""
@@ -10449,6 +10562,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -10491,6 +10605,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:1534
 msgid "Enter WKT parameters string:"
 msgstr ""
@@ -10518,6 +10634,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/location_wizard/wizard.py:1450
 msgid "Enter WKT parameters string:"
@@ -10555,6 +10672,8 @@ msgid "Enter WKT parameters string:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -10572,6 +10691,7 @@ msgid "Enter WKT parameters string:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10604,6 +10724,8 @@ msgid "Enter WKT parameters string:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/location_wizard/wizard.py:1498
@@ -10621,6 +10743,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10677,6 +10800,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Select CRS from a list"
 msgstr ""
 
@@ -10698,6 +10824,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10776,6 +10903,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/location_wizard/wizard.py:1607
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/location_wizard/wizard.py:1606
 =======
 #: ../gui/wxpython/location_wizard/wizard.py:1517
@@ -10792,6 +10924,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -10811,6 +10944,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -10822,6 +10957,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -10901,6 +11037,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Find more information at:"
 msgstr ""
 
@@ -11958,6 +12096,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12030,6 +12169,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/gmodeler/model.py:659
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gmodeler/model.py:653
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Run model?"
@@ -12054,6 +12198,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -12581,6 +12726,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/photo2image/ip2i_mapdisplay.py:48
 msgid "GRASS GIS Manage Location of Tick Points on a Scanned Photo"
@@ -18634,6 +18781,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/vnet/dialogs.py:74
 msgid "Vector Network Analysis Tool"
 msgstr ""
@@ -18664,6 +18812,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gui_core/ghelp.py:449
 =======
 =======
@@ -18679,6 +18829,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/gui_core/ghelp.py:449
@@ -18727,6 +18878,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/gui_core/ghelp.py:439
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "ORCID"
@@ -18796,6 +18949,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -18825,6 +18979,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/vnet/dialogs.py:74
 msgid "Vector Network Analysis Tool"
 msgstr ""
@@ -18843,6 +18999,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18885,6 +19042,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/gui_core/goutput.py:145
 msgid "Abort running command"
@@ -22115,6 +22274,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22206,6 +22366,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #: ../gui/wxpython/vnet/toolbars.py:54
 msgid "Activate mode for turns editing"
@@ -23049,6 +23214,7 @@ msgstr "左置标签"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23121,6 +23287,11 @@ msgstr "左置标签"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/core/settings.py:816
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/settings.py:812
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "List left"
@@ -23144,6 +23315,7 @@ msgid "Map Display {number}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -23192,6 +23364,9 @@ msgid "Map Display {number}"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/lmgr/frame.py:2179
@@ -23209,6 +23384,7 @@ msgid "Add selected map layers into layer tree"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -23255,6 +23431,8 @@ msgid "Add selected map layers into layer tree"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -24072,6 +24250,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -24106,6 +24285,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:50
 msgid "Multiple import"
 =======
@@ -24126,6 +24307,7 @@ msgid "3D Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24178,6 +24360,9 @@ msgid "3D Raster Map Calculator"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/import_export.py:69
@@ -25509,6 +25694,7 @@ msgstr "警告"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -25600,6 +25786,11 @@ msgstr "警告"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Setup for r.li modules"
 msgstr ""
 
@@ -25699,6 +25890,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25777,6 +25969,11 @@ msgid "Text properties"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:594 ../gui/wxpython/lmgr/frame.py:187
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:597 ../gui/wxpython/lmgr/frame.py:186
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "3D view Toolbar"
@@ -25808,6 +26005,7 @@ msgid "Text properties"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -25854,6 +26052,9 @@ msgid "Text properties"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/mapwin/decorations.py:226
@@ -25871,6 +26072,7 @@ msgid "Remove scale bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25917,6 +26119,8 @@ msgid "Remove scale bar"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -25938,6 +26142,7 @@ msgstr "选择要运行的模型"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26010,6 +26215,11 @@ msgstr "选择要运行的模型"
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/main_window/frame.py:1140 ../gui/wxpython/lmgr/frame.py:1003
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/main_window/frame.py:1105 ../gui/wxpython/lmgr/frame.py:995
 =======
 #: ../gui/wxpython/mapwin/decorations.py:227
@@ -26205,6 +26415,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26251,6 +26462,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Command '%s' not yet implemented in the WxGUI. Try adding it as a command "
@@ -26485,6 +26699,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 =======
@@ -26528,6 +26743,8 @@ msgid "Histogram Tool"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/photo2image/g.gui.photo2image.py:104
 msgid "Please provide a raster map name to process"
 msgstr ""
@@ -26844,6 +27061,7 @@ msgid "Histogram Tool"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
@@ -26918,6 +27136,11 @@ msgid "Histogram Tool"
 #: ../gui/wxpython/wxplot/histogram.py:43
 msgid "Histogram Tool"
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/wxplot/histogram.py:43
+msgid "Histogram Tool"
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/wxplot/histogram.py:51
@@ -26941,6 +27164,7 @@ msgid "Raster cell values"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26978,6 +27202,8 @@ msgid "Raster cell values"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -28917,6 +29143,7 @@ msgid "Neighborhood analysis tool for vector point maps. Makes each cell value a
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -28967,6 +29194,9 @@ msgid "Neighborhood analysis tool for vector point maps. Makes each cell value a
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:346 ../gui/wxpython/menustrings.py:1291
@@ -31515,6 +31745,7 @@ msgid "Sample a space time raster dataset at specific vector point coordinates a
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31552,6 +31783,8 @@ msgid "Sample a space time raster dataset at specific vector point coordinates a
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -31616,6 +31849,7 @@ msgstr "显示选中矢量地图的属性数据"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/menustrings.py:1031 ../gui/wxpython/menustrings.py:1976
 msgid "Univariate raster dataset statistics"
 msgstr "栅格数据集一元统计量"
@@ -31754,6 +31988,8 @@ msgid "Launch Data Catalog."
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/toolbars.py:128
 #, fuzzy
 msgid "Add multiple map layers"
@@ -31775,6 +32011,7 @@ msgid "Launch Data Catalog."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/menustrings.py:2000
 msgid "Launch Data Catalog."
@@ -31849,6 +32086,11 @@ msgid "Launch Data Catalog."
 #: ../gui/wxpython/menustrings.py:2000
 msgid "Launch Data Catalog."
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/menustrings.py:2000
+msgid "Launch Data Catalog."
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/menustrings.py:2007
@@ -31866,6 +32108,7 @@ msgid "Managing GCPs for 3D correction"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -31903,6 +32146,8 @@ msgid "Managing GCPs for 3D correction"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -32019,6 +32264,7 @@ msgid "Delete all text from the shell"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32048,6 +32294,8 @@ msgid "Delete all text from the shell"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/menustrings.py:2092
 msgid "Add or edit vector map"
 msgstr "添加或编辑矢量图"
@@ -32190,6 +32438,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32227,6 +32476,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/startup/locdownload.py:563
 msgid "Location Download"
 msgstr ""
@@ -32282,6 +32533,7 @@ msgid "Unable to create new mapset: {}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32373,6 +32625,11 @@ msgid "Unable to create new mapset: {}"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/lmgr/pyshell.py:143
@@ -32676,6 +32933,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32748,6 +33006,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/lmgr/frame.py:141
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/lmgr/frame.py:140
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "There were some issues when loading menu or Tools tab:"
@@ -32791,6 +33054,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32835,6 +33099,8 @@ msgid "Attribute table <%s> not found. For creating the table switch to 'Manage
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/startup/guiutils.py:743
@@ -33028,6 +33294,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33100,6 +33367,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/dbmgr/base.py:185
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/base.py:184
 =======
 #: ../gui/wxpython/dbmgr/manager.py:78
@@ -33126,6 +33398,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33172,6 +33445,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Attribute table <%s> not found. For creating the table switch to 'Manage "
@@ -33890,6 +34166,7 @@ msgstr "时空数据集中的地图类型（时间点/时间间隔）必须相
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -33962,6 +34239,11 @@ msgstr "时空数据集中的地图类型（时间点/时间间隔）必须相
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/utils.py:210
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/utils.py:209
 =======
 #: ../gui/wxpython/gui_core/gselect.py:886
@@ -34248,6 +34530,7 @@ msgstr "文件"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -34294,6 +34577,9 @@ msgstr "文件"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The temporal extents of maps in space-time datasets have to be the same."
 msgstr "时空数据集中须使用相同的地图时间范畴。"
@@ -34833,6 +35119,7 @@ msgid "Unable to read EPSG codes: %s"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -35479,6 +35766,8 @@ msgid "Select target vector map to display:"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/gui_core/preferences.py:1949
@@ -38085,6 +38374,7 @@ msgstr "标签："
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38117,6 +38407,8 @@ msgstr "标签："
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Location Name:"
 #~ msgstr "地点名称："
 
@@ -38142,6 +38434,7 @@ msgstr "标签："
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38174,6 +38467,8 @@ msgstr "标签："
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #~ msgid "Show comp. extent"
 #~ msgstr "显示计算范围"
 
@@ -38216,6 +38511,7 @@ msgid "Cartographic Composer - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -38266,6 +38562,9 @@ msgid "Cartographic Composer - GRASS GIS"
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #, fuzzy
@@ -38388,6 +38687,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38425,6 +38725,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
@@ -39231,6 +39533,7 @@ msgstr "对一个像元周围的像元值进行函数计算，将得到的值赋
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39304,6 +39607,11 @@ msgstr "对一个像元周围的像元值进行函数计算，将得到的值赋
 #~ msgstr "无法创建地点"
 =======
 >>>>>>> osgeo-main
+=======
+#~ msgid "Unable to create location"
+#~ msgstr "无法创建地点"
+=======
+>>>>>>> osgeo-main
 msgid "GRASS GIS Setup for r.li modules"
 msgstr "GRASS GIS r.li模块设置"
 
@@ -39336,6 +39644,7 @@ msgstr "无法创建地点"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -39382,6 +39691,9 @@ msgstr "无法创建地点"
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 msgid "Select EPSG code of spatial reference system"
 msgstr "选择空间参考系统EPSG代码"
@@ -39434,6 +39746,7 @@ msgstr "创建新地点？"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -39463,6 +39776,8 @@ msgstr "创建新地点？"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #, fuzzy
 msgid "Temporary map '%s' with result "
 msgstr "dig_att文件不存在。"
@@ -40017,6 +40332,7 @@ msgstr "创建新地点？"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -40076,3 +40392,6 @@ msgstr "创建新地点？"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/locale/po/grasswxpy_zh_CN.po b/locale/po/grasswxpy_zh_CN.po
index fc64faa4de9..8acf6024498 100644
--- a/locale/po/grasswxpy_zh_CN.po
+++ b/locale/po/grasswxpy_zh_CN.po
@@ -18600,6 +18600,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18672,6 +18673,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:444
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:443
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Rendering map layers"
@@ -18695,6 +18701,7 @@ msgid "PROJ string (required):"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18786,6 +18793,11 @@ msgid "PROJ string (required):"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/animation/provider.py:562
@@ -18806,6 +18818,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -18878,6 +18891,11 @@ msgstr ""
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+#: ../gui/wxpython/animation/provider.py:792
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 #: ../gui/wxpython/animation/provider.py:789
 =======
 #: ../gui/wxpython/gui_core/preferences.py:1773
@@ -19541,6 +19559,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -19587,6 +19606,9 @@ msgstr ""
 =======
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Directory {t} not removed."
 msgstr ""
diff --git a/locale/templates/grasslibs.pot b/locale/templates/grasslibs.pot
index 1467e490ed7..fc8a262bd6f 100644
--- a/locale/templates/grasslibs.pot
+++ b/locale/templates/grasslibs.pot
@@ -25,6 +25,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 =======
 <<<<<<< HEAD
@@ -53,6 +54,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
 =======
 =======
@@ -68,6 +71,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
@@ -116,6 +120,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
@@ -135,6 +141,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -172,6 +179,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -190,6 +199,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -231,6 +241,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -257,6 +269,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -298,6 +311,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/nviz/render.c:43
 #, c-format
 msgid "Unable to get function address for %s"
@@ -402,6 +417,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -471,6 +487,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/init/grass.py:212
 msgid "WARNING"
 msgstr ""
@@ -1100,6 +1120,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1191,6 +1212,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s: Unable to read font definition file; use the default"
 msgstr ""
@@ -1212,6 +1238,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/driver/parse_ftcap.c:90
 =======
 <<<<<<< HEAD
@@ -1254,6 +1281,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/driver/parse_ftcap.c:91
 =======
 #: ../lib/driver/parse_ftcap.c:90
@@ -1272,6 +1301,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/driver/parse_ftcap.c:90
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1355,6 +1385,11 @@ msgstr ""
 #: ../lib/driver/parse_ftcap.c:90
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/driver/parse_ftcap.c:90
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s: No font definition file"
 msgstr ""
@@ -1376,6 +1411,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/rst/interp_float/vinput2d.c:94
 =======
 <<<<<<< HEAD
@@ -1418,6 +1454,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/cluster/c_exec.c:43
 #, c-format
 msgid "Not enough data points (%d) in cluster"
@@ -2179,6 +2217,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/rst/interp_float/vinput2d.c:94
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2262,6 +2301,11 @@ msgstr ""
 #: ../lib/rst/interp_float/vinput2d.c:94
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/rst/interp_float/vinput2d.c:94
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Vector map <%s> is not 3D"
 msgstr ""
@@ -2283,6 +2327,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2324,6 +2369,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:95
 msgid "Loading data from attribute table ..."
 msgstr ""
@@ -2351,6 +2398,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2420,6 +2468,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:97
 msgid "Loading data from attribute table ..."
 msgstr ""
@@ -2449,6 +2501,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2540,6 +2593,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Database connection not defined for layer %d"
 msgstr ""
@@ -2561,6 +2619,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2602,6 +2661,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:107 ../lib/db/dbmi_client/db.c:45
 #: ../lib/db/dbmi_client/copy_tab.c:114 ../lib/db/dbmi_client/copy_tab.c:135
 #: ../lib/ogsf/gp3.c:208 ../lib/ogsf/gv3.c:356
@@ -2627,6 +2688,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2696,6 +2758,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:109 ../lib/vector/neta/timetables.c:133
 #: ../lib/vector/neta/utils.c:119 ../lib/vector/Vlib/array.c:282
 #: ../lib/vector/Vlib/map.c:340 ../lib/vector/Vlib/write_pg.c:2953
@@ -2723,6 +2789,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2814,6 +2881,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to open database <%s> by driver <%s>"
 msgstr ""
@@ -2835,6 +2907,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/rst/interp_float/vinput2d.c:115
 #: ../lib/rst/interp_float/vinput2d.c:129 ../lib/db/dbmi_client/copy_tab.c:291
 =======
@@ -2878,6 +2951,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:113
 #: ../lib/rst/interp_float/vinput2d.c:126 ../lib/db/dbmi_client/copy_tab.c:293
 =======
@@ -2898,6 +2973,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2927,6 +3003,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/rst/interp_float/vinput2d.c:115
 #: ../lib/rst/interp_float/vinput2d.c:129 ../lib/db/dbmi_client/copy_tab.c:291
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2944,6 +3022,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2986,6 +3065,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Column <%s> not found"
 msgstr ""
@@ -3007,6 +3088,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/rst/interp_float/vinput2d.c:118
 #: ../lib/rst/interp_float/vinput2d.c:131
 =======
@@ -3050,6 +3132,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:115
 #: ../lib/rst/interp_float/vinput2d.c:128
 =======
@@ -3070,6 +3154,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3099,6 +3184,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../lib/rst/interp_float/vinput2d.c:118
 #: ../lib/rst/interp_float/vinput2d.c:131
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3116,6 +3203,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3158,6 +3246,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Data type of column <%s> must be numeric"
 msgstr ""
@@ -3179,6 +3269,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3220,6 +3311,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:140
 msgid "Reading features from vector map ..."
 msgstr ""
@@ -3240,6 +3333,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3309,6 +3403,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:142
 msgid "Reading features from vector map ..."
 msgstr ""
@@ -3331,6 +3429,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3422,6 +3521,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Database record for cat %d not found"
 msgstr ""
@@ -3443,6 +3547,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3484,6 +3589,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:188
 msgid "Negative value of smoothing detected: sm must be >= 0"
 msgstr ""
@@ -3508,6 +3615,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3577,6 +3685,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:192
 msgid "Negative value of smoothing detected: sm must be >= 0"
 msgstr ""
@@ -3603,6 +3715,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3694,6 +3807,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "There are points outside specified 2D/3D region - %d points ignored"
 msgstr ""
@@ -3715,6 +3833,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/rst/interp_float/vinput2d.c:273
 =======
 <<<<<<< HEAD
@@ -3757,6 +3876,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:269
 =======
 #: ../lib/rst/interp_float/vinput2d.c:273
@@ -3775,6 +3896,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/rst/interp_float/vinput2d.c:273
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3858,6 +3980,11 @@ msgstr ""
 #: ../lib/rst/interp_float/vinput2d.c:273
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/rst/interp_float/vinput2d.c:273
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Ignoring %d points (too dense)"
 msgstr ""
@@ -3879,6 +4006,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/rst/interp_float/vinput2d.c:277
 =======
 <<<<<<< HEAD
@@ -3921,6 +4049,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:273
 =======
 #: ../lib/rst/interp_float/vinput2d.c:277
@@ -3939,6 +4069,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/rst/interp_float/vinput2d.c:277
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4022,6 +4153,11 @@ msgstr ""
 #: ../lib/rst/interp_float/vinput2d.c:277
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/rst/interp_float/vinput2d.c:277
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "%d points given for interpolation (after thinning) is less than given "
@@ -4045,6 +4181,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -4086,6 +4223,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:279
 msgid "Zero points in the given region"
 msgstr ""
@@ -4106,6 +4245,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4175,6 +4315,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:282
 msgid "Zero points in the given region"
 msgstr ""
@@ -4197,6 +4341,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4288,6 +4433,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Segmentation parameters set to invalid values: npmin= %d, segmax= %d for "
@@ -4311,6 +4461,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/rst/interp_float/vinput2d.c:293
 =======
 <<<<<<< HEAD
@@ -4353,6 +4504,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:292
 =======
 #: ../lib/rst/interp_float/vinput2d.c:293
@@ -4371,6 +4524,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/rst/interp_float/vinput2d.c:293
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4454,6 +4608,11 @@ msgstr ""
 #: ../lib/rst/interp_float/vinput2d.c:293
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/rst/interp_float/vinput2d.c:293
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "There are less than %d points for interpolation. No segmentation is "
@@ -4492,6 +4651,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -4533,6 +4693,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:329
 msgid "Some points outside of region (ignored)"
 msgstr ""
@@ -4557,6 +4719,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4626,6 +4789,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/vinput2d.c:333
 msgid "Some points outside of region (ignored)"
 msgstr ""
@@ -4652,6 +4819,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4743,6 +4911,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to insert %f,%f,%f a = %d"
 msgstr ""
@@ -4764,6 +4937,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -4799,6 +4973,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/interp2d.c:234
 =======
 =======
@@ -4817,6 +4993,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4865,6 +5042,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/input2d.c:58
 #, c-format
 msgid "Mask raster map <%s> not found"
@@ -4935,6 +5114,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5026,6 +5206,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Overshoot - increase in tension suggested. Overshoot occurs at (%d,%d) cell. "
@@ -5049,6 +5234,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -5090,6 +5276,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/proj/ellipse.c:97
 #, c-format
 msgid "Invalid ellipsoid <%s> in file"
@@ -5532,6 +5720,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -5601,6 +5790,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/rst/interp_float/resout2d.c:77
 msgid "Temporarily changing the region to desired resolution..."
 msgstr ""
@@ -5661,6 +5854,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5752,6 +5946,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "G__open_misc(read): mapset <%s> doesn't match xmapset <%s>"
 msgstr ""
@@ -5773,6 +5972,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/open_misc.c:74
 =======
 <<<<<<< HEAD
@@ -5815,6 +6015,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/open_misc.c:73
 =======
 #: ../lib/gis/open_misc.c:74
@@ -5833,6 +6035,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/open_misc.c:74
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -5916,6 +6119,11 @@ msgstr ""
 #: ../lib/gis/open_misc.c:74
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/open_misc.c:74
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "G__open_misc(write): xmapset <%s> != G_mapset() <%s>"
 msgstr ""
@@ -5937,6 +6145,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -5978,6 +6187,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/legal_name.c:40
 #, c-format
 msgid "Illegal filename <%s>. Cannot start with '.' or be 'NULL'."
@@ -6349,6 +6560,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -6418,6 +6630,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/lrand48.c:85
 #, c-format
 msgid "gettimeofday failed: %s"
@@ -6453,6 +6669,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -6544,6 +6761,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Bug in UI description. Option key <%s> is not valid"
 msgstr ""
@@ -6565,6 +6787,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:363
 =======
 <<<<<<< HEAD
@@ -6607,6 +6830,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:366
 =======
 #: ../lib/gis/parser.c:363
@@ -6625,6 +6850,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:363
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -6708,6 +6934,11 @@ msgstr ""
 #: ../lib/gis/parser.c:363
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:363
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Bug in UI description. Description for option <%s> missing"
 msgstr ""
@@ -6729,6 +6960,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:415
 =======
 <<<<<<< HEAD
@@ -6771,6 +7003,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:419
 =======
 #: ../lib/gis/parser.c:415
@@ -6789,6 +7023,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:415
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -6872,6 +7107,11 @@ msgstr ""
 #: ../lib/gis/parser.c:415
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:415
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Bug in UI description. Option '%s' in <%s> does not exist"
 msgstr ""
@@ -6893,6 +7133,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -6934,6 +7175,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:551
 msgid "Use either --quiet or --verbose flag, not both. Assuming --verbose."
 msgstr ""
@@ -6962,6 +7205,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -7031,6 +7275,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:539
 msgid "Use either --quiet or --verbose flag, not both. Assuming --verbose."
 msgstr ""
@@ -7061,6 +7309,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7152,6 +7401,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Sorry <%s> is not a valid option"
 msgstr ""
@@ -7173,6 +7427,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -7214,7 +7469,9 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
-#: ../lib/gis/parser.c:625
+=======
+>>>>>>> osgeo-main
+#: ../lib/gis/parser.c:625
 msgid "Your installation doesn't include GUI, exiting."
 msgstr ""
 
@@ -7242,6 +7499,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -7311,6 +7569,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:612
 msgid "Your installation doesn't include GUI, exiting."
 msgstr ""
@@ -7337,6 +7599,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7428,6 +7691,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s: Sorry, <%c> is not a valid flag"
 msgstr ""
@@ -7449,6 +7717,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1138
 =======
 <<<<<<< HEAD
@@ -7491,6 +7760,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1040 ../lib/gis/parser.c:1050 ../lib/gis/parser.c:1060
 #, c-format
 msgid "Please update the usage of <%s>: flag <%c> has been renamed to <%s>"
@@ -7520,6 +7791,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1138
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -7603,6 +7875,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1138
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1138
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s: Sorry, <%s=> is ambiguous"
 msgstr ""
@@ -7624,6 +7901,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1141
 =======
 <<<<<<< HEAD
@@ -7666,6 +7944,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1230
 =======
 #: ../lib/gis/parser.c:1141
@@ -7684,6 +7964,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1141
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -7767,6 +8048,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1141
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1141
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Option <%s=> matches"
 msgstr ""
@@ -7788,6 +8074,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1159
 =======
 <<<<<<< HEAD
@@ -7830,6 +8117,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1250
 #, c-format
 msgid ""
@@ -7860,6 +8149,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1159
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -7943,6 +8233,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1159
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1159
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Please update the usage of <%s>: option <%s> has been renamed to <%s>"
 msgstr ""
@@ -7964,6 +8259,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1172
 =======
 <<<<<<< HEAD
@@ -8006,6 +8302,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1279
 =======
 #: ../lib/gis/parser.c:1172
@@ -8024,6 +8322,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1172
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8107,6 +8406,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1172
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1172
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s: Sorry, <%s> is not a valid parameter"
 msgstr ""
@@ -8128,6 +8432,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1178 ../lib/gis/parser.c:1437
 =======
 <<<<<<< HEAD
@@ -8170,6 +8475,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1286 ../lib/gis/parser.c:1547
 =======
 #: ../lib/gis/parser.c:1178 ../lib/gis/parser.c:1437
@@ -8188,6 +8495,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1178 ../lib/gis/parser.c:1437
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8271,6 +8579,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1178 ../lib/gis/parser.c:1437
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1178 ../lib/gis/parser.c:1437
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "<%s> is an abbreviation for <%s>"
 msgstr ""
@@ -8292,6 +8605,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1183
 =======
 <<<<<<< HEAD
@@ -8334,6 +8648,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1291
 =======
 #: ../lib/gis/parser.c:1183
@@ -8352,6 +8668,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1183
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8435,6 +8752,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1183
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1183
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Option <%s> does not accept multiple answers"
 msgstr ""
@@ -8456,6 +8778,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1255
 =======
 <<<<<<< HEAD
@@ -8498,6 +8821,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1364
 =======
 #: ../lib/gis/parser.c:1255
@@ -8516,6 +8841,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1255
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8599,6 +8925,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1255
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1255
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Illegal range syntax for parameter <%s>\n"
@@ -8622,6 +8953,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1261
 =======
 <<<<<<< HEAD
@@ -8664,6 +8996,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1371
 =======
 #: ../lib/gis/parser.c:1261
@@ -8682,6 +9016,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1261
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8765,6 +9100,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1261
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1261
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Value <%s> out of range for parameter <%s>\n"
@@ -8788,6 +9128,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1267
 =======
 <<<<<<< HEAD
@@ -8830,6 +9171,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1377
 =======
 #: ../lib/gis/parser.c:1267
@@ -8848,6 +9191,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1267
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8931,6 +9275,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1267
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1267
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Missing value for parameter <%s>"
 msgstr ""
@@ -8952,6 +9301,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1273
 =======
 <<<<<<< HEAD
@@ -8994,6 +9344,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1381
 =======
 #: ../lib/gis/parser.c:1273
@@ -9012,6 +9364,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1273
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -9095,6 +9448,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1273
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1273
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Invalid value <%s> for parameter <%s>"
 msgstr ""
@@ -9116,6 +9474,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1279
 =======
 <<<<<<< HEAD
@@ -9158,6 +9517,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1387
 =======
 #: ../lib/gis/parser.c:1279
@@ -9176,6 +9537,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1279
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -9259,6 +9621,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1279
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1279
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Value <%s> ambiguous for parameter <%s>\n"
@@ -9282,6 +9649,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1459
 =======
 <<<<<<< HEAD
@@ -9324,6 +9692,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1573
 =======
 #: ../lib/gis/parser.c:1459
@@ -9342,6 +9712,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1459
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -9425,6 +9796,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1459
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1459
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Required parameter <%s> not set:\n"
@@ -9448,6 +9824,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1551
 =======
 <<<<<<< HEAD
@@ -9490,6 +9867,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1666
 =======
 #: ../lib/gis/parser.c:1551
@@ -9508,6 +9887,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1551
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -9591,6 +9971,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1551
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1551
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Option <%s> must be provided in multiples of %d\n"
@@ -9614,6 +9999,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1625 ../lib/gis/error.c:363
 =======
 <<<<<<< HEAD
@@ -9656,6 +10042,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1739 ../lib/gis/error.c:367
 =======
 #: ../lib/gis/parser.c:1625 ../lib/gis/error.c:363
@@ -9674,6 +10062,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1625 ../lib/gis/error.c:363
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -9757,6 +10146,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1625 ../lib/gis/error.c:363
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1625 ../lib/gis/error.c:363
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "ERROR: "
 msgstr ""
@@ -9778,6 +10172,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1627 ../lib/gis/parser.c:1634
 =======
 <<<<<<< HEAD
@@ -9820,6 +10215,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1741 ../lib/gis/parser.c:1751
 =======
 #: ../lib/gis/parser.c:1627 ../lib/gis/parser.c:1634
@@ -9838,6 +10235,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1627 ../lib/gis/parser.c:1634
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -9921,6 +10319,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1627 ../lib/gis/parser.c:1634
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1627 ../lib/gis/parser.c:1634
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "option <%s>: <%s> exists. To overwrite, use the --overwrite flag"
 msgstr ""
@@ -9942,6 +10345,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1744
 =======
 <<<<<<< HEAD
@@ -9984,6 +10388,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1863
 =======
 #: ../lib/gis/parser.c:1744
@@ -10002,6 +10408,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1744
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -10085,6 +10492,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1744
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1744
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s= is not a separator option"
 msgstr ""
@@ -10106,6 +10518,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1747
 =======
 <<<<<<< HEAD
@@ -10148,6 +10561,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1866
 =======
 #: ../lib/gis/parser.c:1747
@@ -10166,6 +10581,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1747
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -10249,6 +10665,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1747
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1747
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "No separator given for %s="
 msgstr ""
@@ -10270,6 +10691,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1809 ../lib/gis/parser.c:1826
 =======
 <<<<<<< HEAD
@@ -10312,6 +10734,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1928 ../lib/gis/parser.c:1947
 =======
 #: ../lib/gis/parser.c:1809 ../lib/gis/parser.c:1826
@@ -10330,6 +10754,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1809 ../lib/gis/parser.c:1826
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -10413,6 +10838,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1809 ../lib/gis/parser.c:1826
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1809 ../lib/gis/parser.c:1826
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s= is not a file option"
 msgstr ""
@@ -10434,6 +10864,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1811
 =======
 <<<<<<< HEAD
@@ -10476,6 +10907,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1930
 =======
 #: ../lib/gis/parser.c:1811
@@ -10494,6 +10927,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1811
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -10577,6 +11011,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1811
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1811
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Opening multiple files not supported for %s="
 msgstr ""
@@ -10598,6 +11037,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1817
 =======
 <<<<<<< HEAD
@@ -10640,6 +11080,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1936
 =======
 #: ../lib/gis/parser.c:1817
@@ -10658,6 +11100,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1817
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -10741,6 +11184,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1817
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1817
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to open %s file <%s>: %s"
 msgstr ""
@@ -10762,6 +11210,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser.c:1823
 =======
 <<<<<<< HEAD
@@ -10804,6 +11253,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser.c:1943
 =======
 #: ../lib/gis/parser.c:1823
@@ -10822,6 +11273,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser.c:1823
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -10905,6 +11357,11 @@ msgstr ""
 #: ../lib/gis/parser.c:1823
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser.c:1823
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to create %s file <%s>: %s"
 msgstr ""
@@ -10926,6 +11383,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -10967,6 +11425,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/open.c:69
 #, c-format
 msgid "G__open(read): mapset <%s> doesn't match xmapset <%s>"
@@ -11899,6 +12359,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -11968,6 +12429,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/gisinit.c:54 ../lib/gis/gisinit.c:89
 #, c-format
 msgid ""
@@ -12051,6 +12516,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -12142,6 +12608,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s: shouldn't happen: code=%d P=(%f,%f) S=(%f,%f)(%f,%f)"
 msgstr ""
@@ -12163,6 +12634,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -12204,6 +12676,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/seek.c:54 ../lib/gis/seek.c:61
 #, c-format
 msgid "Unable to seek: %s"
@@ -12561,6 +13035,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -12630,6 +13105,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/parser_help.c:84
 msgid "Description:"
 msgstr ""
@@ -12667,6 +13146,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -12708,6 +13188,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser_help.c:227
 msgid "Super quiet module output"
 msgstr ""
@@ -12732,6 +13214,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -12801,6 +13284,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/parser_help.c:223 ../lib/gis/parser_interface.c:329
 #: ../lib/gis/parser_rest.c:164 ../lib/gis/parser_html.c:179
 msgid "Allow output files to overwrite existing files"
@@ -12851,6 +13338,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -12942,6 +13430,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "  %*s   default: %s\n"
 msgstr ""
@@ -12963,6 +13456,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/parser_help.c:287
 =======
 <<<<<<< HEAD
@@ -13005,6 +13499,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/parser_help.c:284
 =======
 #: ../lib/gis/parser_help.c:287
@@ -13023,6 +13519,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/parser_help.c:287
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -13106,6 +13603,11 @@ msgstr ""
 #: ../lib/gis/parser_help.c:287
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/parser_help.c:287
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "  %*s   options: "
 msgstr ""
@@ -13127,6 +13629,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -13168,6 +13671,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/env.c:129
 msgid "No active GRASS session: GISRC environment variable not set"
 msgstr ""
@@ -13205,6 +13710,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -13274,6 +13780,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/proj3.c:124 ../lib/vector/Vlib/header.c:556
 msgid "Unknown projection"
 msgstr ""
@@ -13344,6 +13854,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -13376,6 +13887,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -13393,6 +13906,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -13458,6 +13972,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to make mapset element %s (%s): %s"
 msgstr ""
@@ -13479,6 +13995,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/mapset_msc.c:201
 =======
 <<<<<<< HEAD
@@ -13507,6 +14024,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset_msc.c:229
 =======
 =======
@@ -13522,6 +14041,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../lib/gis/mapset_msc.c:229
@@ -13570,6 +14090,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset_msc.c:228
 =======
 #: ../lib/gis/mapset_msc.c:201
@@ -13589,6 +14111,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/mapset_msc.c:201
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -13626,6 +14149,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -13644,6 +14169,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13685,6 +14211,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to access mapset element %s (%s): %s"
 msgstr ""
@@ -13706,6 +14234,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -13741,6 +14270,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/cmprzlib.c:140
 =======
 =======
@@ -13759,6 +14290,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -13807,6 +14339,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/paths.c:201
 #, c-format
 msgid "Unable to open file <%s> for reading"
@@ -14427,6 +14961,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -14518,6 +15053,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "ZLIB compression error %d: %s"
 msgstr ""
@@ -14539,6 +15079,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/gis/cmprzlib.c:204
 =======
 <<<<<<< HEAD
@@ -14581,6 +15122,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/cmprzlib.c:199
 =======
 #: ../lib/gis/cmprzlib.c:204
@@ -14599,6 +15142,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/gis/cmprzlib.c:204
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -14682,6 +15226,11 @@ msgstr ""
 #: ../lib/gis/cmprzlib.c:204
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/gis/cmprzlib.c:204
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "ZLIB decompression error %d: %s"
 msgstr ""
@@ -14702,6 +15251,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -14794,6 +15344,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/make_mapset.c:66
 #, c-format
 msgid "Location <%s> doesn't exist"
@@ -15114,6 +15669,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -15205,6 +15761,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/mapset.c:38
 msgid "MAPSET is not set"
 msgstr ""
@@ -15231,6 +15792,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -15272,6 +15834,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/gis/make_mapset.c:67
 #, c-format
 msgid "Location <%s> doesn't exist"
@@ -15888,6 +16452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -15957,6 +16522,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/gis/worker.c:84
 msgid "Task already has a worker"
 msgstr ""
@@ -20034,6 +20603,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -20125,6 +20695,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Qualified name <%s> doesn't match mapset <%s>"
 msgstr ""
@@ -20146,6 +20721,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/vector/Vlib/color_write.c:91 ../lib/raster/color_write.c:96
 =======
 <<<<<<< HEAD
@@ -20188,6 +20764,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/raster/color_write.c:96 ../lib/vector/Vlib/color_write.c:91
 =======
 #: ../lib/vector/Vlib/color_write.c:91 ../lib/raster/color_write.c:96
@@ -20206,6 +20784,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/vector/Vlib/color_write.c:91 ../lib/raster/color_write.c:96
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -20289,6 +20868,11 @@ msgstr ""
 #: ../lib/vector/Vlib/color_write.c:91 ../lib/raster/color_write.c:96
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/vector/Vlib/color_write.c:91 ../lib/raster/color_write.c:96
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to create <%s> file for map <%s>"
 msgstr ""
@@ -20310,6 +20894,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -20351,6 +20936,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/raster/quant_rw.c:88
 #, c-format
 msgid "Unable to read fp range for raster map <%s>"
@@ -21191,6 +21778,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -21260,6 +21848,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/vector/Vlib/remove_areas.c:107 ../lib/vector/Vlib/remove_areas.c:268
 msgid "Area is composed of dead boundary"
 msgstr ""
@@ -21815,6 +22407,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -21906,6 +22499,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to open output file <%s>"
 msgstr ""
@@ -21927,6 +22525,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/cairodriver/write_xid.c:19
 =======
 <<<<<<< HEAD
@@ -21969,6 +22568,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/pngdriver/read_png.c:80
 msgid "Input PNG file is not 8-bit"
 msgstr ""
@@ -22252,6 +22853,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/cairodriver/write_xid.c:19
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -22335,6 +22937,11 @@ msgstr ""
 #: ../lib/cairodriver/write_xid.c:19
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/cairodriver/write_xid.c:19
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to write output file <%s>"
 msgstr ""
@@ -22355,6 +22962,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -22447,6 +23055,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/cairodriver/graph.c:67
 msgid "Unable to open display"
 msgstr ""
@@ -22500,6 +23113,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22591,6 +23205,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/cairodriver/read_xid.c:14
 #, c-format
 msgid "Unable to open input file <%s>"
@@ -22623,6 +23242,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -22664,6 +23284,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/cairodriver/read_bmp.c:89 ../lib/cairodriver/read_ppm.c:28
 #, c-format
 msgid "Cairo: unable to open input file <%s>"
@@ -22769,6 +23391,7 @@ msgid "Cairo: unable to open mask file <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -22838,6 +23461,10 @@ msgid "Cairo: unable to open mask file <%s>"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/cairodriver/raster.c:104
 msgid "Failed to create cairo surface"
 msgstr ""
@@ -22861,6 +23488,7 @@ msgid "Cairo_Bitmap: Failed to create source"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -22952,6 +23580,11 @@ msgid "Cairo_Bitmap: Failed to create source"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/cairodriver/text.c:51
@@ -22976,6 +23609,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -23017,6 +23651,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/cairodriver/text.c:60
 msgid "Some characters could not be converted to UTF-8"
 msgstr ""
@@ -23411,6 +24047,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -23480,6 +24117,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/cairodriver/text.c:61
 msgid "Some characters could not be converted to UTF-8"
 msgstr ""
@@ -23507,6 +24148,7 @@ msgid "db_convert_value_into_string(): unrecongized sqltype-type"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23598,6 +24240,11 @@ msgid "db_convert_value_into_string(): unrecongized sqltype-type"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/db/dbmi_base/default_name.c:139
@@ -23629,6 +24276,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -23670,6 +24318,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/error.c:135
 msgid "dbmi: Out of Memory"
 msgstr ""
@@ -23690,6 +24340,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -23759,6 +24410,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/error.c:136
 msgid "dbmi: Out of Memory"
 msgstr ""
@@ -23781,6 +24436,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -23872,6 +24528,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "dbmi: %s() not implemented"
 msgstr ""
@@ -23893,6 +24554,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/db/dbmi_base/error.c:163
 =======
 <<<<<<< HEAD
@@ -23935,6 +24597,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/error.c:162
 =======
 #: ../lib/db/dbmi_base/error.c:163
@@ -23953,6 +24617,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/db/dbmi_base/error.c:163
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -24036,6 +24701,11 @@ msgstr ""
 #: ../lib/db/dbmi_base/error.c:163
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/db/dbmi_base/error.c:163
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "dbmi: Invalid procedure %d"
 msgstr ""
@@ -24057,6 +24727,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -24098,6 +24769,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/xdrvalue.c:82
 msgid "send data: invalid C-type"
 msgstr ""
@@ -24126,6 +24799,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -24195,6 +24869,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/xdrtable.c:109
 msgid "fetch: table has wrong number of columns"
 msgstr ""
@@ -24216,6 +24894,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -24257,6 +24936,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/index.c:180
 msgid "db_set_index_column_name(): invalid column number"
 msgstr ""
@@ -24302,6 +24983,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -24371,6 +25053,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/xdrvalue.c:82
 msgid "send data: invalid C-type"
 msgstr ""
@@ -24423,6 +25109,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -24514,6 +25201,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/test/test_columns.c:37
 msgid ""
 "\n"
@@ -24561,6 +25253,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -24596,6 +25289,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_client/table.c:47 ../lib/db/dbmi_client/delete_tab.c:41
 =======
 =======
@@ -24614,6 +25309,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -24662,6 +25358,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_base/test/test_table.c:38
 msgid ""
 "\n"
@@ -24721,6 +25419,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -24812,6 +25511,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable open database <%s> by driver <%s>"
 msgstr ""
@@ -24833,6 +25537,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/db/dbmi_client/delete_tab.c:53
 =======
 <<<<<<< HEAD
@@ -24875,6 +25580,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_client/table.c:111 ../lib/db/dbmi_client/copy_tab.c:246
 #: ../lib/db/dbmi_client/copy_tab.c:320 ../lib/vector/Vlib/write_ogr.c:209
 #, c-format
@@ -24971,6 +25678,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/db/dbmi_client/delete_tab.c:53
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -25054,6 +25762,11 @@ msgstr ""
 #: ../lib/db/dbmi_client/delete_tab.c:53
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/db/dbmi_client/delete_tab.c:53
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to drop table: '%s'"
 msgstr ""
@@ -25075,6 +25788,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -25110,6 +25824,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/psdriver/graph_set.c:195
 =======
 =======
@@ -25128,6 +25844,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25176,6 +25893,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/db/dbmi_client/copy_tab.c:91
 #, c-format
 msgid "Array of values to select from column <%s> is empty"
@@ -25496,6 +26215,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -25587,6 +26307,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "ps: truecolor status %s"
 msgstr ""
@@ -25608,6 +26333,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -25643,6 +26369,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/psdriver/graph_set.c:214
 =======
 =======
@@ -25661,6 +26389,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -25709,6 +26438,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/psdriver/graph_set.c:199 ../lib/pngdriver/graph_set.c:102
 msgid "enabled"
 msgstr ""
@@ -25735,6 +26466,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -25826,6 +26558,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "ps: collecting to file '%s'"
 msgstr ""
@@ -25847,6 +26584,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/psdriver/graph_set.c:218
 =======
 <<<<<<< HEAD
@@ -25889,6 +26627,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/psdriver/graph_set.c:215
 =======
 #: ../lib/psdriver/graph_set.c:218
@@ -25907,6 +26647,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/psdriver/graph_set.c:218
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -25990,6 +26731,11 @@ msgstr ""
 #: ../lib/psdriver/graph_set.c:218
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/psdriver/graph_set.c:218
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "ps: image size %dx%d"
 msgstr ""
@@ -26011,6 +26757,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26052,6 +26799,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/htmldriver/graph_set.c:95
 #, c-format
 msgid "html: collecting to file '%s'"
@@ -26095,6 +26844,7 @@ msgid "Unable to read vector map <%s>"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26164,6 +26914,10 @@ msgid "Unable to read vector map <%s>"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/ogsf/gsdrape.c:207
 msgid "Unable to process vector map - out of memory"
 msgstr ""
@@ -26371,6 +27125,7 @@ msgid "Maximum number of datasets exceeded"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26462,6 +27217,11 @@ msgid "Maximum number of datasets exceeded"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../lib/ogsf/gp3.c:148
@@ -26496,6 +27256,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/ogsf/gp3.c:288
 =======
 <<<<<<< HEAD
@@ -26538,6 +27299,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/ogsf/gp3.c:236 ../lib/ogsf/gv3.c:384
 #, c-format
 msgid "No color rule defined for category %d"
@@ -26566,6 +27329,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/ogsf/gp3.c:288
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -26649,6 +27413,11 @@ msgstr ""
 #: ../lib/ogsf/gp3.c:288
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/ogsf/gp3.c:288
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "%d points without category. Unable to determine color rules for features "
@@ -26672,6 +27441,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26713,6 +27483,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/ogsf/gsd_img_ppm.c:50 ../lib/ogsf/gsd_img_tif.c:63
 msgid "Unable to get image of current GL screen"
 msgstr ""
@@ -26755,6 +27527,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26824,6 +27597,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/ogsf/gvl_file.c:103
 msgid "Maximum number of datafiles exceeded"
 msgstr ""
@@ -26845,6 +27622,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../lib/ogsf/gvl_file.c:442
 =======
 <<<<<<< HEAD
@@ -26887,6 +27665,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/ogsf/gvl_file.c:441
 =======
 #: ../lib/ogsf/gvl_file.c:442
@@ -26905,6 +27685,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../lib/ogsf/gvl_file.c:442
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -26988,6 +27769,11 @@ msgstr ""
 #: ../lib/ogsf/gvl_file.c:442
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../lib/ogsf/gvl_file.c:442
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to read range of 3D raster map <%s>"
 msgstr ""
@@ -27009,6 +27795,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27050,6 +27837,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../lib/ogsf/gsd_surf.c:1737
 msgid "Cut-plane points mis-match between surfaces. Check resolution(s)."
 msgstr ""
@@ -30054,6 +30843,7 @@ msgid "[%s]: No such color"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -30123,6 +30913,10 @@ msgid "[%s]: No such color"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../lib/pngdriver/graph_set.c:101
 #, c-format
 msgid "png: truecolor status %s"
@@ -31257,6 +32051,7 @@ msgid "No ellipsoid info given in file"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31348,4 +32143,9 @@ msgid "No ellipsoid info given in file"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
diff --git a/locale/templates/grassmods.pot b/locale/templates/grassmods.pot
index df2df1e67a9..48e507a8588 100644
--- a/locale/templates/grassmods.pot
+++ b/locale/templates/grassmods.pot
@@ -25,6 +25,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 =======
 <<<<<<< HEAD
@@ -53,6 +54,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
 =======
 =======
@@ -68,6 +71,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
@@ -116,6 +120,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
@@ -135,6 +141,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -172,6 +179,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -190,6 +199,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -231,6 +241,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -258,6 +270,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -299,6 +312,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.merge_to_translate.c:2
 #: ../locale/scriptstrings/t.snap_to_translate.c:2
 #: ../locale/scriptstrings/t.vect.export_to_translate.c:2
@@ -375,6 +390,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -444,6 +460,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.series_to_translate.c:2
 #: ../locale/scriptstrings/t.remove_to_translate.c:2
 #: ../locale/scriptstrings/t.rast.out.vtk_to_translate.c:2
@@ -519,6 +539,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -610,6 +631,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:2
 msgid "temporal"
 msgstr ""
@@ -631,6 +657,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -672,6 +699,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:35 ../general/g.gisenv/main.c:43
 #: ../general/g.region/main.c:61 ../general/g.mapset/main.c:50
 #: ../general/g.mapsets/main.c:87 ../display/d.fontlist/main.c:46
@@ -720,6 +749,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -789,6 +819,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:35 ../display/d.fontlist/main.c:46
 #: ../display/d.font/main.c:46 ../display/d.colorlist/main.c:36
 #: ../general/g.mapsets/main.c:64 ../general/g.region/main.c:66
@@ -829,6 +863,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -920,6 +955,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Prints/sets general temporal GIS database connection for current mapset."
 msgstr ""
@@ -941,6 +981,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -982,6 +1023,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:42 ../db/db.connect/main.c:50
 msgid "Print current connection parameters and exit"
 msgstr ""
@@ -1035,6 +1078,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1104,6 +1148,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:42 ../db/db.connect/main.c:51
 msgid "Print current connection parameters and exit"
 msgstr ""
@@ -1127,6 +1175,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1218,6 +1267,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/g.extension_to_translate.c:17
 #: ../locale/scriptstrings/g.extension_to_translate.c:19
 #: ../locale/scriptstrings/g.extension_to_translate.c:21
@@ -1239,6 +1293,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1280,6 +1335,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.import.netcdf_to_translate.c:36
 #: ../locale/scriptstrings/i.modis.import_to_translate.c:16
 #: ../locale/scriptstrings/i.modis.import_to_translate.c:18
@@ -1299,6 +1356,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1368,6 +1426,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.unpack_to_translate.c:12
 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:34
 #: ../locale/scriptstrings/v.unpack_to_translate.c:13
@@ -1390,6 +1452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1481,6 +1544,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:16
 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:19
 #: ../locale/scriptstrings/v.in.pygbif_to_translate.c:21
@@ -1502,6 +1570,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1543,6 +1612,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.import_to_translate.c:35
 #: ../locale/scriptstrings/i.sentinel.import_to_translate.c:37
 #: ../locale/scriptstrings/t.rast.colors_to_translate.c:18
@@ -1589,6 +1660,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1658,6 +1730,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.download_to_translate.c:50
 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:30
 #: ../locale/scriptstrings/i.modis.import_to_translate.c:16
@@ -1724,6 +1800,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1756,6 +1833,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -1773,6 +1852,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -1838,6 +1918,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Print"
 msgstr ""
 
@@ -1863,6 +1945,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../temporal/t.connect/main.c:60 ../temporal/t.connect/main.c:65
 #: ../temporal/t.connect/main.c:69 ../general/g.gisenv/main.c:66
 =======
@@ -1906,6 +1989,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:61 ../temporal/t.connect/main.c:66
 #: ../temporal/t.connect/main.c:70 ../general/g.gisenv/main.c:66
 =======
@@ -1926,6 +2011,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1955,6 +2041,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../temporal/t.connect/main.c:60 ../temporal/t.connect/main.c:65
 #: ../temporal/t.connect/main.c:69 ../general/g.gisenv/main.c:66
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1972,6 +2060,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2014,6 +2103,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../general/g.gisenv/main.c:74 ../general/g.gisenv/main.c:84
 #: ../db/db.connect/main.c:64 ../db/db.connect/main.c:70
 #: ../db/db.connect/main.c:82 ../db/db.connect/main.c:91
@@ -2046,6 +2137,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2087,6 +2179,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:60
 msgid "Print current connection parameter in shell style and exit"
 msgstr ""
@@ -2111,6 +2205,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2180,6 +2275,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:59
 msgid "Print current connection parameter in shell style and exit"
 msgstr ""
@@ -2206,6 +2305,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2297,6 +2397,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Default TGIS driver / database set to:\n"
@@ -2321,6 +2426,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2362,6 +2468,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:119
 msgid "Default TGIS driver is not set"
 msgstr ""
@@ -2382,6 +2490,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2451,6 +2560,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../temporal/t.connect/main.c:118
 msgid "Default TGIS driver is not set"
 msgstr ""
@@ -2473,6 +2586,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2564,6 +2678,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Default TGIS database is not set"
 msgstr ""
 
@@ -2585,6 +2704,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../db/db.connect/main.c:197
 =======
 <<<<<<< HEAD
@@ -2627,6 +2747,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../db/db.connect/main.c:198
 =======
 #: ../db/db.connect/main.c:197
@@ -2645,6 +2767,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../db/db.connect/main.c:197
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2728,6 +2851,11 @@ msgstr ""
 #: ../db/db.connect/main.c:197
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../db/db.connect/main.c:197
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Default driver / database set to:\n"
@@ -2752,6 +2880,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2793,6 +2922,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../doc/raster/r.example/main.c:83 ../raster/r.external/main.c:57
 #: ../raster/r.quantile/main.c:297 ../raster/r.terraflow/main.cpp:457
 #: ../raster/r.info/main.c:71 ../raster/r.patch/main.c:68
@@ -12654,6 +12785,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -12723,6 +12855,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.acca/main.c:57
 #: ../imagery/i.landsat.acca/algorithm.c:380
 #: ../imagery/i.landsat.acca/tools.c:126 ../imagery/i.landsat.toar/main.c:406
@@ -12745,6 +12881,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -12836,6 +12973,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to open raster map <%s>"
 msgstr ""
@@ -12857,6 +12999,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -12898,6 +13041,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../raster/r.mapcalc/map3.c:607 ../raster/r.sunhours/main.c:335
 #: ../raster/r.sunhours/main.c:346 ../raster/r.sunhours/main.c:357
 #: ../imagery/i.landsat.toar/main.c:564
@@ -12920,6 +13065,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -12989,6 +13135,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.acca/main.c:70
 #, c-format
 msgid ""
@@ -13281,6 +13431,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -13372,6 +13523,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to create raster map <%s>"
 msgstr ""
@@ -13393,6 +13549,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -13434,6 +13591,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../raster/r.mapcalc/map3.c:631
 msgid "Unable to close output raster map"
 msgstr ""
@@ -25696,6 +25855,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -25765,6 +25925,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.acca/algorithm.c:237
 msgid "Processing first pass..."
 msgstr ""
@@ -25911,6 +26075,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26002,6 +26167,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to read signature file <%s>"
 msgstr ""
@@ -26023,6 +26193,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26064,6 +26235,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.cluster/open_files.c:65 ../imagery/i.maxlik/open.c:47
 #, c-format
 msgid "<%s> has too many signatures (limit is 255)"
@@ -26086,6 +26259,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26155,6 +26329,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.smap/openfiles.c:33
 #, c-format
 msgid "Signature file <%s> is invalid"
@@ -26184,6 +26362,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26275,6 +26454,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Signature - group member semantic label mismatch.\n"
@@ -26299,6 +26483,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26340,6 +26525,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.cluster/open_files.c:74 ../imagery/i.smap/openfiles.c:43
 #: ../imagery/i.cca/main.c:139 ../imagery/i.maxlik/open.c:55
 msgid "none"
@@ -26545,6 +26732,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26614,6 +26802,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.smap/openfiles.c:45 ../imagery/i.smap/openfiles.c:46
 #: ../imagery/i.cca/main.c:143 ../imagery/i.cca/main.c:144
 #: ../imagery/i.cluster/open_files.c:74 ../imagery/i.cluster/open_files.c:75
@@ -26669,6 +26861,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26760,6 +26953,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Group <%s> not found in current mapset"
 msgstr ""
@@ -26781,6 +26979,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../imagery/i.smap/parse.c:64 ../imagery/i.gensig/parse.c:44
 #: ../imagery/i.cca/main.c:119 ../imagery/i.cluster/main.c:173
 #: ../imagery/i.gensigset/parse.c:50 ../imagery/i.maxlik/open.c:20
@@ -26825,6 +27024,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.cluster/main.c:172 ../imagery/i.gensig/parse.c:45
 #: ../imagery/i.smap/parse.c:65 ../imagery/i.cca/main.c:116
 #: ../imagery/i.maxlik/open.c:19 ../imagery/i.gensigset/parse.c:52
@@ -26847,6 +27048,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -26876,6 +27078,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../imagery/i.smap/parse.c:64 ../imagery/i.gensig/parse.c:44
 #: ../imagery/i.cca/main.c:119 ../imagery/i.cluster/main.c:173
 #: ../imagery/i.gensigset/parse.c:50 ../imagery/i.maxlik/open.c:20
@@ -26894,6 +27098,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -26936,6 +27141,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Subgroup <%s> in group <%s> not found"
 msgstr ""
@@ -26957,6 +27164,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26998,6 +27206,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.cluster/main.c:178 ../imagery/i.gensig/parse.c:50
 #: ../imagery/i.svm.predict/main.c:125 ../imagery/i.svm.train/main.c:265
 #: ../imagery/i.maxlik/main.c:106 ../imagery/i.gensigset/parse.c:58
@@ -27016,6 +27226,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -27085,6 +27296,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.smap/segment.c:67
 msgid "Number of classes must be < 256"
 msgstr ""
@@ -27476,6 +27691,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27567,6 +27783,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "<%s> does not match the current mapset"
 msgstr ""
@@ -27588,6 +27809,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27629,6 +27851,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.cluster/main.c:191
 #, c-format
 msgid "Illegal number of initial classes (%s)"
@@ -27874,6 +28098,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -27943,6 +28168,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.gensig/write_sig.c:14 ../imagery/i.gensigset/write_sig.c:12
 #, c-format
 msgid "Unable to create signature file <%s>"
@@ -29047,6 +29276,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29138,6 +29368,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Computes potential evapotranspiration calculation with hourly Penman-"
 "Monteith."
@@ -29196,6 +29431,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -29237,6 +29473,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/landsat_met.c:119
 #, c-format
 msgid "Metadata file <%s> not found"
@@ -29265,6 +29503,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -29334,6 +29573,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.his.rgb/main.c:47 ../imagery/i.rgb.his/main.c:47
 #: ../display/d.his/main.c:64 ../raster/r.his/main.c:68
 msgid "color transformation"
@@ -29453,6 +29696,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29544,6 +29788,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Calculates top-of-atmosphere radiance or reflectance and temperature for "
 "Landsat MSS/TM/ETM+/OLI"
@@ -29566,6 +29815,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../imagery/i.landsat.toar/main.c:75
 =======
 <<<<<<< HEAD
@@ -29608,6 +29858,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:71 ../imagery/i.aster.toar/main.c:97
 #: ../imagery/i.atcorr/main.cpp:467
 msgid "radiometric conversion"
@@ -29647,6 +29899,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../imagery/i.landsat.toar/main.c:75
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -29730,6 +29983,11 @@ msgstr ""
 #: ../imagery/i.landsat.toar/main.c:75
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../imagery/i.landsat.toar/main.c:75
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:7
 msgid "atmospheric correction"
 msgstr ""
@@ -29751,6 +30009,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -29792,6 +30051,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:76 ../imagery/i.modis.qc/main.c:172
 #: ../imagery/i.albedo/main.c:98 ../imagery/i.aster.toar/main.c:101
 #: ../imagery/i.landsat.acca/main.c:109 ../imagery/i.atcorr/main.cpp:470
@@ -29842,6 +30103,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -29911,6 +30173,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:86
 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:22
 #: ../locale/scriptstrings/r.droka_to_translate.c:10
@@ -29941,6 +30207,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -30033,6 +30300,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:94 ../imagery/i.landsat.toar/main.c:116
 #: ../imagery/i.landsat.toar/main.c:125 ../imagery/i.landsat.toar/main.c:134
 #: ../imagery/i.landsat.toar/main.c:142 ../imagery/i.landsat.toar/main.c:151
@@ -30065,6 +30337,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30156,6 +30429,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:99
 msgid "Spacecraft sensor"
 msgstr ""
@@ -30177,6 +30455,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -30218,6 +30497,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:101
 msgid "Required only if 'metfile' not given (recommended for sanity)"
 msgstr ""
@@ -30242,6 +30523,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -30311,6 +30593,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:100
 msgid "Required only if 'metfile' not given (recommended for sanity)"
 msgstr ""
@@ -30337,6 +30623,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30428,6 +30715,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Landsat-2 MSS"
 msgstr ""
 
@@ -30456,6 +30748,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -30497,6 +30790,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:108
 msgid "Landsat-5 MSS"
 msgstr ""
@@ -30624,6 +30919,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -30693,6 +30989,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:109
 msgid "Landsat-5 MSS"
 msgstr ""
@@ -30835,6 +31135,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30926,6 +31227,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Input raster maps use as extension the number of the band instead the code"
 msgstr ""
@@ -30947,6 +31253,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -30988,6 +31295,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:224
 msgid "Print output metadata info"
 msgstr ""
@@ -31008,6 +31317,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31077,6 +31387,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:230
 msgid "Print output metadata info"
 msgstr ""
@@ -31099,6 +31413,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31190,6 +31505,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Illegal date format: [%s] (yyyy-mm-dd)"
 msgstr ""
@@ -31211,6 +31531,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31252,6 +31573,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:280
 msgid "Please use a metadata keyword with -p"
 msgstr ""
@@ -31276,6 +31599,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31345,6 +31669,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:286
 msgid "Please use a metadata keyword with -p"
 msgstr ""
@@ -31371,6 +31699,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31462,6 +31791,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Lacking '%s' and/or '%s' for this satellite"
 msgstr ""
@@ -31483,6 +31817,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31524,6 +31859,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:338
 msgid "Landsat-7 requires band gain with 9 (H/L) characters"
 msgstr ""
@@ -31544,6 +31881,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31613,6 +31951,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:343
 msgid "Landsat-7 requires band gain with 9 (H/L) characters"
 msgstr ""
@@ -31635,6 +31977,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31726,6 +32069,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unknown satellite type (defined by '%s')"
 msgstr ""
@@ -31747,6 +32095,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../imagery/i.landsat.toar/main.c:410 ../imagery/i.landsat.toar/main.c:559
 =======
 <<<<<<< HEAD
@@ -31789,6 +32138,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:404 ../imagery/i.landsat.toar/main.c:556
 =======
 #: ../imagery/i.landsat.toar/main.c:410 ../imagery/i.landsat.toar/main.c:559
@@ -31807,6 +32158,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../imagery/i.landsat.toar/main.c:410 ../imagery/i.landsat.toar/main.c:559
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31890,6 +32242,11 @@ msgstr ""
 #: ../imagery/i.landsat.toar/main.c:410 ../imagery/i.landsat.toar/main.c:559
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../imagery/i.landsat.toar/main.c:410 ../imagery/i.landsat.toar/main.c:559
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to read data type of raster map <%s>"
 msgstr ""
@@ -31911,6 +32268,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31946,6 +32304,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:549
 =======
 =======
@@ -31964,6 +32324,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32012,6 +32373,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:534 ../raster/r.topidx/topidx.c:41
 #: ../raster/r.flow/main.c:314
 msgid "Calculating..."
@@ -32041,6 +32404,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32132,6 +32496,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Raster map <%s> exists. Skipping."
 msgstr ""
@@ -32153,6 +32522,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../imagery/i.landsat.toar/main.c:575
 =======
 <<<<<<< HEAD
@@ -32195,6 +32565,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:573
 =======
 #: ../imagery/i.landsat.toar/main.c:575
@@ -32213,6 +32585,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../imagery/i.landsat.toar/main.c:575
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -32296,6 +32669,11 @@ msgstr ""
 #: ../imagery/i.landsat.toar/main.c:575
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../imagery/i.landsat.toar/main.c:575
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Writing %s of <%s> to <%s>..."
 msgstr ""
@@ -32317,6 +32695,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32358,6 +32737,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:575
 msgid "temperature"
 msgstr ""
@@ -32382,6 +32763,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -32451,6 +32833,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.landsat.toar/main.c:579
 msgid "temperature"
 msgstr ""
@@ -33545,6 +33931,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33636,6 +34023,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.landsat8.swlst_to_translate.c:5
 msgid "land surface temperature"
 msgstr ""
@@ -33657,6 +34049,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33698,6 +34091,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.modis.qc/main.c:171
 msgid "vegetation"
 msgstr ""
@@ -33721,6 +34116,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -33790,6 +34186,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.modis.qc/main.c:172
 msgid "vegetation"
 msgstr ""
@@ -33815,6 +34215,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33906,6 +34307,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.lswt_to_translate.c:4
 msgid "MODIS"
 msgstr ""
@@ -33927,6 +34333,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33968,6 +34375,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.modis.qc/main.c:175
 msgid "Extracts quality control parameters from MODIS QC layers."
 msgstr ""
@@ -34301,6 +34710,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -34370,6 +34780,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.modis.qc/main.c:176
 msgid "Extracts quality control parameters from MODIS QC layers."
 msgstr ""
@@ -34705,6 +35119,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -34796,6 +35211,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Band number of MODIS product (mod09Q1=[1,2],mod09A1=[1-7],m[o/y]d09GA=[1-7],"
 "m[o/y]d09CMG=[1-7], mcd43B2q=[1-7])"
@@ -34818,6 +35238,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -34859,6 +35280,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.modis.qc/main.c:375
 msgid "Band 1: Red"
 msgstr ""
@@ -34930,6 +35353,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -34999,6 +35423,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.modis.qc/main.c:369
 msgid "Band 1: Red"
 msgstr ""
@@ -35072,6 +35500,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -35163,6 +35592,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "This bit flag is only available for MOD09A1s @ 500m or MOD09CMG @ 5000m "
 "products"
@@ -35185,6 +35619,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -35226,6 +35661,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.modis.qc/main.c:438
 msgid "This bit flag is only available for MOD09GAs @ 500m products"
 msgstr ""
@@ -35642,6 +36079,7 @@ msgid "Group [%s] targeted for location [%s], mapset [%s]"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -35711,6 +36149,10 @@ msgid "Group [%s] targeted for location [%s], mapset [%s]"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.modis.qc/main.c:429
 msgid "This bit flag is only available for MOD09GAs @ 500m products"
 msgstr ""
@@ -35781,6 +36223,7 @@ msgid "Unable to open temporary file"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -35813,6 +36256,8 @@ msgid "Unable to open temporary file"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -35830,6 +36275,7 @@ msgid "Unable to open temporary file"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -35895,6 +36341,8 @@ msgid "Unable to open temporary file"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:74
@@ -35919,6 +36367,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -35960,6 +36409,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.rectify/report.c:10
 #: ../imagery/i.rectify/report.c:10
 msgid "complete"
@@ -36021,6 +36472,7 @@ msgid "Converting units to meters, factor=%.6f"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -36090,6 +36542,10 @@ msgid "Converting units to meters, factor=%.6f"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.rectify/readcell.c:102
 #: ../imagery/i.rectify/readcell.c:89 ../raster/r.proj/readcell.c:92
 msgid "Error writing segment file"
@@ -36315,6 +36771,7 @@ msgid "Raster map <%s@%s>: zone don't match current settings"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -36406,6 +36863,11 @@ msgid "Raster map <%s@%s>: zone don't match current settings"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../imagery/i.ortho.photo/i.ortho.rectify/cp.c:12
@@ -36436,6 +36898,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../imagery/i.rectify/cp.c:27 ../imagery/i.rectify/cp.c:51
 #: ../vector/v.rectify/cp.c:363
 =======
@@ -36479,6 +36942,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.rectify/cp.c:27 ../imagery/i.rectify/cp.c:52
 #: ../vector/v.rectify/cp.c:357
 =======
@@ -36499,6 +36964,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -36528,6 +36994,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../imagery/i.rectify/cp.c:27 ../imagery/i.rectify/cp.c:51
 #: ../vector/v.rectify/cp.c:363
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -36545,6 +37013,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36587,6 +37056,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Poorly placed control points."
 msgstr ""
 
@@ -36611,6 +37082,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../imagery/i.rectify/cp.c:28 ../imagery/i.rectify/cp.c:52
 #: ../vector/v.rectify/cp.c:364
 =======
@@ -36654,6 +37126,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.rectify/cp.c:28 ../imagery/i.rectify/cp.c:53
 #: ../vector/v.rectify/cp.c:358
 =======
@@ -36674,6 +37148,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -36703,6 +37178,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../imagery/i.rectify/cp.c:28 ../imagery/i.rectify/cp.c:52
 #: ../vector/v.rectify/cp.c:364
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -36720,6 +37197,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -36762,6 +37240,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid " Can not generate the transformation equation."
 msgstr ""
 
@@ -36815,6 +37295,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -36856,6 +37337,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.rectify/rectify.c:43
 #, c-format
 msgid "Rectify <%s@%s> (project <%s>)"
@@ -37016,6 +37499,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -37085,6 +37569,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.rectify/target.c:13
 #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:98
 #: ../imagery/i.rectify/target.c:13 ../vector/v.rectify/target.c:18
@@ -37458,6 +37946,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -37549,6 +38038,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Interactively creates or modifies entries in a camera initial exposure "
 "station file for imagery group referenced by a sub-block."
@@ -37571,6 +38065,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -37612,6 +38107,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:57
 msgid "Initial Camera Exposure X-coordinate"
 msgstr ""
@@ -37684,6 +38181,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -37753,6 +38251,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:62
 msgid "Initial Camera Exposure X-coordinate"
 msgstr ""
@@ -37827,6 +38329,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -37918,6 +38421,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Group [%s] not found"
 msgstr ""
@@ -37939,6 +38447,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -37980,6 +38489,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:145
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:149
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:153
@@ -38007,6 +38518,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -38076,6 +38588,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:150
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:154
 #: ../imagery/i.ortho.photo/i.ortho.init/main.c:158
@@ -38105,6 +38621,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -38196,6 +38713,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Option '%s' is required for new exposure info"
 msgstr ""
@@ -38217,6 +38739,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -38252,6 +38775,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.rectify/cp.c:12 ../vector/v.rectify/cp.c:343
 =======
 =======
@@ -38270,6 +38795,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -38318,6 +38844,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:160
 #: ../imagery/i.ortho.photo/i.ortho.transform/main.c:203
 #: ../misc/m.transform/main.c:96
@@ -38516,6 +39044,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -38607,6 +39136,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Control Point file for group <%s@%s> - "
 msgstr ""
@@ -38632,6 +39166,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -38673,6 +39208,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.rectify/cp.c:32 ../imagery/i.rectify/cp.c:57
 msgid "Not enough memory to solve transformation equations."
 msgstr ""
@@ -38697,6 +39234,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -38766,6 +39304,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.rectify/cp.c:31 ../imagery/i.rectify/cp.c:55
 msgid "Not enough memory to solve transformation equations."
 msgstr ""
@@ -38792,6 +39334,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -38883,6 +39426,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Not enough active control points for current order, %d are required."
 msgstr ""
@@ -38904,6 +39452,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -38945,6 +39494,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.rectify/cp.c:60 ../vector/v.rectify/cp.c:365
 msgid "Invalid order"
 msgstr ""
@@ -39064,6 +39615,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -39133,6 +39685,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.rectify/cp.c:58 ../vector/v.rectify/cp.c:370
 msgid "Invalid order"
 msgstr ""
@@ -39154,6 +39710,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -39245,6 +39802,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.albedo/main.c:96
 msgid "albedo"
 msgstr ""
@@ -39266,6 +39828,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -39307,6 +39870,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.albedo/main.c:100 ../imagery/i.aster.toar/main.c:102
 #: ../locale/scriptstrings/r.in.aster_to_translate.c:5
 msgid "ASTER"
@@ -39328,6 +39893,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -39397,6 +39963,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.albedo/main.c:101
 #: ../locale/scriptstrings/i.lswt_to_translate.c:5
 msgid "AVHRR"
@@ -39419,6 +39989,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -39460,6 +40031,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.albedo/main.c:104
 msgid "Computes broad band albedo from surface reflectance."
 msgstr ""
@@ -39500,6 +40073,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -39569,6 +40143,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.albedo/main.c:103
 msgid "Computes broad band albedo from surface reflectance."
 msgstr ""
@@ -39611,6 +40189,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -39702,6 +40281,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Aggressive mode (Landsat)"
 msgstr ""
 
@@ -39728,6 +40312,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -39769,6 +40354,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.albedo/main.c:144
 msgid "Soft mode (MODIS)"
 msgstr ""
@@ -39793,6 +40380,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -39862,6 +40450,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.albedo/main.c:143
 msgid "Soft mode (MODIS)"
 msgstr ""
@@ -39883,6 +40475,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -39974,6 +40567,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.albedo/main.c:181
 msgid "At least two raster maps are required"
 msgstr ""
@@ -39995,6 +40593,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -40036,6 +40635,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.fft/main.c:80 ../imagery/i.ifft/main.c:80
 msgid "Fast Fourier Transform"
 msgstr ""
@@ -42026,6 +42627,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -42095,6 +42697,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.maxlik/open.c:27
 #, c-format
 msgid ""
@@ -42119,6 +42725,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../imagery/i.maxlik/open.c:30
 =======
 <<<<<<< HEAD
@@ -42161,6 +42768,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.maxlik/open.c:32
 =======
 #: ../imagery/i.maxlik/open.c:30
@@ -42179,6 +42788,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../imagery/i.maxlik/open.c:30
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -42262,6 +42872,11 @@ msgstr ""
 #: ../imagery/i.maxlik/open.c:30
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../imagery/i.maxlik/open.c:30
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Subgroup <%s> of group <%s> only has 1 raster map. The subgroup must have at "
@@ -42285,6 +42900,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../imagery/i.maxlik/open.c:36
 =======
 <<<<<<< HEAD
@@ -42327,6 +42943,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.maxlik/open.c:39
 =======
 #: ../imagery/i.maxlik/open.c:36
@@ -42345,6 +42963,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../imagery/i.maxlik/open.c:36
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -42428,6 +43047,11 @@ msgstr ""
 #: ../imagery/i.maxlik/open.c:36
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../imagery/i.maxlik/open.c:36
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to open signature file <%s>"
 msgstr ""
@@ -42448,6 +43072,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -42540,6 +43165,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.maxlik/main.c:68
 msgid "Classifies the cell spectral reflectances in imagery data."
 msgstr ""
@@ -42575,6 +43205,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -42666,6 +43297,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.maxlik/invert.c:28
 #, c-format
 msgid "Signature %d is not valid (ill-conditioned) - ignored"
@@ -42693,6 +43329,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -42734,6 +43371,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../imagery/i.maxlik/main.c:66
 msgid "Classifies the cell spectral reflectances in imagery data."
 msgstr ""
@@ -49143,6 +49782,7 @@ msgid "The Python recursion limit that should be used (Python default is 1000)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -49212,6 +49852,10 @@ msgid "The Python recursion limit that should be used (Python default is 1000)"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../imagery/i.pca/main.c:74
 #: ../locale/scriptstrings/i.pansharpen_to_translate.c:8
 msgid "PCA"
@@ -49657,6 +50301,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -49748,6 +50393,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:1
@@ -49770,6 +50420,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -49862,6 +50513,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:4
 #: ../locale/scriptstrings/i.sentinel.import_to_translate.c:4
 #: ../locale/scriptstrings/i.tasscap_to_translate.c:7
@@ -49953,6 +50609,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -50044,6 +50701,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:8
 msgid ""
 "Name of the directory where the image and metadata file are stored (*.SAFE)"
@@ -50069,6 +50731,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -50161,6 +50824,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:10
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:25
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:35
@@ -50300,6 +50968,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -50391,6 +51060,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:11
 msgid "Select the proper Atmospheric model"
 msgstr ""
@@ -50435,6 +51109,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -50527,6 +51202,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:20
 msgid "Rescale output raster map"
 msgstr ""
@@ -50690,6 +51370,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -50781,6 +51462,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:22
 msgid "Name for output text file to be used as input in i.sentinel.mask"
 msgstr ""
@@ -50805,6 +51491,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -50897,6 +51584,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:28
 #: ../locale/scriptstrings/v.to.rast.multi_to_translate.c:29
 #: ../locale/scriptstrings/i.sentinel.import_to_translate.c:15
@@ -50931,6 +51623,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -51022,6 +51715,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:30
 msgid "Use AOD instead visibility"
 msgstr ""
@@ -51046,6 +51744,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -51138,6 +51837,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:34
 #: ../locale/scriptstrings/r.in.wcs_to_translate.c:8
 #: ../locale/scriptstrings/i.sentinel.import_to_translate.c:22
@@ -51162,6 +51866,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -51253,6 +51958,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:36
 msgid "Skip import of Sentinel bands"
 msgstr ""
@@ -51278,6 +51988,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -51319,6 +52030,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.extract_to_translate.c:1
 msgid "Extracts specified categories of an integer input map."
 msgstr ""
@@ -51833,6 +52546,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -51902,6 +52616,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.sentinel.preproc_to_translate.c:40
 #: ../locale/scriptstrings/i.sentinel.import_to_translate.c:24
 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:25
@@ -52849,6 +53567,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -52940,6 +53659,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "A numerical suffix separated by an underscore will be attached to create a "
 "unique identifier"
@@ -52962,6 +53686,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -53003,6 +53728,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.vect.algebra_to_translate.c:9
 #: ../locale/scriptstrings/t.rast3d.algebra_to_translate.c:11
 #: ../locale/scriptstrings/t.rast.algebra_to_translate.c:11
@@ -53023,6 +53750,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -53092,6 +53820,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast3d.mapcalc_to_translate.c:10
 #: ../locale/scriptstrings/t.rast3d.algebra_to_translate.c:10
 #: ../locale/scriptstrings/t.rast3d.extract_to_translate.c:10
@@ -53132,6 +53864,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -53223,6 +53956,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Check the spatial topology of temporally related maps and process only "
 "spatially related maps"
@@ -53245,6 +53983,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -53286,6 +54025,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.diversity_to_translate.c:1
 msgid ""
 "Calculate diversity indices based on a moving window using r.li packages"
@@ -53324,6 +54065,7 @@ msgid "Preserve configuration files"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -53393,6 +54135,10 @@ msgid "Preserve configuration files"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.mblend_to_translate.c:1
 msgid "Blends two rasters of different spatial resolution."
 msgstr ""
@@ -53708,6 +54454,7 @@ msgid "Align ISIS3 data to the extents of the current GRASS region"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -53799,6 +54546,11 @@ msgid "Align ISIS3 data to the extents of the current GRASS region"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:1
@@ -53839,6 +54591,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -53931,6 +54684,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:9
 #: ../locale/scriptstrings/r.out.maxent_swd_to_translate.c:11
 msgid "Environmental parameter map(s)"
@@ -53953,6 +54711,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -54044,6 +54803,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:10
 #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:12
 #: ../locale/scriptstrings/v.maxent.swd_to_translate.c:14
@@ -54089,6 +54853,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -54116,6 +54881,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Thin species and background points"
 =======
 =======
@@ -54131,6 +54898,7 @@ msgid "Thin species and background points"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 msgid "Thin species and background points"
@@ -54179,6 +54947,8 @@ msgid "Thin species and background points"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Background SWD file"
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgstr ""
@@ -55763,6 +56533,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55830,6 +56601,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "include the original columns in input layers in export to swd file"
 msgstr ""
 
@@ -55980,6 +56755,7 @@ msgid "Number of tiles in y direction"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56206,6 +56982,11 @@ msgid "Number of tiles in y direction"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 <<<<<<< HEAD
@@ -56231,6 +57012,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -56323,6 +57105,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.stream.profiler_to_translate.c:3
 #: ../locale/scriptstrings/v.stream.order_to_translate.c:4
 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:3
@@ -56402,6 +57189,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56493,6 +57281,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.stream.profiler_to_translate.c:6
 msgid "Starting line segment category"
 msgstr ""
@@ -56513,6 +57306,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -56605,6 +57399,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.stream.profiler_to_translate.c:7
 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:11
 #: ../locale/scriptstrings/v.stream.inbasin_to_translate.c:13
@@ -56662,6 +57461,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56753,6 +57553,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.stream.profiler_to_translate.c:8
 msgid "Vector input of stream network created by r.stream.extract"
 msgstr ""
@@ -56818,6 +57623,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -56852,6 +57658,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -56868,6 +57676,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -56909,6 +57718,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.select_to_translate.c:1
 msgid ""
 "Select maps from space time datasets by topological relationships to other "
@@ -60399,6 +61210,7 @@ msgid "Elevation coordinate of a point on the plane"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -60468,6 +61280,10 @@ msgid "Elevation coordinate of a point on the plane"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/d.vect.colbp_to_translate.c:1
 msgid "Draws the boxplot of values in a vector attribute column"
 msgstr ""
@@ -60655,6 +61471,7 @@ msgid "Name of input uncompressed GNS file from NGA (with .txt extension)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -60746,6 +61563,11 @@ msgid "Name of input uncompressed GNS file from NGA (with .txt extension)"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.import_to_translate.c:1
@@ -60778,6 +61600,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -60870,6 +61693,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.import_to_translate.c:11
 #: ../locale/scriptstrings/i.landsat.import_to_translate.c:15
 msgid "Resampling method to use for reprojection"
@@ -60915,6 +61743,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -61006,6 +61835,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.import_to_translate.c:17
 msgid "Resolution of output raster map (default: estimated)"
 msgstr ""
@@ -61036,6 +61870,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -61128,6 +61963,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.import_to_translate.c:22
 #: ../raster/r.in.gdal/main.c:163 ../raster/r.in.bin/main.c:298
 #: ../raster/r.external/main.c:90 ../raster/r.buildvrt/main.c:102
@@ -61153,6 +61993,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -61244,6 +62085,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.import_to_translate.c:24
 msgid "Estimate resolution only"
 msgstr ""
@@ -61265,6 +62111,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -61305,6 +62152,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.import_to_translate.c:30
 #: ../locale/scriptstrings/v.import_to_translate.c:28
 #: ../vector/v.in.ogr/main.c:382
@@ -61330,6 +62179,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
@@ -61407,6 +62257,11 @@ msgstr ""
 <<<<<<< HEAD
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+<<<<<<< HEAD
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.in.usgs_to_translate.c:1
 msgid "Download user-requested products through the USGS TNM API"
 msgstr ""
@@ -62655,6 +63510,7 @@ msgid "Percent to brighten"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -62724,6 +63580,10 @@ msgid "Percent to brighten"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.import_to_translate.c:25
 #: ../locale/scriptstrings/r.import_to_translate.c:27
 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:30
@@ -62875,6 +63735,7 @@ msgid "The name of the input signature file to copy"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -62966,6 +63827,11 @@ msgid "The name of the input signature file to copy"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.estimap.recreation_to_translate.c:1
@@ -63390,6 +64256,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -63482,6 +64349,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.estimap.recreation_to_translate.c:110
 #: ../raster/r.report/parse.c:45
 msgid "Units to report"
@@ -63504,6 +64376,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -63595,6 +64468,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.estimap.recreation_to_translate.c:111
 msgid "Units to report the demand distribution"
 msgstr ""
@@ -63624,6 +64502,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -63665,6 +64544,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.flexure_to_translate.c:1
 msgid "Lithospheric flexure: gridded deflections from scattered point loads"
 msgstr ""
@@ -63702,6 +64583,7 @@ msgid "Output vector points map of vertical deflections [m]"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -63771,6 +64653,10 @@ msgid "Output vector points map of vertical deflections [m]"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.pansharpen_to_translate.c:1
 msgid ""
 "Image fusion algorithms to sharpen multispectral with high-res panchromatic "
@@ -64351,6 +65237,7 @@ msgid "low-memory option (will use full raster layers)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -64442,6 +65329,11 @@ msgid "low-memory option (will use full raster layers)"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:1
@@ -64464,6 +65356,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -64556,6 +65449,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:5
 #: ../locale/scriptstrings/g.compare.md5_to_translate.c:4
 #: ../locale/scriptstrings/t.vect.list_to_translate.c:5
@@ -64582,6 +65480,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -64673,6 +65572,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:7
 #: ../locale/scriptstrings/t.vect.list_to_translate.c:7
 #: ../locale/scriptstrings/t.list_to_translate.c:10
@@ -64695,6 +65599,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -64787,6 +65692,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:8
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:15
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:17
@@ -64846,6 +65756,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -64937,6 +65848,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:13
 msgid ""
 "The granule to be used for listing. The granule must be specified as string "
@@ -64960,6 +65876,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -65001,6 +65918,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.convert.all_to_translate.c:1
 msgid ""
 "Converts all older versions of GRASS vector maps in current mapset to "
@@ -65505,6 +66424,7 @@ msgid "Use (d^n)*log(d) instead of 1/(d^n) for radial basis function"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -65574,6 +66494,10 @@ msgid "Use (d^n)*log(d) instead of 1/(d^n) for radial basis function"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.list_to_translate.c:16
 #: ../locale/scriptstrings/t.rast3d.univar_to_translate.c:8
 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:8
@@ -65958,6 +66882,7 @@ msgid "Images"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -66049,6 +66974,11 @@ msgid "Images"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.basin_to_translate.c:1
@@ -66071,6 +67001,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -66163,6 +67094,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.basin_to_translate.c:4
 #: ../raster/r.watershed/front/main.c:78 ../raster/r.water.outlet/main.c:59
 #: ../raster/r.basins.fill/main.c:56
@@ -66200,6 +67136,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -66291,6 +67228,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.basin_to_translate.c:7
 msgid "coordinates of the outlet (east,north)"
 msgstr ""
@@ -66312,6 +67254,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -66353,6 +67296,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.basin_to_translate.c:9
 #: ../locale/scriptstrings/r.threshold_to_translate.c:4
 #: ../locale/scriptstrings/i.segment.uspo_to_translate.c:5
@@ -66371,6 +67316,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -66440,6 +67386,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.basin_to_translate.c:8
 #: ../locale/scriptstrings/v.in.gbif_to_translate.c:7
 #: ../locale/scriptstrings/v.habitat.dem_to_translate.c:12
@@ -66466,6 +67416,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -66557,6 +67508,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "threshold"
 msgstr ""
 
@@ -66585,6 +67541,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -66626,6 +67583,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.richdem.resolveflats_to_translate.c:1
 msgid "Directs flow from flat areas on depression-filled DEMs"
 msgstr ""
@@ -66651,6 +67610,7 @@ msgid "Output DEM with flats resolved for continuous flow"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -66720,6 +67680,10 @@ msgid "Output DEM with flats resolved for continuous flow"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/d.what.vect_to_translate.c:1
 msgid ""
 "Allows the user to interactively query vector map layers at user-selected "
@@ -67110,6 +68074,7 @@ msgid "Output DEM with depressions breached"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -67201,6 +68166,11 @@ msgid "Output DEM with depressions breached"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.stream.watersheds_to_translate.c:1
@@ -67225,6 +68195,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -67317,6 +68288,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.stream.watersheds_to_translate.c:4
 #: ../locale/scriptstrings/r.stream.variables_to_translate.c:4
 #: ../raster/r.watershed/front/main.c:80
@@ -67340,6 +68316,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -67431,6 +68408,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.stream.watersheds_to_translate.c:6
 msgid "Name of the drainage direction raster (generated with r.watershed)"
 msgstr ""
@@ -67462,6 +68444,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -67503,6 +68486,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.connectivity.network_to_translate.c:1
 msgid ""
 "Compute connectivity measures for a set of habitat patches based on graph-"
@@ -67638,6 +68623,7 @@ msgid "Sample vertically (default is to sample horizontally)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -67707,6 +68693,10 @@ msgid "Sample vertically (default is to sample horizontally)"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.stream.watersheds_to_translate.c:9
 #: ../locale/scriptstrings/r.stream.variables_to_translate.c:14
 msgid "Number of CPUs used for the parallel computation"
@@ -70981,6 +71971,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -71072,6 +72063,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:1
@@ -71094,6 +72090,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -71186,6 +72183,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:5
 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:5
 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:6
@@ -71215,6 +72217,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -71306,6 +72309,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:6
 msgid "PRMS stream segments"
 msgstr ""
@@ -71326,6 +72334,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -71418,6 +72427,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:8
 #: ../locale/scriptstrings/r.gsflow.hydrodem_to_translate.c:8
 #: ../locale/scriptstrings/v.gsflow.grid_to_translate.c:11
@@ -71442,6 +72456,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -71533,6 +72548,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.gsflow.reaches_to_translate.c:10
 msgid "DEM for slope along reaches"
 msgstr ""
@@ -71614,6 +72634,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -71655,6 +72676,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.extract_to_translate.c:1
 msgid "Extracts a subset of a space time raster datasets."
 msgstr ""
@@ -71792,6 +72815,7 @@ msgid "Method to scale transparency"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -71861,6 +72885,10 @@ msgid "Method to scale transparency"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.in.probav_to_translate.c:1
 msgid ""
 "Imports PROBA-V NDVI data in netCDF format into a raster map with real NDVI "
@@ -73854,6 +74882,7 @@ msgid "pth percentile of the values"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -73945,6 +74974,11 @@ msgid "pth percentile of the values"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:1
@@ -73979,6 +75013,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -74071,6 +75106,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:5
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:7
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:9
@@ -74117,6 +75157,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -74208,6 +75249,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:6
 msgid "Name of the vector map layer of the structure of the plants"
 msgstr ""
@@ -74495,6 +75541,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -74587,6 +75634,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:96
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:98
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:100
@@ -74613,6 +75665,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -74704,6 +75757,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:97
 msgid "Alpha coefficient to assess the maintenance costs"
 msgstr ""
@@ -74747,6 +75805,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -74839,6 +75898,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:107
 #: ../locale/scriptstrings/r.green.hydro.technical_to_translate.c:38
 #: ../locale/scriptstrings/r.green.hydro.planning_to_translate.c:12
@@ -74863,6 +75927,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -74954,6 +76019,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.green.hydro.financial_to_translate.c:109
 msgid "Constant to assess the revenues"
 msgstr ""
@@ -74993,6 +76063,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -75034,6 +76105,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.viewshed.exposure_to_translate.c:1
 msgid "Visual exposure to defined exposure source."
 msgstr ""
@@ -77478,6 +78551,7 @@ msgid "Lists registered maps of a space time vector dataset."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -77547,6 +78621,10 @@ msgid "Lists registered maps of a space time vector dataset."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.to.lines_to_translate.c:1
 msgid "Converts vector polygons or points to lines."
 msgstr ""
@@ -77833,6 +78911,7 @@ msgid "Number of quartals to use"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -77924,6 +79003,11 @@ msgid "Number of quartals to use"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.rgb_to_translate.c:1
@@ -77972,6 +79056,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -78013,6 +79098,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.register_to_translate.c:1
 msgid ""
 "Assigns timestamps and registers raster, vector and raster3d maps in a space "
@@ -80216,6 +81303,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -80285,6 +81373,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.agent.aco_to_translate.c:1
 #: ../locale/scriptstrings/r.agent.rand_to_translate.c:1
 msgid "Agents wander around on the terrain, marking paths to new locations."
@@ -80550,6 +81642,7 @@ msgid "Name of output vector with viewed areas"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -80641,6 +81734,11 @@ msgid "Name of output vector with viewed areas"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.category.trim_to_translate.c:1
@@ -80665,6 +81763,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -80757,6 +81856,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.category.trim_to_translate.c:3
 #: ../locale/scriptstrings/r.out.legend_to_translate.c:3
 msgid "color"
@@ -80779,6 +81883,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -80870,6 +81975,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.category.trim_to_translate.c:6
 msgid "input map"
 msgstr ""
@@ -80890,6 +82000,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -80982,6 +82093,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.category.trim_to_translate.c:7
 #: ../locale/scriptstrings/r.category.trim_to_translate.c:9
 #: ../locale/scriptstrings/g.proj.all_to_translate.c:11
@@ -81011,6 +82127,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -81102,6 +82219,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.category.trim_to_translate.c:8
 msgid "output map"
 msgstr ""
@@ -81139,6 +82261,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -81231,6 +82354,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.object.thickness_to_translate.c:1
 msgid ""
 "Evaluates minimum, maximum and mean thickness of objects of a given category "
@@ -81588,6 +82716,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -81679,6 +82808,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.rock.stability_to_translate.c:1
 msgid "A tool for preliminary rock failure susceptibility mapping."
 msgstr ""
@@ -81699,6 +82833,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -81791,6 +82926,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.rock.stability_to_translate.c:2
 #: ../locale/scriptstrings/r.droka_to_translate.c:2
 msgid "rock mass"
@@ -81813,6 +82953,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -81904,6 +83045,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.rock.stability_to_translate.c:3
 msgid "planar failure"
 msgstr ""
@@ -81970,6 +83116,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -82011,6 +83158,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.landsat.download_to_translate.c:1
 msgid ""
 "Downloads Landsat TM, ETM and OLI data from EarthExplorer using "
@@ -82347,6 +83496,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -82416,6 +83566,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.mapcalc_to_translate.c:1
 msgid ""
 "Performs spatio-temporal mapcalc expressions on temporally sampled maps of "
@@ -83070,6 +84224,7 @@ msgid "Name of output vector map with the structure of the plants"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -83161,6 +84316,11 @@ msgid "Name of output vector map with the structure of the plants"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.civil_to_translate.c:1
@@ -83471,6 +84631,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -83512,6 +84673,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/d.what.vect_to_translate.c:1
 msgid ""
 "Allows the user to interactively query vector map layers at user-selected "
@@ -84529,6 +85692,7 @@ msgid "Number of cores to use for crawling thredds server"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -84598,6 +85762,10 @@ msgid "Number of cores to use for crawling thredds server"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:1
 msgid ""
 "Calculates univariate statistics of attributes for each registered vector "
@@ -85765,6 +86933,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -85856,6 +87025,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.krige_to_translate.c:1
@@ -85946,6 +87120,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -85987,6 +87162,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.object.spatialautocor_to_translate.c:1
 msgid "Spatial autocorrelation of raster objects"
 msgstr ""
@@ -86125,6 +87302,7 @@ msgid "Remove and print not valid CSW connections resources from XML file"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -86194,6 +87372,10 @@ msgid "Remove and print not valid CSW connections resources from XML file"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.sample_to_translate.c:1
 msgid ""
 "Samples the input space time dataset(s) with a sample space time dataset and "
@@ -86789,6 +87971,7 @@ msgid "Remove individual environmental similarity layers (IES)"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -86880,6 +88063,11 @@ msgid "Remove individual environmental similarity layers (IES)"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/i.variance_to_translate.c:1
@@ -86919,6 +88107,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -86960,6 +88149,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.vect.univar_to_translate.c:1
 msgid ""
 "Calculates univariate statistics of attributes for each registered vector "
@@ -87200,6 +88391,7 @@ msgid "output to text file"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -87269,6 +88461,10 @@ msgid "output to text file"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.richdem.resolveflats_to_translate.c:1
 msgid "Directs flow from flat areas on depression-filled DEMs"
 msgstr ""
@@ -88647,6 +89843,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -88738,6 +89935,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.fidimo_to_translate.c:1
@@ -88883,6 +90085,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -88924,6 +90127,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.landsat.qa_to_translate.c:1
 msgid ""
 "Reclassifies Landsat QA band according to acceptable pixel quality as "
@@ -89450,6 +90655,7 @@ msgid "Output water depth at the end of the run"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -89519,6 +90725,10 @@ msgid "Output water depth at the end of the run"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/i.landsat8.swlst_to_translate.c:1
 msgid ""
 "Practical split-window algorithm estimating Land Surface Temperature from "
@@ -89752,6 +90962,7 @@ msgid "Use absolute values in legend, instead of percentages"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -89843,6 +91054,11 @@ msgid "Use absolute values in legend, instead of percentages"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.stats_to_translate.c:1
@@ -89918,6 +91134,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -89959,6 +91176,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/t.rast.to.rast3_to_translate.c:1
 msgid "Converts a space time raster dataset into a 3D raster map."
 msgstr ""
@@ -89986,6 +91205,7 @@ msgid "Basename for output raster maps"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -90055,6 +91275,10 @@ msgid "Basename for output raster maps"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.centroids_to_translate.c:1
 msgid "Adds missing centroids to closed boundaries."
 msgstr ""
@@ -90757,6 +91981,7 @@ msgid "URL of ZIP, TAR.GZ, or other similar archive"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -90848,6 +92073,11 @@ msgid "URL of ZIP, TAR.GZ, or other similar archive"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.db.join_to_translate.c:1
@@ -90878,6 +92108,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -90970,6 +92201,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.db.join_to_translate.c:8
 #: ../locale/scriptstrings/v.flexure_to_translate.c:7
 #: ../locale/scriptstrings/v.what.vect_to_translate.c:10
@@ -90993,6 +92229,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -91084,6 +92321,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.db.join_to_translate.c:9
 msgid "Identifier column (e.g.: cat) in the vector table to be used for join"
 msgstr ""
@@ -91105,6 +92347,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -91140,6 +92383,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.db.join_to_translate.c:14
 msgid "Columns to exclude from the other table"
 =======
@@ -91159,6 +92404,7 @@ msgid "Columns to exclude from the other table"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -91210,6 +92456,8 @@ msgid "Columns to exclude from the other table"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.db.join_to_translate.c:10
 #: ../locale/scriptstrings/db.join_to_translate.c:6
 msgid "Other table name"
@@ -96378,6 +97626,7 @@ msgid "Type of the output space time dataset"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -96469,6 +97718,11 @@ msgid "Type of the output space time dataset"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/v.class.mlR_to_translate.c:1
@@ -96720,6 +97974,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -96761,6 +98016,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.gsflow.hruparams_to_translate.c:6
 msgid "Elevation raster"
 msgstr ""
@@ -96802,6 +98059,7 @@ msgid "Aspect from r.slope.aspect"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -96871,6 +98129,10 @@ msgid "Aspect from r.slope.aspect"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.in.redlist_to_translate.c:1
 msgid "importing of IUCN Red List Spatial Data"
 msgstr ""
@@ -97298,6 +98560,7 @@ msgid "Path where move and copy the mapset"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -97388,6 +98651,11 @@ msgid "Path where move and copy the mapset"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../locale/scriptstrings/r.in.ahn_to_translate.c:1
@@ -97459,6 +98727,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -97500,6 +98769,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/r.slope.direction_to_translate.c:1
 msgid "Calculates slope following a direction raster."
 msgstr ""
@@ -97688,6 +98959,7 @@ msgid "Paper '%s' not found, using defaults"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -97757,6 +99029,10 @@ msgid "Paper '%s' not found, using defaults"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../locale/scriptstrings/v.db.addcolumn_to_translate.c:1
 msgid ""
 "Adds one or more columns to the attribute table connected to a given vector "
@@ -97816,6 +99092,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -97907,6 +99184,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../ps/ps.map/do_psfiles.c:20
@@ -97931,6 +99213,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -97972,6 +99255,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../ps/ps.map/eps.c:18
 #, c-format
 msgid "Can't open eps file <%s>"
@@ -98258,6 +99543,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -98327,6 +99613,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../ps/ps.map/ps_vareas.c:67 ../ps/ps.map/ps_vareas.c:78
 #: ../ps/ps.map/ps_vlines.c:84
 msgid "Read error in vector map"
@@ -98353,6 +99643,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -98444,6 +99735,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "No record for category [%d]"
 msgstr ""
@@ -98465,6 +99761,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../ps/ps.map/ps_vareas.c:108 ../ps/ps.map/ps_vlines.c:125
 #: ../ps/ps.map/ps_vpoints.c:201
 =======
@@ -98508,6 +99805,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../ps/ps.map/ps_vareas.c:107 ../ps/ps.map/ps_vlines.c:121
 #: ../ps/ps.map/ps_vpoints.c:194
 =======
@@ -98528,6 +99827,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -98557,6 +99857,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../ps/ps.map/ps_vareas.c:108 ../ps/ps.map/ps_vlines.c:125
 #: ../ps/ps.map/ps_vpoints.c:201
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -98574,6 +99876,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -98616,6 +99919,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, c-format
 msgid "Invalid RGB color definition in column <%s> for category [%d]"
 msgstr ""
@@ -98637,6 +99942,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -98678,6 +99984,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../ps/ps.map/ps_vareas.c:158 ../ps/ps.map/ps_vlines.c:53
 #: ../ps/ps.map/ps_vpoints.c:68
 msgid "Cannot load data from table"
@@ -98794,6 +100102,7 @@ msgid "Can't get group information"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -98863,6 +100172,10 @@ msgid "Can't get group information"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../ps/ps.map/ps_vareas.c:161 ../ps/ps.map/ps_vlines.c:56
 #: ../ps/ps.map/ps_vpoints.c:71
 msgid "Cannot load data from table"
@@ -98896,6 +100209,7 @@ msgid "illegal vlegend sub-request"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -98987,6 +100301,11 @@ msgid "illegal vlegend sub-request"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../ps/ps.map/r_instructions.c:62
@@ -99021,6 +100340,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -99113,6 +100433,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../ps/ps.map/r_instructions.c:129 ../ps/ps.map/main.c:220
 msgid "illegal copies request"
 msgstr ""
@@ -99134,6 +100459,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -99225,6 +100551,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../ps/ps.map/r_instructions.c:144 ../ps/ps.map/r_instructions.c:340
 msgid "no raster map selected yet"
 msgstr ""
@@ -99245,6 +100576,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -99337,6 +100669,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../ps/ps.map/r_instructions.c:149 ../ps/ps.map/r_instructions.c:464
 #: ../ps/ps.map/getgrid.c:63 ../ps/ps.map/getgrid.c:87
 #: ../ps/ps.map/getgrid.c:173 ../ps/ps.map/getgrid.c:197
@@ -99362,6 +100699,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -99453,6 +100791,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../ps/ps.map/r_instructions.c:160
 msgid "illegal value list"
 msgstr ""
@@ -99530,6 +100873,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -99571,6 +100915,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../visualization/ximgview/main.c:78
 msgid "Unable to get window attributes"
 msgstr ""
@@ -99615,6 +100961,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -99684,6 +101031,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../ps/ps.map/ps_raster.c:42
 msgid "Can't create temporary PostScript mask file."
 msgstr ""
@@ -100122,6 +101473,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -100213,6 +101565,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unknown visual class [%d]."
 msgstr ""
@@ -100234,6 +101591,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -100275,6 +101633,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../visualization/ximgview/color.c:236
 msgid "Unable to get sufficient gray shades."
 msgstr ""
@@ -112992,6 +114352,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -113061,6 +114422,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../visualization/ximgview/color.c:239
 msgid "Unable to get sufficient gray shades."
 msgstr ""
@@ -113124,6 +114489,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -113215,6 +114581,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to read range for %s"
 msgstr ""
@@ -113236,6 +114607,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.profile/main.c:79
 =======
 <<<<<<< HEAD
@@ -113278,6 +114650,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.profile/main.c:76
 =======
 #: ../display/d.profile/main.c:79
@@ -113296,6 +114670,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.profile/main.c:79
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -113379,6 +114754,11 @@ msgstr ""
 #: ../display/d.profile/main.c:79
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.profile/main.c:79
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to read FP range for %s"
 msgstr ""
@@ -113400,6 +114780,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -113441,6 +114822,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.profile/main.c:197
 msgid "Plots profile of a transect."
 msgstr ""
@@ -113469,6 +114852,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -113538,6 +114922,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.profile/main.c:195
 msgid "Plots profile of a transect."
 msgstr ""
@@ -113572,6 +114960,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -113663,6 +115052,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "At least two points are required"
 msgstr ""
 
@@ -113687,6 +115081,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -113728,6 +115123,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.fontlist/main.c:52
 msgid "List fonts (default; provided for compatibility with d.font)"
 msgstr ""
@@ -113751,6 +115148,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -113820,6 +115218,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.fontlist/main.c:51
 msgid "List fonts (default; provided for compatibility with d.font)"
 msgstr ""
@@ -114011,6 +115413,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -114102,6 +115505,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.chart/main.c:65
 msgid "chart maps"
 msgstr ""
@@ -114135,6 +115543,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.chart/main.c:129 ../display/d.vect.chart/main.c:148
 =======
 <<<<<<< HEAD
@@ -114177,6 +115586,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.chart/main.c:128 ../display/d.vect.chart/main.c:146
 =======
 #: ../display/d.vect.chart/main.c:129 ../display/d.vect.chart/main.c:148
@@ -114195,6 +115606,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.chart/main.c:129 ../display/d.vect.chart/main.c:148
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -114278,6 +115690,11 @@ msgstr ""
 #: ../display/d.vect.chart/main.c:129 ../display/d.vect.chart/main.c:148
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.chart/main.c:129 ../display/d.vect.chart/main.c:148
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Chart properties"
 msgstr ""
 
@@ -114322,6 +115739,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -114363,6 +115781,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.chart/main.c:127
 msgid "Center the bar chart around a data point"
 msgstr ""
@@ -114751,6 +116171,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -114820,6 +116241,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.chart/main.c:128
 msgid "Center the bar chart around a data point"
 msgstr ""
@@ -115167,6 +116592,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -115258,6 +116684,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unable to read symbol <%s>, unable to display points"
 msgstr ""
@@ -115279,6 +116710,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -115314,6 +116746,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/display.c:117 ../display/d.vect/lines.c:158
 =======
 =======
@@ -115332,6 +116766,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -115380,6 +116815,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/display.c:75 ../display/d.vect/dir.c:30
 #: ../display/d.vect/lines.c:143 ../display/d.vect/zcoor.c:38
 #: ../display/d.vect/topo.c:52 ../display/d.vect/vert.c:27
@@ -115415,6 +116852,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -115506,6 +116944,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%d point plotted"
 msgid_plural "%d points plotted"
@@ -115529,6 +116972,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/display.c:121 ../display/d.vect/lines.c:177
 =======
 <<<<<<< HEAD
@@ -115571,6 +117015,8 @@ msgstr[1] ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/display.c:120 ../display/d.vect/lines.c:161
 =======
 #: ../display/d.vect.thematic/display.c:121 ../display/d.vect/lines.c:177
@@ -115589,6 +117035,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/display.c:121 ../display/d.vect/lines.c:177
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -115672,6 +117119,11 @@ msgstr[1] ""
 #: ../display/d.vect.thematic/display.c:121 ../display/d.vect/lines.c:177
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/display.c:121 ../display/d.vect/lines.c:177
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%d line plotted"
 msgid_plural "%d lines plotted"
@@ -115695,6 +117147,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/display.c:125 ../display/d.vect/lines.c:179
 =======
 <<<<<<< HEAD
@@ -115737,6 +117190,8 @@ msgstr[1] ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/display.c:124 ../display/d.vect/lines.c:165
 =======
 #: ../display/d.vect.thematic/display.c:125 ../display/d.vect/lines.c:179
@@ -115755,6 +117210,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/display.c:125 ../display/d.vect/lines.c:179
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -115838,6 +117294,11 @@ msgstr[1] ""
 #: ../display/d.vect.thematic/display.c:125 ../display/d.vect/lines.c:179
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/display.c:125 ../display/d.vect/lines.c:179
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%d centroid plotted"
 msgid_plural "%d centroids plotted"
@@ -115861,6 +117322,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/display.c:129 ../display/d.vect/lines.c:181
 =======
 <<<<<<< HEAD
@@ -115903,6 +117365,8 @@ msgstr[1] ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/display.c:128 ../display/d.vect/lines.c:169
 =======
 #: ../display/d.vect.thematic/display.c:129 ../display/d.vect/lines.c:181
@@ -115921,6 +117385,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/display.c:129 ../display/d.vect/lines.c:181
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -116004,6 +117469,11 @@ msgstr[1] ""
 #: ../display/d.vect.thematic/display.c:129 ../display/d.vect/lines.c:181
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/display.c:129 ../display/d.vect/lines.c:181
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%d boundary plotted"
 msgid_plural "%d boundaries plotted"
@@ -116027,6 +117497,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/display.c:132 ../display/d.vect/lines.c:183
 =======
 <<<<<<< HEAD
@@ -116069,6 +117540,8 @@ msgstr[1] ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/display.c:131 ../display/d.vect/lines.c:172
 =======
 #: ../display/d.vect.thematic/display.c:132 ../display/d.vect/lines.c:183
@@ -116087,6 +117560,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/display.c:132 ../display/d.vect/lines.c:183
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -116170,6 +117644,11 @@ msgstr[1] ""
 #: ../display/d.vect.thematic/display.c:132 ../display/d.vect/lines.c:183
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/display.c:132 ../display/d.vect/lines.c:183
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%d face plotted"
 msgid_plural "%d faces plotted"
@@ -116193,6 +117672,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -116234,6 +117714,8 @@ msgstr[1] ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:90
 msgid "choropleth map"
 msgstr ""
@@ -116292,6 +117774,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -116361,6 +117844,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:87
 msgid "choropleth map"
 msgstr ""
@@ -116445,6 +117932,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -116536,6 +118024,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:185 ../display/d.vect/main.c:191
 #: ../display/d.vect/main.c:327
 msgid "Symbols"
@@ -116558,6 +118051,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -116599,6 +118093,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:171 ../display/d.vect/main.c:172
 msgid "Point and centroid symbol"
 msgstr ""
@@ -116619,6 +118115,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -116688,6 +118185,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:172 ../display/d.vect/main.c:172
 msgid "Point and centroid symbol"
 msgstr ""
@@ -116710,6 +118211,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -116801,6 +118303,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:179
 msgid "Symbol size"
 msgstr ""
@@ -116822,6 +118329,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -116863,6 +118371,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:185 ../display/d.vect.thematic/main.c:197
 #: ../display/d.vect.thematic/main.c:207 ../display/d.vect.thematic/main.c:217
 #: ../display/d.vect.thematic/main.c:223 ../display/d.vect.thematic/main.c:229
@@ -116884,6 +118394,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -116953,6 +118464,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:186 ../display/d.vect.thematic/main.c:197
 #: ../display/d.vect.thematic/main.c:206 ../display/d.vect.thematic/main.c:218
 #: ../display/d.vect.thematic/main.c:224 ../display/d.vect.thematic/main.c:229
@@ -116976,6 +118491,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -117067,6 +118583,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Legend"
 msgstr ""
 
@@ -117091,6 +118612,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -117132,6 +118654,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:202
 msgid "Legend symbol for areas"
 msgstr ""
@@ -117160,6 +118684,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -117229,6 +118754,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:201
 msgid "Legend symbol for areas"
 msgstr ""
@@ -117259,6 +118788,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -117350,6 +118880,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Output legend file"
 msgstr ""
 
@@ -117374,6 +118909,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/main.c:237
 =======
 <<<<<<< HEAD
@@ -117416,6 +118952,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:235
 =======
 #: ../display/d.vect.thematic/main.c:237
@@ -117434,6 +118972,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/main.c:237
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -117517,6 +119056,11 @@ msgstr ""
 #: ../display/d.vect.thematic/main.c:237
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/main.c:237
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "When printing legend info, include extended statistical info from "
 "classification algorithm"
@@ -117539,6 +119083,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -117580,6 +119125,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:242 ../display/d.vect/main.c:331
 msgid "Do not show this layer in vector legend"
 msgstr ""
@@ -117600,6 +119147,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -117669,6 +119217,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:243 ../display/d.vect/main.c:331
 msgid "Do not show this layer in vector legend"
 msgstr ""
@@ -117691,6 +119243,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -117782,6 +119335,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Flag -e is deprecated, set verbose mode with --v to get the extended "
 "statistical info."
@@ -117811,6 +119369,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/main.c:277
 =======
 <<<<<<< HEAD
@@ -117853,6 +119412,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:278
 =======
 #: ../display/d.vect.thematic/main.c:277
@@ -117871,6 +119432,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/main.c:277
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -117954,6 +119516,11 @@ msgstr ""
 #: ../display/d.vect.thematic/main.c:277
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/main.c:277
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%s: You must build topology on vector map. Run v.build."
 msgstr ""
@@ -117975,6 +119542,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -118016,6 +119584,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:289
 msgid "'layer' must be > 0"
 msgstr ""
@@ -118036,6 +119606,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -118105,6 +119676,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:288
 msgid "'layer' must be > 0"
 msgstr ""
@@ -118154,6 +119729,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -118245,6 +119821,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Data (%s) not numeric. Column must be numeric."
 msgstr ""
@@ -118266,6 +119847,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/main.c:379
 =======
 <<<<<<< HEAD
@@ -118308,6 +119890,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:316 ../display/d.vect.thematic/plot1.c:138
 #: ../display/d.vect.thematic/plot1.c:165
 #, c-format
@@ -118332,6 +119916,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/main.c:379
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -118415,6 +120000,11 @@ msgstr ""
 #: ../display/d.vect.thematic/main.c:379
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/main.c:379
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Unknown color: [%s]"
 msgstr ""
@@ -118436,6 +120026,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/main.c:390
 =======
 <<<<<<< HEAD
@@ -118478,6 +120069,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:385
 =======
 #: ../display/d.vect.thematic/main.c:390
@@ -118496,6 +120089,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/main.c:390
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -118579,6 +120173,11 @@ msgstr ""
 #: ../display/d.vect.thematic/main.c:390
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/main.c:390
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "You gave both manual breaks and a classification algorithm or a number of "
 "classes. The manual breaks have precedence and will thus be used."
@@ -118601,6 +120200,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -118642,6 +120242,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:422
 msgid "You must either give classbreaks or a classification algorithm"
 msgstr ""
@@ -118662,6 +120264,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -118731,6 +120334,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:427
 msgid "You must either give classbreaks or a classification algorithm"
 msgstr ""
@@ -118753,6 +120360,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -118844,6 +120452,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "Not enough colors or error in color specifications.\n"
@@ -118867,6 +120480,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/main.c:445
 =======
 <<<<<<< HEAD
@@ -118909,6 +120523,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:440
 =======
 #: ../display/d.vect.thematic/main.c:445
@@ -118927,6 +120543,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/main.c:445
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -119010,6 +120627,11 @@ msgstr ""
 #: ../display/d.vect.thematic/main.c:445
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/main.c:445
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Error interpreting color %s"
 msgstr ""
@@ -119031,6 +120653,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -119072,6 +120695,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:455
 msgid "Plotting ..."
 msgstr ""
@@ -119092,6 +120717,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -119161,6 +120787,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:462
 msgid "Plotting ..."
 msgstr ""
@@ -119183,6 +120813,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -119274,6 +120905,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The bounding box of the map is outside the current region, nothing drawn."
 msgstr ""
@@ -119295,6 +120931,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/main.c:523
 =======
 <<<<<<< HEAD
@@ -119337,6 +120974,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:515
 =======
 #: ../display/d.vect.thematic/main.c:523
@@ -119355,6 +120994,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/main.c:523
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -119438,6 +121078,11 @@ msgstr ""
 #: ../display/d.vect.thematic/main.c:523
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/main.c:523
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "\n"
@@ -119461,6 +121106,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect.thematic/main.c:525
 =======
 <<<<<<< HEAD
@@ -119503,6 +121149,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:516
 =======
 #: ../display/d.vect.thematic/main.c:525
@@ -119521,6 +121169,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect.thematic/main.c:525
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -119604,6 +121253,11 @@ msgstr ""
 #: ../display/d.vect.thematic/main.c:525
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect.thematic/main.c:525
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Classification of %s into %i classes\n"
 msgstr ""
@@ -119625,6 +121279,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -119660,6 +121315,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:523
 =======
 =======
@@ -119678,6 +121335,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -119726,6 +121384,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:527 ../vector/v.class/main.c:203
 #, c-format
 msgid "Using algorithm: *** %s ***\n"
@@ -119754,6 +121414,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -119845,6 +121506,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Last chi2 = %f\n"
 msgstr ""
@@ -119866,6 +121532,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -119907,6 +121574,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/plot1.c:122
 msgid "Color definition column not specified"
 msgstr ""
@@ -120309,6 +121978,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -120378,6 +122048,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect.thematic/main.c:535 ../vector/v.class/main.c:211
 #, c-format
 msgid "Stdev multiplied by %.4f to define step\n"
@@ -120842,6 +122516,7 @@ msgid "Invalid value for color type in legend file. Use one of 'lf' or 'ps'."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -120933,6 +122608,11 @@ msgid "Invalid value for color type in legend file. Use one of 'lf' or 'ps'."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../display/d.vect/opt.c:126
@@ -120957,6 +122637,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -120998,6 +122679,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect/label.c:32
 msgid "Topology level required for drawing centroids for OGR layers"
 msgstr ""
@@ -121148,6 +122831,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -121217,6 +122901,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/lines.c:121
 msgid ""
 "Unable to display features by id, topology not available. Please try to "
@@ -121356,6 +123044,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -121447,6 +123136,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Scale factor for width_column"
 msgstr ""
 
@@ -121479,6 +123173,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -121520,6 +123215,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:194
 msgid "Measured in degrees CCW from east"
 msgstr ""
@@ -121544,6 +123241,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -121613,6 +123311,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:195
 msgid "Measured in degrees CCW from east"
 msgstr ""
@@ -121639,6 +123341,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -121730,6 +123433,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Line symbol for legend"
 msgstr ""
 
@@ -121753,6 +123461,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -121845,6 +123554,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:227 ../display/d.vect/main.c:234
 #: ../display/d.vect/main.c:241 ../display/d.vect/main.c:246
 #: ../display/d.vect/main.c:253 ../display/d.vect/main.c:260
@@ -121870,6 +123584,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -121961,6 +123676,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:229
 msgid "Layer number for labels (default: the given layer number)"
 msgstr ""
@@ -122044,6 +123764,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -122085,6 +123806,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:351
 msgid "Region size is lower than minreg, nothing displayed"
 msgstr ""
@@ -122109,6 +123832,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -122178,6 +123902,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:350
 msgid "Region size is lower than minreg, nothing displayed"
 msgstr ""
@@ -122204,6 +123932,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -122295,6 +124024,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid ""
 "The -%c flag and <%s> option cannot be used together, the -%c flag will be "
@@ -122318,6 +124052,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect/main.c:395 ../display/d.vect/main.c:401
 =======
 <<<<<<< HEAD
@@ -122360,6 +124095,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:398 ../display/d.vect/main.c:404
 =======
 #: ../display/d.vect/main.c:395 ../display/d.vect/main.c:401
@@ -122378,6 +124115,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect/main.c:395 ../display/d.vect/main.c:401
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -122461,6 +124199,11 @@ msgstr ""
 #: ../display/d.vect/main.c:395 ../display/d.vect/main.c:401
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect/main.c:395 ../display/d.vect/main.c:401
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Option <%s> must be > 0"
 msgstr ""
@@ -122482,6 +124225,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.vect/main.c:405
 =======
 <<<<<<< HEAD
@@ -122524,6 +124268,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:409
 =======
 #: ../display/d.vect/main.c:405
@@ -122542,6 +124288,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.vect/main.c:405
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -122625,6 +124372,11 @@ msgstr ""
 #: ../display/d.vect/main.c:405
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.vect/main.c:405
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "%d error in cat option"
 msgid_plural "%d errors in cat option"
@@ -122648,6 +124400,7 @@ msgstr[1] ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -122689,6 +124442,8 @@ msgstr[1] ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:426
 msgid "Plotting..."
 msgstr ""
@@ -122709,6 +124464,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -122778,6 +124534,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:421
 msgid "Plotting..."
 msgstr ""
@@ -122800,6 +124560,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -122891,6 +124652,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "The bounding box of the map is outside the current region, nothing drawn"
 msgstr ""
@@ -122912,6 +124678,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -122953,6 +124720,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:510
 msgid "Rendering failed"
 msgstr ""
@@ -123197,6 +124966,7 @@ msgid "Range file for <%s> not available"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -123266,6 +125036,10 @@ msgid "Range file for <%s> not available"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.vect/main.c:503
 msgid "Rendering failed"
 msgstr ""
@@ -123677,6 +125451,7 @@ msgid "Graph file <%s> not found"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -123768,6 +125543,11 @@ msgid "Graph file <%s> not found"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../display/d.mon/list.c:80
@@ -123795,6 +125575,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.mon/list.c:116 ../scripts/d.what.vect/d.what.vect.py:35
 #: ../scripts/d.what.rast/d.what.rast.py:35 ../scripts/d.redraw/d.redraw.py:39
 =======
@@ -123838,6 +125619,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.mon/list.c:116 ../scripts/d.what.rast/d.what.rast.py:35
 <<<<<<< HEAD
 #: ../scripts/d.what.vect/d.what.vect.py:35
@@ -123862,6 +125645,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -123920,6 +125704,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../display/d.mon/list.c:116 ../scripts/d.what.vect/d.what.vect.py:35
 #: ../scripts/d.what.rast/d.what.rast.py:35 ../scripts/d.redraw/d.redraw.py:39
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -123937,6 +125725,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -123996,6 +125785,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format, python-format
 msgid "Unable to open file '%s'"
 msgstr ""
@@ -124022,6 +125814,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.mon/stop.c:18 ../display/d.mon/select.c:30
 =======
 <<<<<<< HEAD
@@ -124064,6 +125857,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.mon/select.c:14
 #, c-format
 msgid "Monitor <%s> is already selected"
@@ -124087,6 +125882,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.mon/stop.c:18 ../display/d.mon/select.c:30
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -124170,6 +125966,11 @@ msgstr ""
 #: ../display/d.mon/stop.c:18 ../display/d.mon/select.c:30
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.mon/stop.c:18 ../display/d.mon/select.c:30
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Monitor <%s> is not running"
 msgstr ""
@@ -124206,6 +126007,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -124247,6 +126049,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.mon/start.c:68
 #, c-format
 msgid "Unable to start monitor, don't have write permission for <%s>"
@@ -124302,6 +126106,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -124371,6 +126176,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:53
 msgid "Controls graphics display monitors from the command line."
 msgstr ""
@@ -124397,6 +126206,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.mon/main.c:74 ../display/d.mon/main.c:135
 #: ../display/d.mon/main.c:140
 =======
@@ -124440,6 +126250,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:74 ../display/d.mon/main.c:140
 #: ../display/d.mon/main.c:146
 =======
@@ -124460,6 +126272,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -124489,6 +126302,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../display/d.mon/main.c:74 ../display/d.mon/main.c:135
 #: ../display/d.mon/main.c:140
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -124506,6 +126321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -124548,6 +126364,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Manage"
 msgstr ""
 
@@ -124576,6 +126394,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -124617,6 +126436,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:80
 msgid "Default value: 720"
 msgstr ""
@@ -124701,6 +126522,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -124770,6 +126592,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:79
 msgid "Default value: 720"
 msgstr ""
@@ -124856,6 +126682,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -124947,6 +126774,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Flag -%c has effect only for wx monitors (%s=wx0-7)"
 msgstr ""
@@ -124968,6 +126800,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -125009,6 +126842,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:181
 msgid "Currently selected monitor:"
 msgstr ""
@@ -125029,6 +126864,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -125098,6 +126934,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:169 ../general/g.mapsets/main.c:136
 #: ../general/g.mapsets/main.c:138 ../general/g.mapsets/main.c:148
 #, c-format
@@ -125126,6 +126966,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -125217,6 +127058,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "List of commands for monitor <%s>:"
 msgstr ""
@@ -125238,6 +127084,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../display/d.mon/main.c:185
 =======
 <<<<<<< HEAD
@@ -125280,6 +127127,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:193
 =======
 #: ../display/d.mon/main.c:185
@@ -125298,6 +127147,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../display/d.mon/main.c:185
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -125381,6 +127231,11 @@ msgstr ""
 #: ../display/d.mon/main.c:185
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../display/d.mon/main.c:185
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Monitor <%s> released"
 msgstr ""
@@ -125402,6 +127257,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -125443,6 +127299,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:198
 msgid "No monitor selected"
 msgstr ""
@@ -125463,6 +127321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -125532,6 +127391,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:190
 msgid "No monitor selected"
 msgstr ""
@@ -125554,6 +127417,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -125645,6 +127509,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, c-format
 msgid "Either <%s>, <%s> or <%s> must be given"
 msgstr ""
@@ -125666,6 +127535,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -125707,6 +127577,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../display/d.info/main.c:36
 msgid "Displays information about the active display monitor."
 msgstr ""
@@ -126936,6 +128808,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -127005,6 +128878,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../display/d.mon/main.c:214 ../general/g.mapsets/main.c:140
 #: ../general/g.mapsets/main.c:150 ../general/g.mapsets/main.c:158
 #, c-format
@@ -157452,6 +159329,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -157484,6 +159362,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -157501,6 +159381,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -157566,6 +159447,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector map <%s> not found in current mapset"
 msgstr ""
@@ -157587,6 +159470,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -157628,6 +159512,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.db.renamecolumn/v.db.renamecolumn.py:66
 msgid ""
 "There is no table connected to the input vector map. Cannot rename any column"
@@ -157669,6 +159555,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -157738,6 +159625,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:136
 #: ../scripts/v.rast.stats/v.rast.stats.py:175
 #: ../scripts/v.rast.stats/v.rast.stats.py:186
@@ -157759,6 +159650,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -157791,6 +159683,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -157808,6 +159702,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -157873,6 +159768,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.db.update/v.db.update.py:80
 msgid ""
 "There is no table connected to this map. Run v.db.connect or v.db.addtable "
@@ -157911,6 +159808,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -157933,6 +159831,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:242
 =======
 =======
@@ -157949,6 +159849,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
 =======
@@ -158003,6 +159904,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:241
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:242
@@ -158022,6 +159925,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:242
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -158059,6 +159963,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -158077,6 +159983,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -158118,6 +160025,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Statistics calculated from raster map <{raster}> and uploaded to attribute "
@@ -158141,6 +160050,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/v.rast.stats/v.rast.stats.py:250
 =======
 <<<<<<< HEAD
@@ -158169,6 +160079,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:249
 =======
 =======
@@ -158184,6 +160096,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:249
@@ -158232,6 +160145,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:248
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:250
@@ -158251,6 +160166,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:250
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -158288,6 +160204,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -158306,6 +160224,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -158347,6 +160266,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to upload statistics to attribute table of vector map <%s>."
 msgstr ""
@@ -158368,6 +160289,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -158395,6 +160317,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:286
 =======
 =======
@@ -158410,6 +160334,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:286
@@ -158458,6 +160383,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:285
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "An error occurred while converting vector to raster"
@@ -158486,6 +160413,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -158555,6 +160483,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:287
 msgid "An error occurred while converting vector to raster"
 msgstr ""
@@ -158581,6 +160513,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -158613,6 +160546,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -158630,6 +160565,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -158695,6 +160631,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Not all vector categories converted to raster.                         "
@@ -158718,6 +160656,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/v.rast.stats/v.rast.stats.py:430
 =======
 <<<<<<< HEAD
@@ -158746,6 +160685,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:429
 =======
 =======
@@ -158761,6 +160702,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:429
@@ -158809,6 +160751,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:428
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:430
@@ -158828,6 +160772,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:430
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -158865,6 +160810,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -158883,6 +160830,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -158924,6 +160872,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Cannot create column <%s> (already present). "
 msgstr ""
@@ -158945,6 +160895,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -158984,6 +160935,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:430
 msgid "Use -c flag to update values in this column."
 msgstr ""
@@ -159001,6 +160954,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -159043,6 +160997,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:429
 msgid "Use -c flag to update values in this column."
 msgstr ""
@@ -159063,6 +161019,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -159132,6 +161089,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:431
 msgid "Use -c flag to update values in this column."
 msgstr ""
@@ -159154,6 +161115,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -159186,6 +161148,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -159203,6 +161167,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -159268,6 +161233,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Adding columns '%s'"
 msgstr ""
@@ -159289,6 +161256,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -159316,6 +161284,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:446
 =======
 =======
@@ -159331,6 +161301,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/v.rast.stats/v.rast.stats.py:446
@@ -159379,6 +161350,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:445
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Adding columns failed. Exiting."
@@ -159444,6 +161417,7 @@ msgid "Either  or  must be given"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -159513,6 +161487,10 @@ msgid "Either  or  must be given"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/v.rast.stats/v.rast.stats.py:447
 msgid "Adding columns failed. Exiting."
 msgstr ""
@@ -159889,6 +161867,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -159980,6 +161959,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/i.in.spotvgt/i.in.spotvgt.py:129
@@ -160055,6 +162039,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -160096,6 +162081,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension.all/g.extension.all.py:61
 #, python-format
 msgid "%s not defined"
@@ -160184,6 +162171,7 @@ msgid "Unable to process extension:%s"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -160253,6 +162241,10 @@ msgid "Unable to process extension:%s"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/db.droptable/db.droptable.py:70
 #: ../scripts/db.dropcolumn/db.dropcolumn.py:59
 msgid "Forcing ..."
@@ -160331,6 +162323,7 @@ msgid "Flags -%c and -%c are mutually exclusive"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -160422,6 +162415,11 @@ msgid "Flags -%c and -%c are mutually exclusive"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/v.report/v.report.py:124
@@ -160456,6 +162454,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -160497,6 +162496,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.pack/v.pack.py:65
 #, python-format
 msgid "Unable to pack vector map <%s>. Only native format supported."
@@ -160620,6 +162621,7 @@ msgid "WFS import failed"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -160689,6 +162691,10 @@ msgid "WFS import failed"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/d.what.vect/d.what.vect.py:44 ../scripts/d.frame/d.frame.py:282
 #: ../scripts/d.what.rast/d.what.rast.py:44 ../scripts/d.redraw/d.redraw.py:34
 #: ../scripts/d.out.file/d.out.file.py:58 ../scripts/d.to.rast/d.to.rast.py:44
@@ -161278,6 +163284,7 @@ msgid "Incorrect WMS query"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -161369,6 +163376,11 @@ msgid "Incorrect WMS query"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/v.what.strds/v.what.strds.py:112
@@ -161413,6 +163425,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/v.what.strds/v.what.strds.py:241
 =======
 <<<<<<< HEAD
@@ -161455,6 +163468,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.what.strds/v.what.strds.py:240
 =======
 #: ../scripts/v.what.strds/v.what.strds.py:241
@@ -161473,6 +163488,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/v.what.strds/v.what.strds.py:241
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -161556,6 +163572,11 @@ msgstr ""
 #: ../scripts/v.what.strds/v.what.strds.py:241
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../scripts/v.what.strds/v.what.strds.py:241
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to add table <%s> to vector map <%s>"
 msgstr ""
@@ -161577,6 +163598,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/v.what.strds/v.what.strds.py:270
 =======
 <<<<<<< HEAD
@@ -161619,6 +163641,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.what.strds/v.what.strds.py:269
 =======
 #: ../scripts/v.what.strds/v.what.strds.py:270
@@ -161637,6 +163661,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/v.what.strds/v.what.strds.py:270
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -161720,6 +163745,11 @@ msgstr ""
 #: ../scripts/v.what.strds/v.what.strds.py:270
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../scripts/v.what.strds/v.what.strds.py:270
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to add column %s to vector map <%s> "
 msgstr ""
@@ -161741,6 +163771,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/v.what.strds/v.what.strds.py:286
 =======
 <<<<<<< HEAD
@@ -161783,6 +163814,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/v.what.strds/v.what.strds.py:285
 =======
 #: ../scripts/v.what.strds/v.what.strds.py:286
@@ -161801,6 +163834,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/v.what.strds/v.what.strds.py:286
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -161884,6 +163918,11 @@ msgstr ""
 #: ../scripts/v.what.strds/v.what.strds.py:286
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../scripts/v.what.strds/v.what.strds.py:286
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to run v.what.rast for vector map <%s> and raster map <%s>"
 msgstr ""
@@ -161905,6 +163944,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -161946,6 +163986,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/r.mapcalc.simple/r.mapcalc.simple.py:107
 msgid "The expression is an empty string"
 msgstr ""
@@ -161967,6 +164009,7 @@ msgid "Expression: {}"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -162036,6 +164079,10 @@ msgid "Expression: {}"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/d.frame/d.frame.py:96 ../scripts/d.frame/d.frame.py:127
 #, python-format
 msgid "Unable to get monitor info. %s"
@@ -162086,6 +164133,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -162177,6 +164225,11 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/i.spectral/i.spectral.py:121
@@ -162240,6 +164293,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -162332,6 +164386,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/r.in.srtm/r.in.srtm.py:169
 msgid "This module only operates in LatLong locations"
 msgstr ""
@@ -162623,6 +164682,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -162714,6 +164774,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/i.pansharpen/i.pansharpen.py:109
 msgid "Required dependency NumPy not found. Exiting."
 msgstr ""
@@ -162750,6 +164815,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -162791,6 +164857,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Converting image channels to 8bit for processing"
 msgstr ""
 
@@ -162811,6 +164879,7 @@ msgid "Rescaling image channels to 8bit for processing"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -162880,6 +164949,10 @@ msgid "Rescaling image channels to 8bit for processing"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Converting image chanels to 8bit for processing"
 msgstr ""
 
@@ -162902,6 +164975,7 @@ msgid "Rescaling image chanels to 8bit for processing"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -162993,6 +165067,11 @@ msgid "Rescaling image chanels to 8bit for processing"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../scripts/i.pansharpen/i.pansharpen.py:405
@@ -163084,6 +165163,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -163111,6 +165191,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/i.pansharpen/i.pansharpen.py:585
 =======
 =======
@@ -163126,6 +165208,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/i.pansharpen/i.pansharpen.py:585
@@ -163174,6 +165257,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/i.pansharpen/i.pansharpen.py:584
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Using PCA/inverse PCA algorithm"
@@ -163211,6 +165296,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -163280,6 +165366,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/i.pansharpen/i.pansharpen.py:585
 msgid "Using PCA/inverse PCA algorithm"
 msgstr ""
@@ -163630,6 +165720,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -163721,6 +165812,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/v.db.addtable/v.db.addtable.py:79
 #, python-format
 msgid "Using vector map name as table name: <%s>"
@@ -163781,6 +165877,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -163822,6 +165919,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/i.tasscap/i.tasscap.py:317
 #, python-format
 msgid "Satellite %s..."
@@ -163856,6 +165955,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -163925,6 +166025,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/r3.in.xyz/r3.in.xyz.py:255
 msgid "The 2D and 3D region settings are different. Can not continue."
 msgstr ""
@@ -163973,6 +166077,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -164014,6 +166119,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/r.mask/r.mask.py:100
 msgid "Either parameter  or parameter  is required"
 msgstr ""
@@ -164400,6 +166507,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -164469,6 +166577,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/v.db.update/v.db.update.py:90
 msgid "Use of libsqlitefunctions only with SQLite backend"
 msgstr ""
@@ -164563,6 +166675,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -164595,6 +166708,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -164612,6 +166727,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -164677,6 +166793,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Download file from <{url}>, failed. File is not on the server or check your "
@@ -164700,6 +166818,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:411
 =======
 <<<<<<< HEAD
@@ -164728,6 +166847,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:601
 =======
 =======
@@ -164743,6 +166864,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:601
@@ -164791,6 +166913,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:597
 =======
 #: ../scripts/g.extension/g.extension.py:411
@@ -164810,6 +166934,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:411
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -164847,6 +166972,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -164865,6 +166992,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -164906,6 +167034,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "'%s' required. Please install '%s' first."
 msgstr ""
@@ -164927,6 +167057,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -164954,6 +167085,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:665
 =======
 =======
@@ -164969,6 +167102,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:665
@@ -165017,6 +167151,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:661
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "List of installed extensions (toolboxes):"
@@ -165073,6 +167209,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -165142,6 +167279,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:475
 msgid "List of installed extensions (toolboxes):"
 msgstr ""
@@ -165195,6 +167336,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -165227,6 +167369,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -165244,6 +167388,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -165309,6 +167454,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Fetching list of extensions from GRASS-Addons SVN repository (be patient)..."
 msgstr ""
@@ -165330,6 +167477,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -165357,6 +167505,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:949
 =======
 =======
@@ -165372,6 +167522,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:949
@@ -165420,6 +167571,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:945
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Flag 'c' ignored, addons metadata file not available"
@@ -165450,6 +167603,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -165519,6 +167673,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:760
 msgid "Flag 'c' ignored, addons metadata file not available"
 msgstr ""
@@ -165546,6 +167704,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -165578,6 +167737,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -165595,6 +167756,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -165660,6 +167822,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Checking for '%s' modules..."
 msgstr ""
@@ -165681,6 +167845,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:775
 #: ../scripts/g.extension/g.extension.py:809
 =======
@@ -165710,6 +167875,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:964
 #: ../scripts/g.extension/g.extension.py:998
 =======
@@ -165726,6 +167893,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:964
@@ -165777,6 +167945,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:960
 #: ../scripts/g.extension/g.extension.py:994
 =======
@@ -165798,6 +167968,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -165856,6 +168027,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../scripts/g.extension/g.extension.py:775
 #: ../scripts/g.extension/g.extension.py:809
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -165873,6 +168048,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -165932,6 +168108,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to fetch '%s'"
 msgstr ""
@@ -165953,6 +168132,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -165992,6 +168172,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1160
 msgid "$GISBASE not defined"
 msgstr ""
@@ -166009,6 +168191,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -166051,6 +168234,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1156
 msgid "$GISBASE not defined"
 msgstr ""
@@ -166071,6 +168256,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -166140,6 +168326,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:829
 msgid "Path to the source code:"
 msgstr ""
@@ -166166,6 +168356,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -166198,6 +168389,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -166215,6 +168408,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -166280,6 +168474,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Extension <%s> already installed. Re-installing..."
 msgstr ""
@@ -166301,6 +168497,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:989
 =======
 <<<<<<< HEAD
@@ -166329,6 +168526,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1175
 =======
 =======
@@ -166344,6 +168543,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1175
@@ -166392,6 +168592,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1171
 =======
 #: ../scripts/g.extension/g.extension.py:989
@@ -166411,6 +168613,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:989
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -166448,6 +168651,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -166466,6 +168671,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -166507,6 +168713,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Installing toolbox <%s>..."
 msgstr ""
@@ -166528,6 +168736,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -166555,6 +168764,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1185
 =======
 =======
@@ -166570,6 +168781,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1185
@@ -166618,6 +168830,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1181
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Nothing to install"
@@ -166654,6 +168868,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -166723,6 +168938,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:999
 msgid "Nothing to install"
 msgstr ""
@@ -166757,6 +168976,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -166789,6 +169009,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -166806,6 +169028,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -166871,6 +169094,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Installation of <%s> successfully finished"
 msgstr ""
@@ -166892,6 +169117,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1054
 =======
 <<<<<<< HEAD
@@ -166920,6 +169146,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1240
 =======
 =======
@@ -166935,6 +169163,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1240
@@ -166983,6 +169212,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1236
 =======
 #: ../scripts/g.extension/g.extension.py:1054
@@ -167002,6 +169233,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1054
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -167039,6 +169271,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -167057,6 +169291,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -167098,6 +169333,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "This add-on module will not function until you set the GRASS_ADDON_BASE "
 "environment variable (see \"g.manual variables\")"
@@ -167120,6 +169357,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -167147,6 +169385,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1275
 =======
 =======
@@ -167162,6 +169402,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1275
@@ -167210,6 +169451,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1271
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Unable to read addons metadata file from the remote server"
@@ -167238,6 +169481,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -167307,6 +169551,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1089
 msgid "Unable to read addons metadata file from the remote server"
 msgstr ""
@@ -167333,6 +169581,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -167365,6 +169614,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -167382,6 +169633,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -167447,6 +169699,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "No addons metadata available for <%s>"
 msgstr ""
@@ -167468,6 +169722,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1161
 =======
 <<<<<<< HEAD
@@ -167496,6 +169751,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1347
 =======
 =======
@@ -167511,6 +169768,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1347
@@ -167559,6 +169817,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1343
 =======
 #: ../scripts/g.extension/g.extension.py:1161
@@ -167578,6 +169838,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1161
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -167615,6 +169876,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -167633,6 +169896,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -167674,6 +169938,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Unable to read addons metadata file from the remote server: {0}"
 msgstr ""
@@ -167695,6 +169961,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1166
 =======
 <<<<<<< HEAD
@@ -167723,6 +169990,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1352
 =======
 =======
@@ -167738,6 +170007,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1352
@@ -167786,6 +170056,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1348
 =======
 #: ../scripts/g.extension/g.extension.py:1166
@@ -167805,6 +170077,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1166
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -167842,6 +170115,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -167860,6 +170135,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -167901,6 +170177,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format, python-brace-format
 msgid "Unable to parse '%s': {0}"
 msgstr ""
@@ -167922,6 +170200,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1366
 =======
 <<<<<<< HEAD
@@ -167950,6 +170229,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1538
 =======
 =======
@@ -167965,6 +170246,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1538
@@ -168013,6 +170295,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1534
 =======
 #: ../scripts/g.extension/g.extension.py:1366
@@ -168032,6 +170316,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1366
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -168069,6 +170354,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -168087,6 +170374,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -168128,6 +170416,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "No metadata available for module '{name}': {error}"
 msgstr ""
@@ -168149,6 +170439,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -168176,6 +170467,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1608
 =======
 =======
@@ -168191,6 +170484,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1608
@@ -168239,6 +170533,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1603
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Downloading precompiled GRASS Addons <{}>..."
@@ -168269,6 +170565,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -168338,6 +170635,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1435
 msgid "Downloading precompiled GRASS Addons <{}>..."
 msgstr ""
@@ -168361,6 +170662,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -168393,6 +170695,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -168410,6 +170714,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -168475,6 +170780,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "GRASS Addons <%s> not found"
 msgstr ""
@@ -168496,6 +170803,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1644
 =======
 <<<<<<< HEAD
@@ -168524,6 +170832,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1836
 =======
 =======
@@ -168539,6 +170849,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1836
@@ -168587,6 +170898,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1831
 =======
 #: ../scripts/g.extension/g.extension.py:1644
@@ -168606,6 +170919,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1644
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -168643,6 +170957,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -168661,6 +170977,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -168702,6 +171019,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "ZIP file is unreadable: {0}"
 msgstr ""
@@ -168723,6 +171042,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1665
 =======
 <<<<<<< HEAD
@@ -168751,6 +171071,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1871
 =======
 =======
@@ -168766,6 +171088,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1871
@@ -168814,6 +171137,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1866
 =======
 #: ../scripts/g.extension/g.extension.py:1665
@@ -168833,6 +171158,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1665
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -168870,6 +171196,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -168888,6 +171216,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -168929,6 +171258,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Archive file is unreadable: {0}"
 msgstr ""
@@ -168950,6 +171281,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1675
 =======
 <<<<<<< HEAD
@@ -168978,6 +171310,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1888
 =======
 =======
@@ -168993,6 +171327,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1888
@@ -169041,6 +171376,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1883
 =======
 #: ../scripts/g.extension/g.extension.py:1675
@@ -169060,6 +171397,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1675
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -169097,6 +171435,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -169115,6 +171455,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -169156,6 +171497,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Type of source identified as '{source}'."
 msgstr ""
@@ -169177,6 +171520,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -169216,6 +171560,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1891
 #: ../scripts/g.extension/g.extension.py:1900
 #: ../scripts/g.extension/g.extension.py:1907
@@ -169231,6 +171577,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -169273,6 +171620,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1886
 #: ../scripts/g.extension/g.extension.py:1895
 #: ../scripts/g.extension/g.extension.py:1902
@@ -169291,6 +171640,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -169360,6 +171710,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1678
 #, python-format
 msgid "Fetching <%s> from GRASS GIS Addons repository (be patient)..."
@@ -169385,6 +171739,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -169417,6 +171772,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -169434,6 +171791,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -169499,6 +171857,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Fetching <{name}> from <{url}> (be patient)..."
 msgstr ""
@@ -169520,6 +171880,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1713
 =======
 <<<<<<< HEAD
@@ -169548,6 +171909,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1922
 =======
 =======
@@ -169563,6 +171926,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1922
@@ -169611,6 +171975,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1917
 =======
 #: ../scripts/g.extension/g.extension.py:1713
@@ -169630,6 +171996,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1713
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -169667,6 +172034,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -169685,6 +172054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -169726,6 +172096,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Expected default branch not found. Trying again from <{url}>..."
 msgstr ""
@@ -169747,6 +172119,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1721
 =======
 <<<<<<< HEAD
@@ -169775,6 +172148,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1930
 =======
 =======
@@ -169790,6 +172165,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1930
@@ -169838,6 +172214,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1925
 =======
 #: ../scripts/g.extension/g.extension.py:1721
@@ -169857,6 +172235,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1721
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -169894,6 +172273,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -169912,6 +172293,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -169953,6 +172335,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Extension <{name}> not found. Please check 'url' and 'branch' options"
 msgstr ""
@@ -169974,6 +172358,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -170013,6 +172398,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1935
 msgid "Extension <{}> not found"
 msgstr ""
@@ -170030,6 +172417,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -170072,6 +172460,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1930
 msgid "Extension <{}> not found"
 msgstr ""
@@ -170092,6 +172482,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -170161,6 +172552,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1726
 #: ../scripts/g.extension/g.extension.py:2052
 #, python-format
@@ -170185,6 +172580,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -170217,6 +172613,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -170234,6 +172632,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -170299,6 +172698,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Unknown extension (addon) source type '{0}'. Please report this to the grass-"
@@ -170322,6 +172723,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -170349,6 +172751,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1974
 =======
 =======
@@ -170364,6 +172768,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:1974
@@ -170412,6 +172817,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1969
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Path to the source code:"
@@ -170475,6 +172882,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -170544,6 +172952,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:1785
 msgid "Module name not found. Check module Makefile syntax (PGM variable)."
 msgstr ""
@@ -170602,6 +173014,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -170693,6 +173106,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Extension <%s> successfully uninstalled."
 msgstr ""
@@ -170714,6 +173132,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:1993
 =======
 <<<<<<< HEAD
@@ -170749,6 +173168,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -170765,6 +173186,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -170806,6 +173228,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2201
 =======
 #: ../scripts/g.extension/g.extension.py:1993
@@ -170824,6 +173248,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:1993
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -170906,6 +173331,11 @@ msgstr ""
 #: ../scripts/g.extension/g.extension.py:1993
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../scripts/g.extension/g.extension.py:1993
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Extension <%s> successfully uninstalled."
 msgstr ""
@@ -170933,6 +173363,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2001
 =======
 <<<<<<< HEAD
@@ -170961,6 +173392,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2214
 =======
 =======
@@ -170976,6 +173409,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2214
@@ -171024,6 +173458,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2209
 =======
 #: ../scripts/g.extension/g.extension.py:2001
@@ -171043,6 +173479,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2001
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -171080,6 +173517,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -171098,6 +173537,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -171139,6 +173579,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Extension <%s> not removed. Re-run '%s' with '-f' flag to force removal"
 msgstr ""
@@ -171160,6 +173602,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2157
 =======
 <<<<<<< HEAD
@@ -171188,6 +173631,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2265
 =======
 =======
@@ -171203,6 +173648,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2265
@@ -171251,6 +173697,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2260
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -171279,6 +173727,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2157
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -171316,6 +173765,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -171334,6 +173785,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -171375,6 +173827,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Unable to create '{filename}': {error}. Is the GRASS GIS documentation "
@@ -171399,6 +173853,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2176
 =======
 <<<<<<< HEAD
@@ -171427,6 +173882,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2388
 =======
 =======
@@ -171442,6 +173899,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2388
@@ -171490,6 +173948,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2383
 =======
 #: ../scripts/g.extension/g.extension.py:2176
@@ -171509,6 +173969,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2176
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -171546,6 +174007,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -171564,6 +174027,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -171605,6 +174069,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to create '%s': %s"
 msgstr ""
@@ -171626,6 +174092,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2202
 =======
 <<<<<<< HEAD
@@ -171654,6 +174121,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2416
 =======
 =======
@@ -171669,6 +174138,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2416
@@ -171717,6 +174187,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2411
 =======
 #: ../scripts/g.extension/g.extension.py:2202
@@ -171736,6 +174208,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2202
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -171773,6 +174246,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -171791,6 +174266,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -171832,6 +174308,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Manual page for <%s> updated"
 msgstr ""
@@ -171853,6 +174331,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2209
 =======
 <<<<<<< HEAD
@@ -171881,6 +174360,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2423
 =======
 =======
@@ -171896,6 +174377,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2423
@@ -171944,6 +174426,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2418
 =======
 #: ../scripts/g.extension/g.extension.py:2209
@@ -171963,6 +174447,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2209
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -172000,6 +174485,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -172018,6 +174505,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -172059,6 +174547,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to read manual page: %s"
 msgstr ""
@@ -172080,6 +174570,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2253
 =======
 <<<<<<< HEAD
@@ -172108,6 +174599,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2468
 =======
 =======
@@ -172123,6 +174616,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2468
@@ -172171,6 +174665,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2463
 =======
 #: ../scripts/g.extension/g.extension.py:2253
@@ -172190,6 +174686,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2253
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -172227,6 +174724,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -172245,6 +174744,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -172286,6 +174786,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable for write manual page: %s"
 msgstr ""
@@ -172307,6 +174809,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -172346,6 +174849,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2481
 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons"
 msgstr ""
@@ -172363,6 +174868,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -172405,6 +174911,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2476
 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass{}/addons"
 msgstr ""
@@ -172425,6 +174933,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -172494,6 +175003,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2265
 #, python-format
 msgid "GRASS_ADDON_BASE is not defined, installing to ~/.grass%s/addons"
@@ -172517,6 +175030,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -172549,6 +175063,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -172566,6 +175082,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -172631,6 +175148,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "You don't have permission to install extension to <{0}>. Try to run {1} with "
@@ -172654,6 +175173,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2364
 =======
 <<<<<<< HEAD
@@ -172682,6 +175202,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2582
 =======
 =======
@@ -172697,6 +175219,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2582
@@ -172745,6 +175268,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2577
 =======
 #: ../scripts/g.extension/g.extension.py:2364
@@ -172764,6 +175289,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2364
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -172801,6 +175327,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -172819,6 +175347,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -172860,6 +175389,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Identified {0} as known hosting service"
 msgstr ""
@@ -172881,6 +175412,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2370
 =======
 <<<<<<< HEAD
@@ -172909,6 +175441,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2587
 =======
 =======
@@ -172924,6 +175458,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2587
@@ -172972,6 +175507,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2582
 =======
 #: ../scripts/g.extension/g.extension.py:2370
@@ -172991,6 +175528,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2370
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -173028,6 +175566,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -173046,6 +175586,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -173087,6 +175628,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Not using {service} as known hosting service because the URL ends with "
@@ -173110,6 +175653,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../scripts/g.extension/g.extension.py:2390
 =======
 <<<<<<< HEAD
@@ -173138,6 +175682,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2608
 =======
 =======
@@ -173153,6 +175699,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2608
@@ -173201,6 +175748,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2603
 =======
 #: ../scripts/g.extension/g.extension.py:2390
@@ -173220,6 +175769,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../scripts/g.extension/g.extension.py:2390
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -173257,6 +175807,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -173275,6 +175827,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -173316,6 +175869,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Will use the following URL for download: {0}"
 msgstr ""
@@ -173337,6 +175892,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -173364,6 +175920,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2641
 =======
 =======
@@ -173379,6 +175937,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../scripts/g.extension/g.extension.py:2641
@@ -173427,6 +175986,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2636
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -173746,6 +176307,7 @@ msgid "Generating output raster map <%s>..."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -173815,6 +176377,10 @@ msgid "Generating output raster map <%s>..."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../scripts/g.extension/g.extension.py:2519
 msgid "Cannot open URL: {}"
 msgstr ""
@@ -173862,6 +176428,7 @@ msgid "Imported table <%s> with %d rows"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -173953,4 +176520,9 @@ msgid "Imported table <%s> with %d rows"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
diff --git a/locale/templates/grasswxpy.pot b/locale/templates/grasswxpy.pot
index 2767a0c81ad..48e12c63304 100644
--- a/locale/templates/grasswxpy.pot
+++ b/locale/templates/grasswxpy.pot
@@ -25,6 +25,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 =======
 <<<<<<< HEAD
@@ -53,6 +54,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
 =======
 =======
@@ -68,6 +71,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 "POT-Creation-Date: 2024-05-23 03:37-0600\n"
@@ -116,6 +120,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "POT-Creation-Date: 2024-02-09 06:51-0700\n"
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
@@ -135,6 +141,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "POT-Creation-Date: 2022-04-20 07:10-0400\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -172,6 +179,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -190,6 +199,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -231,6 +241,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -256,6 +268,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -297,6 +310,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/nviz/tools.py:109 ../gui/wxpython/nviz/preferences.py:65
 #: ../gui/wxpython/nviz/preferences.py:69
 msgid "View"
@@ -2174,6 +2189,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2243,6 +2259,10 @@ msgid ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/toolbars.py:29
 #: ../gui/wxpython/mapswipe/toolbars.py:31
 msgid "Query raster/vector map(s)"
@@ -2774,6 +2794,7 @@ msgid "Status bar"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2865,6 +2886,11 @@ msgid "Status bar"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/datacatalog/infomanager.py:36
@@ -2905,6 +2931,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:563
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1093
 =======
@@ -2934,6 +2961,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109
 #: ../gui/wxpython/modules/import_export.py:578
 =======
@@ -2950,6 +2979,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1109
@@ -3001,6 +3031,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:69 ../gui/wxpython/menustrings.py:1107
 #: ../gui/wxpython/modules/import_export.py:562
 =======
@@ -3022,6 +3054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -3080,6 +3113,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:563
 #: ../gui/wxpython/menustrings.py:67 ../gui/wxpython/menustrings.py:1093
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3097,6 +3134,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3156,6 +3194,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Import vector data"
 msgstr ""
 
@@ -3177,6 +3218,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:421
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1060
 =======
@@ -3206,6 +3248,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074
 =======
 =======
@@ -3221,6 +3265,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1074
@@ -3269,6 +3314,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1072
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/modules/import_export.py:416
@@ -3290,6 +3337,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3319,6 +3367,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:421
 #: ../gui/wxpython/menustrings.py:34 ../gui/wxpython/menustrings.py:1060
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3336,6 +3386,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3378,6 +3429,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Import raster data"
 msgstr ""
 
@@ -3459,6 +3512,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3500,6 +3554,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/catalog.py:51
 msgid "Data catalog"
 msgstr ""
@@ -3574,6 +3630,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3636,6 +3693,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/g.gui.datacatalog.py:50
 msgid "Data Catalog - GRASS GIS"
 msgstr ""
@@ -3656,6 +3717,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3678,6 +3740,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/tree.py:96
 =======
 =======
@@ -3693,6 +3757,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/datacatalog/tree.py:96
 =======
@@ -3740,6 +3805,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/tree.py:95
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -4065,6 +4132,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4127,6 +4195,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/toolbars.py:23
 msgid "Reload GRASS projects"
 msgstr ""
@@ -4192,6 +4264,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4226,6 +4299,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/history/browser.py:61 ../gui/wxpython/gui_core/menu.py:164
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/modules/extensions.py:76
@@ -4247,6 +4322,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4276,6 +4352,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/extensions.py:76
 #: ../gui/wxpython/gui_core/menu.py:163
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4291,6 +4369,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4328,6 +4407,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Search"
 msgstr ""
 
@@ -4358,6 +4439,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4392,6 +4474,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:927
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Reprojection"
@@ -4428,6 +4512,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4490,6 +4575,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:924
 msgid "Reprojection"
 msgstr ""
@@ -4523,6 +4612,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -4545,6 +4635,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -4562,6 +4654,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
@@ -4626,6 +4719,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Map layer <{ml}> needs to be reprojected.\n"
@@ -4648,6 +4743,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4670,6 +4766,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/dialogs.py:124
 =======
 =======
@@ -4685,6 +4783,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/datacatalog/dialogs.py:124
 =======
@@ -4732,6 +4831,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/dialogs.py:125
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Estimated resolution:"
@@ -4765,6 +4866,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -4788,6 +4890,8 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 #: ../gui/wxpython/datacatalog/dialogs.py:126
 msgid "Estimated resolution:"
@@ -5168,6 +5272,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6102,6 +6207,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/datacatalog/frame.py:31 ../gui/wxpython/menustrings.py:2007
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -6121,6 +6228,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -6186,6 +6294,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Data Catalog"
 msgstr ""
 
@@ -6210,6 +6320,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -6251,6 +6362,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapswipe/g.gui.mapswipe.py:87
 msgid "Map Swipe Tool - GRASS GIS"
 msgstr ""
@@ -18321,6 +18434,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -18390,6 +18504,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:186
 #, python-format
 msgid "<%(name)s>: layer type <%(type)s> is not supported"
@@ -18474,6 +18592,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18499,6 +18618,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1119
 =======
 =======
@@ -18513,6 +18634,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
@@ -18622,6 +18744,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1113 ../gui/wxpython/core/render.py:1120
 #: ../gui/wxpython/core/render.py:1127 ../gui/wxpython/core/gcmd.py:421
 msgid "Details:"
@@ -18644,6 +18771,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -18735,6 +18863,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/render.py:1118
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -18765,6 +18898,7 @@ msgid ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -18806,6 +18940,8 @@ msgid ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "Unable to get current geographic extent. Force quitting wxGUI. Please "
 "manually run g.region to fix the problem."
 msgstr ""
@@ -18826,6 +18962,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -18895,6 +19032,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 "Unable to get current geographic extent. Force quiting wxGUI. Please "
 "manually run g.region to fix the problem."
 msgstr ""
@@ -19230,6 +19371,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -19321,6 +19463,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to open file <%s> for reading."
 msgstr ""
@@ -19342,6 +19489,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/core/workspace.py:1726
 =======
 <<<<<<< HEAD
@@ -19384,6 +19532,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/workspace.py:1770
 =======
 #: ../gui/wxpython/core/workspace.py:1726
@@ -19402,6 +19552,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/core/workspace.py:1726
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -19485,6 +19636,11 @@ msgstr ""
 #: ../gui/wxpython/core/workspace.py:1726
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/core/workspace.py:1726
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Some lines were skipped when reading settings from file <%(file)s>.\n"
@@ -19510,6 +19666,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/core/workspace.py:1976
 =======
 <<<<<<< HEAD
@@ -19552,6 +19709,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/workspace.py:2019
 =======
 #: ../gui/wxpython/core/workspace.py:1976
@@ -19570,6 +19729,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/core/workspace.py:1976
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -19653,6 +19813,11 @@ msgstr ""
 #: ../gui/wxpython/core/workspace.py:1976
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/core/workspace.py:1976
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid " row %d:"
 msgstr ""
@@ -19674,6 +19839,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -19715,6 +19881,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/mapdisp/main.py:190
 #, python-format
 msgid "Unsupported command %s."
@@ -20314,6 +20482,7 @@ msgid "Thematic mapping for vector map in 3D view"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -20383,6 +20552,10 @@ msgid "Thematic mapping for vector map in 3D view"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/core/menutree.py:162
 #, python-format
 msgid "Unknow tag %s"
@@ -26291,6 +26464,7 @@ msgid "Map <%s> not found. "
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26382,6 +26556,11 @@ msgid "Map <%s> not found. "
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/import_export.py:50
@@ -26419,6 +26598,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -26446,6 +26626,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:985
 =======
 =======
@@ -26461,6 +26643,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/modules/import_export.py:985
@@ -26509,6 +26692,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:968
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "right click to (un)select all"
@@ -26529,6 +26714,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -26598,6 +26784,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:965
 msgid "right click to (un)select all"
 msgstr ""
@@ -26630,6 +26820,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26721,6 +26912,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:82
 msgid "Name for output GRASS map (editable)"
 msgstr ""
@@ -26741,6 +26937,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -26833,6 +27030,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:85
 #: ../gui/wxpython/gui_core/forms.py:2248 ../gui/wxpython/psmap/dialogs.py:2216
 msgid "Feature type"
@@ -26861,6 +27063,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -26952,6 +27155,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:96
 msgid "Override projection check (use current location's projection)"
 msgstr ""
@@ -26973,6 +27181,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27014,6 +27223,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:127
 #: ../gui/wxpython/modules/import_export.py:435
 <<<<<<< HEAD
@@ -27035,6 +27246,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -27104,6 +27316,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:113
 #: ../gui/wxpython/gui_core/forms.py:705
 msgid "Close dialog on finish"
@@ -27129,6 +27345,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27161,6 +27378,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -27178,6 +27397,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -27243,6 +27463,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "&Import"
 msgstr ""
 
@@ -27264,6 +27486,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:441
 #: ../gui/wxpython/modules/import_export.py:583
 =======
@@ -27307,6 +27530,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:436
 <<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:598
@@ -27331,6 +27556,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -27389,6 +27615,10 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/modules/import_export.py:441
 #: ../gui/wxpython/modules/import_export.py:583
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -27406,6 +27636,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -27465,6 +27696,9 @@ msgstr ""
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Import selected layers"
 msgstr ""
 
@@ -27489,6 +27723,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27530,6 +27765,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:160
 msgid "Import settings"
 msgstr ""
@@ -27550,6 +27787,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -27619,6 +27857,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:161
 msgid "Import settings"
 msgstr ""
@@ -27641,6 +27883,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -27732,6 +27975,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map names %(names)s exist. "
 msgstr ""
@@ -27753,6 +28001,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/modules/import_export.py:259
 =======
 <<<<<<< HEAD
@@ -27795,6 +28044,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:258
 =======
 #: ../gui/wxpython/modules/import_export.py:259
@@ -27813,6 +28064,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/modules/import_export.py:259
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -27896,6 +28148,11 @@ msgstr ""
 #: ../gui/wxpython/modules/import_export.py:259
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/modules/import_export.py:259
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Output map name <%(name)s> exist. "
 msgstr ""
@@ -27917,6 +28174,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -27958,6 +28216,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:423
 #: ../gui/wxpython/modules/import_export.py:585
 msgid "Add linked layers into layer tree"
@@ -28039,6 +28299,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -28108,6 +28369,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:419
 #: ../gui/wxpython/menustrings.py:163 ../gui/wxpython/menustrings.py:1189
 msgid "Link external raster data"
@@ -28198,6 +28463,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -28230,6 +28496,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -28247,6 +28515,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -28312,6 +28581,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Projection of following layers do not match with projection of current "
 "location. "
@@ -28334,6 +28605,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -28361,6 +28633,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:983
 =======
 =======
@@ -28376,6 +28650,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/modules/import_export.py:983
@@ -28424,6 +28699,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:966
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Layers to be reprojected"
@@ -28558,6 +28835,7 @@ msgid "Raster Map Calculator"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -28627,6 +28905,10 @@ msgid "Raster Map Calculator"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/import_export.py:963
 msgid "Layers to be reprojected"
 msgstr ""
@@ -29100,6 +29382,7 @@ msgid "Thematic mapping for vector map in 3D view"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29191,6 +29474,11 @@ msgid "Thematic mapping for vector map in 3D view"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/modules/mcalc_builder.py:71
@@ -29233,6 +29521,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -29325,6 +29614,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:174
 #: ../gui/wxpython/gui_core/forms.py:2054
 msgid "&Load"
@@ -29347,6 +29641,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29438,6 +29733,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:175
 msgid "Load expression from file"
 msgstr ""
@@ -29458,6 +29758,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -29550,6 +29851,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:176
 #: ../gui/wxpython/menustrings.py:172 ../gui/wxpython/menustrings.py:1198
 #: ../gui/wxpython/gui_core/forms.py:634
@@ -29578,6 +29884,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -29669,6 +29976,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/mcalc_builder.py:181
 msgid "exponent"
 msgstr ""
@@ -29844,6 +30156,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -29871,6 +30184,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iscatt/plots.py:45
 =======
 =======
@@ -29886,6 +30201,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/iscatt/plots.py:45
@@ -29934,6 +30250,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/iscatt/plots.py:44
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -30352,6 +30670,7 @@ msgid "Setup for r.li modules - GRASS GIS"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -30421,6 +30740,10 @@ msgid "Setup for r.li modules - GRASS GIS"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/modules/extensions.py:45
 msgid "Fetch & install extension from GRASS Addons"
 msgstr ""
@@ -30531,6 +30854,7 @@ msgid "Extension"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -30622,6 +30946,11 @@ msgid "Extension"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/rlisetup/wizard.py:66
@@ -30683,6 +31012,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:981
 =======
 <<<<<<< HEAD
@@ -30725,6 +31055,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:982
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:981
@@ -30743,6 +31075,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:981
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -30826,6 +31159,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:981
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:981
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Whole map layer"
 msgstr ""
 
@@ -30859,6 +31197,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:708
 =======
 <<<<<<< HEAD
@@ -30901,6 +31240,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:709
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:708
@@ -30919,6 +31260,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:708
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31002,6 +31344,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:708
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:708
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s was not found, please select another vector"
 msgstr ""
@@ -31023,6 +31370,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:713
 =======
 <<<<<<< HEAD
@@ -31065,6 +31413,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:714
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:713
@@ -31083,6 +31433,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:713
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31166,6 +31517,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:713
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:713
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s has no areas, please select another vector"
 msgstr ""
@@ -31187,6 +31543,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:719
 =======
 <<<<<<< HEAD
@@ -31229,6 +31586,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:720
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:719
@@ -31247,6 +31606,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/wizard.py:719
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -31330,6 +31690,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/wizard.py:719
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/wizard.py:719
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Vector %s has no table connected, please select another vector"
 msgstr ""
@@ -31351,6 +31716,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31392,6 +31758,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:763
 msgid "Insert sampling frame parameter"
 msgstr ""
@@ -31437,6 +31805,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31506,6 +31875,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:762
 msgid "Insert sampling frame parameter"
 msgstr ""
@@ -31563,6 +31936,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -31654,6 +32028,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Select areas from the\n"
 "overlaid vector map"
@@ -31676,6 +32055,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -31717,6 +32097,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:998
 msgid "Choose a method"
 msgstr ""
@@ -31785,6 +32167,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -31854,6 +32237,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:997
 msgid "Choose a method"
 msgstr ""
@@ -31924,6 +32311,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32015,6 +32403,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Draw sampling regions"
 msgstr ""
 
@@ -32036,6 +32429,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32077,6 +32471,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid "Draw sample region {count} of {num_regions}"
 msgstr ""
@@ -32114,6 +32510,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -32183,6 +32580,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid "Draw sample region "
 msgstr ""
 
@@ -32227,6 +32628,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32318,6 +32720,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/toolbars.py:105
 msgid "Rectangle"
 msgstr ""
@@ -32339,6 +32746,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -32380,6 +32788,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1307
 #: ../gui/wxpython/rlisetup/wizard.py:1499
 #: ../gui/wxpython/rlisetup/wizard.py:1612
@@ -32498,6 +32908,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32530,6 +32941,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:156
 =======
 =======
@@ -32547,6 +32960,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -32594,6 +33008,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1309
 #: ../gui/wxpython/rlisetup/wizard.py:1501
 #: ../gui/wxpython/rlisetup/wizard.py:1614
@@ -32714,6 +33130,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -32805,6 +33222,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:155
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-format
@@ -32830,6 +33252,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/wizard.py:1928
 =======
 <<<<<<< HEAD
@@ -32904,6 +33327,12 @@ msgstr ""
 =======
 >>>>>>> osgeo-main
 =======
+#: ../gui/wxpython/rlisetup/wizard.py:1920
+<<<<<<< HEAD
+#: ../gui/wxpython/rlisetup/functions.py:140
+=======
+>>>>>>> osgeo-main
+=======
 #: ../gui/wxpython/rlisetup/wizard.py:1928
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -32921,6 +33350,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -32999,6 +33429,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/functions.py:139
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "The polygon seems to have 0 areas"
@@ -33021,6 +33453,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33062,6 +33495,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1923
 msgid "Select sample area 1 of "
 msgstr ""
@@ -33151,6 +33586,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -33220,6 +33656,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/wizard.py:1931
 msgid "Select sample area 1 of "
 msgstr ""
@@ -33353,6 +33793,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33444,6 +33885,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:26
 msgid "Modify the configuration file"
 msgstr ""
@@ -33470,6 +33916,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/rlisetup/frame.py:97
 =======
 <<<<<<< HEAD
@@ -33512,6 +33959,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:101
 =======
 #: ../gui/wxpython/rlisetup/frame.py:97
@@ -33530,6 +33979,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/rlisetup/frame.py:97
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -33613,6 +34063,11 @@ msgstr ""
 #: ../gui/wxpython/rlisetup/frame.py:97
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/rlisetup/frame.py:97
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-brace-format
 msgid ""
 "Are you sure that you want modify r.li configuration file {name}?\n"
@@ -33636,6 +34091,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -33677,6 +34133,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:106
 msgid "WARNING"
 msgstr ""
@@ -33730,6 +34188,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -33799,6 +34258,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:102
 msgid "WARNING"
 msgstr ""
@@ -33859,6 +34322,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -33950,6 +34414,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Do you want remove r.li configuration file <%s>?"
 msgstr ""
@@ -33971,6 +34440,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -34012,6 +34482,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:245
 msgid "Remove new r.li configuration file?"
 msgstr ""
@@ -34032,6 +34504,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -34101,6 +34574,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:241
 msgid "Remove new r.li configuration file?"
 msgstr ""
@@ -34123,6 +34600,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -34214,6 +34692,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Set the new name for %s \"                                            "
@@ -34237,6 +34720,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -34278,6 +34762,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:279
 msgid "Rename configuration file"
 msgstr ""
@@ -35113,6 +35599,7 @@ msgid "There were some issues when loading menu or Tools tab:"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -35180,6 +35667,10 @@ msgid "There were some issues when loading menu or Tools tab:"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/rlisetup/frame.py:275
 msgid "Rename configuration file"
 msgstr ""
@@ -41602,6 +42093,7 @@ msgid "Dbf driver does not support usage of SQL functions."
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -48100,6 +48592,11 @@ msgid "Dbf driver does not support usage of SQL functions."
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/lmgr/frame.py:1305
@@ -48167,6 +48664,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -48206,6 +48704,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/manager.py:237 ../gui/wxpython/dbmgr/base.py:369
 #: ../gui/wxpython/dbmgr/base.py:961 ../gui/wxpython/dbmgr/base.py:1132
 #: ../gui/wxpython/dbmgr/base.py:1486 ../gui/wxpython/dbmgr/base.py:2180
@@ -48221,6 +48721,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 49258e3437 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -48263,6 +48764,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/manager.py:236 ../gui/wxpython/dbmgr/base.py:362
 #: ../gui/wxpython/dbmgr/base.py:952 ../gui/wxpython/dbmgr/base.py:1123
 #: ../gui/wxpython/dbmgr/base.py:1477 ../gui/wxpython/dbmgr/base.py:2170
@@ -48284,6 +48787,7 @@ msgid "Number of loaded records: %d"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -48353,6 +48857,10 @@ msgid "Number of loaded records: %d"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/dialogs.py:81
 #, python-format
 msgid ""
@@ -48424,6 +48932,7 @@ msgid "Category"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -48515,6 +49024,11 @@ msgid "Category"
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgstr ""
 
 #: ../gui/wxpython/dbmgr/g.gui.dbmgr.py:51
@@ -48543,6 +49057,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -48570,6 +49085,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362
 =======
 =======
@@ -48585,6 +49102,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:107 ../gui/wxpython/dbmgr/base.py:2362
@@ -48633,6 +49151,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/dbmgr/sqlbuilder.py:106 ../gui/wxpython/dbmgr/base.py:2351
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Database connection"
@@ -49907,6 +50427,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -49976,6 +50497,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/web_services/widgets.py:140
 msgid " Requested data settings "
 msgstr ""
@@ -53092,6 +53617,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -53183,6 +53709,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Unable to open file\n"
@@ -53206,6 +53737,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:535
 =======
 <<<<<<< HEAD
@@ -53248,6 +53780,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:530
 =======
 #: ../gui/wxpython/psmap/instructions.py:535
@@ -53266,6 +53800,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:535
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53349,6 +53884,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:535
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:535
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid "Instruction file will be loaded with following region: %s\n"
 msgstr ""
@@ -53370,6 +53910,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:541
 =======
 <<<<<<< HEAD
@@ -53412,6 +53953,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:536
 =======
 #: ../gui/wxpython/psmap/instructions.py:541
@@ -53430,6 +53973,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:541
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53513,6 +54057,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:541
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:541
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Region cannot be set\n"
@@ -53536,6 +54085,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -53577,6 +54127,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:706
 <<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:929
@@ -53617,6 +54169,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -53686,6 +54239,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:711
 #: ../gui/wxpython/psmap/instructions.py:925
 #: ../gui/wxpython/psmap/instructions.py:1053
@@ -53715,6 +54272,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -53747,6 +54305,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -53764,6 +54324,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -53829,6 +54390,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %s"
 msgstr ""
@@ -53850,6 +54413,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:727
 =======
 <<<<<<< HEAD
@@ -53892,6 +54456,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:722
 =======
 #: ../gui/wxpython/psmap/instructions.py:727
@@ -53910,6 +54476,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:727
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -53993,6 +54560,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:727
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:727
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Scale has changed, old value: %(old)s\n"
@@ -54016,6 +54588,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:732
 =======
 <<<<<<< HEAD
@@ -54058,6 +54631,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:727
 =======
 #: ../gui/wxpython/psmap/instructions.py:732
@@ -54076,6 +54651,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:732
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54159,6 +54735,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:732
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:732
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to read instruction %s.\n"
@@ -54182,6 +54763,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:746
 =======
 <<<<<<< HEAD
@@ -54224,6 +54806,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:741
 =======
 #: ../gui/wxpython/psmap/instructions.py:746
@@ -54242,6 +54826,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:746
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54325,6 +54910,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/instructions.py:746
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/instructions.py:746
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Map frame position changed, old value: %(old1)s %(old2)s\n"
@@ -54348,6 +54938,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:764
 =======
 <<<<<<< HEAD
@@ -54376,6 +54967,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:765
 =======
 =======
@@ -54391,6 +54984,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:765
@@ -54439,6 +55033,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:759
 =======
 #: ../gui/wxpython/psmap/instructions.py:764
@@ -54458,6 +55054,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:764
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54495,6 +55092,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54513,6 +55112,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -54554,6 +55154,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Map frame size changed, old value: %(old1)s %(old2)s\n"
@@ -54577,6 +55179,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:837
 =======
 <<<<<<< HEAD
@@ -54605,6 +55208,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:840
 =======
 =======
@@ -54620,6 +55225,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:840
@@ -54668,6 +55274,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:832
 =======
 #: ../gui/wxpython/psmap/instructions.py:837
@@ -54687,6 +55295,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:837
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54724,6 +55333,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54742,6 +55353,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -54783,6 +55395,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Failed to read instruction %(file)s.\n"
@@ -54806,6 +55420,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:852
 =======
 <<<<<<< HEAD
@@ -54834,6 +55449,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:856
 =======
 =======
@@ -54849,6 +55466,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:856
@@ -54897,6 +55515,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:847
 =======
 #: ../gui/wxpython/psmap/instructions.py:852
@@ -54916,6 +55536,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:852
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -54953,6 +55574,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -54971,6 +55594,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -55012,6 +55636,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %s."
 msgstr ""
@@ -55033,6 +55659,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/instructions.py:1132
 =======
 <<<<<<< HEAD
@@ -55061,6 +55688,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:1136
 =======
 =======
@@ -55076,6 +55705,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/instructions.py:1136
@@ -55124,6 +55754,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/instructions.py:1127
 =======
 #: ../gui/wxpython/psmap/instructions.py:1132
@@ -55143,6 +55775,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/instructions.py:1132
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -55180,6 +55813,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -55198,6 +55833,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -55239,6 +55875,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read instruction %(inst)s: file %(file)s not found."
 msgstr ""
@@ -55260,6 +55898,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55301,6 +55940,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/g.gui.psmap.py:52
 msgid "Cartographic Composer - GRASS GIS"
 msgstr ""
@@ -55361,6 +56002,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55430,6 +56072,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/toolbars.py:86
 msgid "Full extent"
 msgstr ""
@@ -55479,6 +56125,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55520,6 +56167,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:267
 msgid "Units:"
 msgstr ""
@@ -55540,6 +56189,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55609,6 +56259,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/utils.py:102
 msgid "inch"
 msgstr ""
@@ -55663,6 +56317,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -55754,6 +56409,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Position of the top left corner\n"
 "from the top left edge of the paper"
@@ -55776,6 +56436,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -55817,6 +56478,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:311
 msgid "Position is given:"
 msgstr ""
@@ -55845,6 +56508,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -55914,6 +56578,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:313
 msgid "Position is given:"
 msgstr ""
@@ -55944,6 +56612,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56035,6 +56704,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Position from the top left\n"
 "edge of the paper"
@@ -56057,6 +56731,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -56084,6 +56759,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:462
 =======
 =======
@@ -56099,6 +56776,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:462
@@ -56147,6 +56825,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:453
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Font:"
@@ -56287,6 +56967,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -56356,6 +57037,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:455
 msgid "Font:"
 msgstr ""
@@ -56494,6 +57179,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56526,6 +57212,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -56543,6 +57231,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -56608,6 +57297,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid "Map max resolution (dpi):"
 msgstr ""
 
@@ -56630,6 +57321,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -56657,6 +57349,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684
 =======
 =======
@@ -56672,6 +57366,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:1148 ../gui/wxpython/psmap/dialogs.py:3684
@@ -56720,6 +57415,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1122 ../gui/wxpython/psmap/dialogs.py:3645
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Border"
@@ -56756,6 +57453,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -56825,6 +57523,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1125 ../gui/wxpython/psmap/dialogs.py:3641
 msgid "Border"
 msgstr ""
@@ -56859,6 +57561,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -56891,6 +57594,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -56908,6 +57613,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -56973,6 +57679,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Region is set to match this map,\n"
 "raster or vector map must be added later"
@@ -56995,6 +57703,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -57022,6 +57731,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1296
 =======
 =======
@@ -57037,6 +57748,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:1296
@@ -57085,6 +57797,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1269
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Region selection"
@@ -57177,6 +57891,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -57246,6 +57961,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:1272
 msgid "Region selection"
 msgstr ""
@@ -57336,6 +58055,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -57368,6 +58088,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -57385,6 +58107,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -57450,6 +58173,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%s properties"
 msgstr ""
@@ -57471,6 +58196,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -57498,6 +58224,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2249
 =======
 =======
@@ -57513,6 +58241,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:2249
@@ -57561,6 +58290,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2218
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Data selection"
@@ -57743,6 +58474,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -57812,6 +58544,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:2208
 msgid "Data selection"
 msgstr ""
@@ -57992,6 +58728,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58024,6 +58761,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58041,6 +58780,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58106,6 +58846,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%(rast)s: type %(type)s"
 msgstr ""
@@ -58127,6 +58869,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58154,6 +58897,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3498
 =======
 =======
@@ -58169,6 +58914,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:3498
@@ -58217,6 +58963,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3459
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Type of legend"
@@ -58293,6 +59041,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -58362,6 +59111,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3455
 msgid "Type of legend"
 msgstr ""
@@ -58436,6 +59189,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58468,6 +59222,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58485,6 +59241,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58550,6 +59307,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Width of the color symbol (for lines)\n"
 "in front of the legend text"
@@ -58572,6 +59331,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58599,6 +59359,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028
 =======
 =======
@@ -58614,6 +59376,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:3864 ../gui/wxpython/psmap/dialogs.py:4028
@@ -58662,6 +59425,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3817 ../gui/wxpython/psmap/dialogs.py:3980
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Columns:"
@@ -58690,6 +59455,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -58759,6 +59525,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:3813 ../gui/wxpython/psmap/dialogs.py:3976
 msgid "Columns:"
 msgstr ""
@@ -58785,6 +59555,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -58817,6 +59588,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -58834,6 +59607,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -58899,6 +59673,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Column separation distance between the left edges\n"
 "of two columns in a multicolumn legend"
@@ -58921,6 +59697,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -58948,6 +59725,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4133
 =======
 =======
@@ -58963,6 +59742,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:4133
@@ -59011,6 +59791,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4085
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Edit legend label:"
@@ -59167,6 +59949,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -59236,6 +60019,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:4081
 msgid "Edit legend label:"
 msgstr ""
@@ -59390,6 +60177,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -59422,6 +60210,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -59439,6 +60229,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -59504,6 +60295,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "PIL\n"
 "missing"
@@ -59526,6 +60319,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/dialogs.py:5956
 =======
 <<<<<<< HEAD
@@ -59554,6 +60348,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6007
 =======
 =======
@@ -59569,6 +60365,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6007
@@ -59617,6 +60414,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:5954
 =======
 #: ../gui/wxpython/psmap/dialogs.py:5956
@@ -59636,6 +60435,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/dialogs.py:5956
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59673,6 +60473,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -59691,6 +60493,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59732,6 +60535,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
@@ -59753,6 +60558,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/dialogs.py:6019
 =======
 <<<<<<< HEAD
@@ -59781,6 +60587,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6070
 =======
 =======
@@ -59796,6 +60604,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6070
@@ -59844,6 +60653,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6017
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6019
@@ -59863,6 +60674,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6019
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -59900,6 +60712,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -59918,6 +60732,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -59959,6 +60774,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "size: %(width)s x %(height)s pts"
 msgstr ""
@@ -59980,6 +60797,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -60007,6 +60825,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6092
 =======
 =======
@@ -60022,6 +60842,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6092
@@ -60070,6 +60891,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6039
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "No image selected."
@@ -60110,6 +60933,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -60179,6 +61003,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6041
 msgid "No image selected."
 msgstr ""
@@ -60217,6 +61045,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -60249,6 +61078,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -60266,6 +61097,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -60331,6 +61163,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Note: Selected symbol is not displayed\n"
 "in draft mode (only in preview mode)"
@@ -60353,6 +61187,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -60380,6 +61215,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619
 =======
 =======
@@ -60395,6 +61232,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/dialogs.py:6340 ../gui/wxpython/psmap/dialogs.py:6619
@@ -60443,6 +61281,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6287 ../gui/wxpython/psmap/dialogs.py:6566
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Outline color:"
@@ -60504,6 +61344,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -60573,6 +61414,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/dialogs.py:6289 ../gui/wxpython/psmap/dialogs.py:6568
 msgid "Outline color:"
 msgstr ""
@@ -60635,6 +61480,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -60726,6 +61572,11 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Python Imaging Library is not available.\n"
 "'Preview' functionality won't work."
@@ -60748,6 +61599,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:275
 =======
 <<<<<<< HEAD
@@ -60790,6 +61642,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:281
 =======
 #: ../gui/wxpython/psmap/frame.py:275
@@ -60808,6 +61662,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:275
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -60891,6 +61746,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/frame.py:275
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/frame.py:275
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #, python-format
 msgid ""
 "Characters on position %s are not supported by ISO-8859-1 (Latin 1) encoding "
@@ -60914,6 +61774,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:283
 =======
 <<<<<<< HEAD
@@ -60956,6 +61817,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:289
 =======
 #: ../gui/wxpython/psmap/frame.py:283
@@ -60974,6 +61837,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:283
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -61057,6 +61921,11 @@ msgstr ""
 #: ../gui/wxpython/psmap/frame.py:283
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+#: ../gui/wxpython/psmap/frame.py:283
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 msgid ""
 "Not all characters are supported by ISO-8859-1 (Latin 1) encoding which is "
 "required by module ps.map."
@@ -61079,6 +61948,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -61120,6 +61990,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:320
 msgid "Program ps2pdf is not available. Please install it first to create PDF."
 msgstr ""
@@ -61155,6 +62027,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -61224,6 +62097,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:314
 msgid "Program ps2pdf is not available. Please install it first to create PDF."
 msgstr ""
@@ -61258,6 +62135,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -61290,6 +62168,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -61307,6 +62187,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -61372,6 +62253,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Ps.map exited with return code %s"
 msgstr ""
@@ -61393,6 +62276,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: ../gui/wxpython/psmap/frame.py:438
 =======
 <<<<<<< HEAD
@@ -61421,6 +62305,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:437
 =======
 =======
@@ -61436,6 +62322,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:437
@@ -61484,6 +62371,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:436
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Program {} is not available."
@@ -61525,6 +62414,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: ../gui/wxpython/psmap/frame.py:438
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -61562,6 +62452,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -61580,6 +62472,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -61621,6 +62514,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "%(prg)s exited with return code %(code)s"
 msgstr ""
@@ -61642,6 +62537,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -61669,6 +62565,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:464
 =======
 =======
@@ -61684,6 +62582,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:464
@@ -61732,6 +62631,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:463
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "PDF generated"
@@ -61772,6 +62673,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -61841,6 +62743,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:442
 msgid "PDF generated"
 msgstr ""
@@ -61883,6 +62789,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -61915,6 +62822,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -61932,6 +62841,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -61997,6 +62907,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 msgid ""
 "Preview is not available probably because Ghostscript is not installed or "
 "not on PATH."
@@ -62019,6 +62931,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -62046,6 +62959,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:514
 =======
 =======
@@ -62061,6 +62976,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:514
@@ -62109,6 +63025,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:512
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 #, python-brace-format
@@ -62142,6 +63060,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -62211,6 +63130,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:488
 msgid "Please follow instructions on GRASS Trac Wiki."
 msgstr ""
@@ -62241,6 +63164,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -62273,6 +63197,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -62290,6 +63216,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -62355,6 +63282,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #, python-format
 msgid "Failed to read file %s."
 msgstr ""
@@ -62376,6 +63305,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -62403,6 +63333,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:794
 =======
 =======
@@ -62418,6 +63350,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 #: ../gui/wxpython/psmap/frame.py:794
@@ -62466,6 +63399,8 @@ msgstr ""
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:792
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
 msgid "Scalebar is not appropriate for this projection"
@@ -62529,6 +63464,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -62598,6 +63534,10 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #: ../gui/wxpython/psmap/frame.py:761
 msgid "Scalebar is not appropriate for this projection"
 msgstr ""
@@ -62666,6 +63606,7 @@ msgstr ""
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -62757,3 +63698,8 @@ msgstr ""
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/man/build_graphical_index.py b/man/build_graphical_index.py
index e2faf2bfff6..46850386692 100755
--- a/man/build_graphical_index.py
+++ b/man/build_graphical_index.py
@@ -29,6 +29,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 # COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team
@@ -88,6 +89,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # COPYRIGHT: (C) 2015-2024 by Vaclav Petras and the GRASS Development Team
 =======
 # COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team
@@ -107,6 +110,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -130,6 +134,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 # COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -149,6 +155,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -253,6 +260,11 @@
 # COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+# COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 #
 #        This program is free software under the GNU General Public
 #        License (>=v2). Read the file COPYING that comes with GRASS
@@ -371,6 +383,7 @@ def std_img_name(name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -445,6 +458,10 @@ def std_img_name(name):
 =======
         "https://grass.osgeo.org/grass-devel/manuals/libpython/index.html",
 =======
+>>>>>>> osgeo-main
+=======
+        "https://grass.osgeo.org/grass-devel/manuals/libpython/index.html",
+=======
 >>>>>>> osgeo-main
         "https://grass.osgeo.org/grass80/manuals/libpython/index.html",
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -468,6 +485,7 @@ def std_img_name(name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         "https://grass.osgeo.org/grass-devel/manuals/libpython/index.html",
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -592,6 +610,11 @@ def std_img_name(name):
 =======
         "https://grass.osgeo.org/grass-devel/manuals/libpython/index.html",
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        "https://grass.osgeo.org/grass-devel/manuals/libpython/index.html",
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         std_img_name("python"),
         "Python",
diff --git a/man/build_html.py b/man/build_html.py
index 078ab53fbd1..6da3cb7d63d 100644
--- a/man/build_html.py
+++ b/man/build_html.py
@@ -25,6 +25,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 # (C) 2003-2023 Markus Neteler and the GRASS Development Team
@@ -84,6 +85,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # (C) 2003-2024 Markus Neteler and the GRASS Development Team
 =======
 # (C) 2003-2022 Markus Neteler and the GRASS Development Team
@@ -103,6 +106,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -126,6 +130,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 # (C) 2003-2022 Markus Neteler and the GRASS Development Team
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -145,6 +151,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # (C) 2003-2023 Markus Neteler and the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -249,6 +256,11 @@
 # (C) 2003-2023 Markus Neteler and the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+# (C) 2003-2023 Markus Neteler and the GRASS Development Team
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 # Authors:
 #   Markus Neteler
 #   Glynn Clements
@@ -711,10 +723,7 @@ def write_html_cmd_overview(f):
 
 
 def write_html_footer(f, index_url, year=None):
-    if year is None:
-        cur_year = default_year
-    else:
-        cur_year = year
+    cur_year = default_year if year is None else year
     f.write(
         footer_tmpl.substitute(
             grass_version=grass_version, index_url=index_url, year=cur_year
diff --git a/man/build_rest.py b/man/build_rest.py
index 1b995c89737..530c67f0937 100644
--- a/man/build_rest.py
+++ b/man/build_rest.py
@@ -33,6 +33,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 # (C) 2003-2023 by Luca Delucchi and the GRASS Development Team
@@ -92,6 +93,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # (C) 2003-2024 by Luca Delucchi and the GRASS Development Team
 =======
 # (C) 2003-2022 by Luca Delucchi and the GRASS Development Team
@@ -111,6 +114,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -134,6 +138,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 # (C) 2003-2022 by Luca Delucchi and the GRASS Development Team
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -153,6 +159,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # (C) 2003-2023 by Luca Delucchi and the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -257,6 +264,11 @@
 # (C) 2003-2023 by Luca Delucchi and the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+# (C) 2003-2023 by Luca Delucchi and the GRASS Development Team
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 
 import os
 import string
@@ -440,6 +452,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
  2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual
@@ -486,6 +499,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  2003-2024 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual
 """  # noqa: E501
@@ -510,6 +525,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
  2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -622,6 +638,11 @@
  2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+ 2003-2023 `GRASS Development Team `_, GRASS GIS ${grass_version} Reference Manual
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 """
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 )
diff --git a/man/parser_standard_options.py b/man/parser_standard_options.py
index edcba1c1848..0f7a53d5c2c 100644
--- a/man/parser_standard_options.py
+++ b/man/parser_standard_options.py
@@ -132,6 +132,7 @@ class OptTable(object):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
@@ -222,6 +223,11 @@ class OptTable(object):
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
     def __init__(self, list_of_dict):
         self.options = list_of_dict
diff --git a/man/sphinx/Makefile b/man/sphinx/Makefile
index 8fe3c91d212..da575436990 100644
--- a/man/sphinx/Makefile
+++ b/man/sphinx/Makefile
@@ -101,6 +101,7 @@ qthelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GRASS83Documentation.qhcp"
@@ -161,6 +162,8 @@ qthelp:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/grass_gis.qhcp"
 	@echo "To view the help file:"
@@ -184,6 +187,7 @@ qthelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -212,6 +216,8 @@ qthelp:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GRASS80Documentation.qhcp"
 	@echo "To view the help file:"
@@ -231,6 +237,7 @@ qthelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -259,6 +266,8 @@ qthelp:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GRASS83Documentation.qhcp"
 	@echo "To view the help file:"
@@ -278,6 +287,7 @@ qthelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -306,6 +316,8 @@ qthelp:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GRASS83Documentation.qhcp"
 	@echo "To view the help file:"
@@ -325,6 +337,7 @@ qthelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -379,6 +392,8 @@ qthelp:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@@ -409,6 +424,7 @@ devhelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 	@echo "# mkdir -p $$HOME/.local/share/devhelp/GRASS83Documentation"
@@ -468,6 +484,8 @@ devhelp:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	@echo "# mkdir -p $$HOME/.local/share/devhelp/grass_gis"
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/grass_gis"
@@ -489,6 +507,7 @@ devhelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -517,6 +536,8 @@ devhelp:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	@echo "# mkdir -p $$HOME/.local/share/devhelp/GRASS80Documentation"
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GRASS80Documentation"
@@ -535,6 +556,7 @@ devhelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -563,6 +585,8 @@ devhelp:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	@echo "# mkdir -p $$HOME/.local/share/devhelp/GRASS83Documentation"
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GRASS83Documentation"
@@ -581,6 +605,7 @@ devhelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -609,6 +634,8 @@ devhelp:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	@echo "# mkdir -p $$HOME/.local/share/devhelp/GRASS83Documentation"
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GRASS83Documentation"
@@ -627,6 +654,7 @@ devhelp:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -680,6 +708,8 @@ devhelp:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	@echo "# devhelp"
 
diff --git a/man/sphinx/conf.py b/man/sphinx/conf.py
index ef5e27314d9..f7a2f8fa3de 100644
--- a/man/sphinx/conf.py
+++ b/man/sphinx/conf.py
@@ -23,6 +23,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 # GRASS GIS 8.3 Documentation documentation build configuration file, created by
@@ -72,6 +73,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # GRASS GIS Python documentation build configuration file
 # originally created by sphinx-quickstart.
 =======
@@ -95,6 +98,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # GRASS GIS 8.3 Documentation documentation build configuration file, created by
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -204,6 +208,11 @@
 # GRASS GIS 8.3 Documentation documentation build configuration file, created by
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+# GRASS GIS 8.3 Documentation documentation build configuration file, created by
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 # sphinx-quickstart on Thu Aug  9 17:16:28 2012.
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 #
@@ -266,6 +275,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 project = "GRASS GIS 8.3 Documentation"
@@ -326,6 +336,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 project = "GRASS GIS"
 copyright = "2024, GRASS Development Team"
 =======
@@ -346,6 +358,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -375,6 +388,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 project = "GRASS GIS 8.0 Documentation"
 copyright = "2021, GRASS Development Team"
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -393,6 +408,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -416,6 +432,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 project = "GRASS GIS 8.3 Documentation"
 <<<<<<< HEAD
 copyright = "2022, GRASS Development Team"
@@ -442,6 +460,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 copyright = "2023, GRASS Development Team"
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -572,6 +591,11 @@
 copyright = "2023, GRASS Development Team"
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+copyright = "2023, GRASS Development Team"
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -602,6 +626,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 version = "8.3"
@@ -661,6 +686,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 version = "8.4"
 =======
 version = "8.0"
@@ -680,6 +707,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -703,6 +731,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 version = "8.0"
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -722,6 +752,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 version = "8.3"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -826,6 +857,11 @@
 version = "8.3"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+version = "8.3"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 # The full version, including alpha/beta/rc tags.
 release = "dev"
 
@@ -965,6 +1001,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 htmlhelp_basename = "grass83Documentationdoc"
@@ -1024,6 +1061,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 htmlhelp_basename = "grass_gis"
 =======
 htmlhelp_basename = "grass80Documentationdoc"
@@ -1043,6 +1082,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1066,6 +1106,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 htmlhelp_basename = "grass80Documentationdoc"
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -1085,6 +1127,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 htmlhelp_basename = "grass83Documentationdoc"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1189,6 +1232,11 @@
 htmlhelp_basename = "grass83Documentationdoc"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+htmlhelp_basename = "grass83Documentationdoc"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -1231,6 +1279,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
         "grass83Documentation.tex",
@@ -1290,6 +1339,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         "grass_gis.tex",
         project,
@@ -1311,6 +1362,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -1339,6 +1391,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         "grass80Documentation.tex",
         "GRASS GIS 8.0 Documentation",
@@ -1357,6 +1411,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1385,6 +1440,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         "grass83Documentation.tex",
         "GRASS GIS 8.3 Documentation",
@@ -1403,6 +1460,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1431,6 +1489,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         "grass83Documentation.tex",
         "GRASS GIS 8.3 Documentation",
@@ -1449,6 +1509,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1502,6 +1563,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         "GRASS Development Team",
         "manual",
@@ -1560,6 +1623,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
         "grass83documentation",
@@ -1619,6 +1683,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         "grass_gis",
         project,
@@ -1640,6 +1706,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -1668,6 +1735,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         "grass80documentation",
         "GRASS GIS 8.0 Documentation",
@@ -1686,6 +1755,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1714,6 +1784,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         "grass83documentation",
         "GRASS GIS 8.3 Documentation",
@@ -1732,6 +1804,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1760,6 +1833,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         "grass83documentation",
         "GRASS GIS 8.3 Documentation",
@@ -1778,6 +1853,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1831,6 +1907,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ["GRASS Development Team"],
         1,
@@ -1873,6 +1951,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
         "grass83Documentation",
@@ -1934,6 +2013,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         "grass_gis",
         project,
@@ -1958,6 +2039,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 =======
@@ -1986,6 +2068,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         "grass80Documentation",
         "GRASS GIS 8.0 Documentation",
@@ -1998,6 +2082,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610))
         "grass80Documentation",
 <<<<<<< HEAD
@@ -2061,6 +2146,9 @@
 =======
         "grass80Documentation",
 >>>>>>> osgeo-main
+=======
+        "grass80Documentation",
+>>>>>>> osgeo-main
 =======
         "grass83Documentation",
         "GRASS GIS 8.3 Documentation",
@@ -2081,6 +2169,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2109,6 +2198,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         "grass83Documentation",
         "GRASS GIS 8.3 Documentation",
@@ -2129,6 +2220,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2179,6 +2271,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         "One line description of project.",
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -2223,6 +2317,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 epub_title = "GRASS GIS 8.3 Documentation"
@@ -2285,6 +2380,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 epub_title = project
 epub_author = "GRASS Development Team"
 epub_publisher = epub_author
@@ -2304,6 +2401,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -2366,6 +2464,10 @@
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
+>>>>>>> osgeo-main
 epub_title = "GRASS GIS 8.0 Documentation"
 epub_author = "GRASS Development Team"
 epub_publisher = "GRASS Development Team"
@@ -2386,6 +2488,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -2408,6 +2511,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -2430,6 +2535,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660))
 =======
@@ -2458,6 +2564,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 epub_copyright = "2022, GRASS Development Team"
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2479,6 +2587,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724))
 =======
@@ -2507,6 +2616,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 epub_copyright = "2022, GRASS Development Team"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2526,6 +2637,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 epub_copyright = "2023, GRASS Development Team"
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -2657,6 +2769,11 @@
 epub_copyright = "2023, GRASS Development Team"
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+epub_copyright = "2023, GRASS Development Team"
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
diff --git a/man/sphinx/make.bat b/man/sphinx/make.bat
index 6cf4e1f9de0..647a92a931e 100644
--- a/man/sphinx/make.bat
+++ b/man/sphinx/make.bat
@@ -123,6 +123,7 @@ if "%1" == "qthelp" (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GRASS83Documentation.qhcp
@@ -183,6 +184,8 @@ if "%1" == "qthelp" (
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\grass_gis.qhcp
 	echo.To view the help file:
@@ -206,6 +209,7 @@ if "%1" == "qthelp" (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -234,6 +238,8 @@ if "%1" == "qthelp" (
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GRASS80Documentation.qhcp
 	echo.To view the help file:
@@ -253,6 +259,7 @@ if "%1" == "qthelp" (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -281,6 +288,8 @@ if "%1" == "qthelp" (
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GRASS83Documentation.qhcp
 	echo.To view the help file:
@@ -300,6 +309,7 @@ if "%1" == "qthelp" (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -328,6 +338,8 @@ if "%1" == "qthelp" (
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GRASS83Documentation.qhcp
 	echo.To view the help file:
@@ -347,6 +359,7 @@ if "%1" == "qthelp" (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -400,6 +413,8 @@ if "%1" == "qthelp" (
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	goto end
 )
diff --git a/misc/m.measure/main.c b/misc/m.measure/main.c
index 51b1c6734ec..9c54b2f6b45 100644
--- a/misc/m.measure/main.c
+++ b/misc/m.measure/main.c
@@ -74,6 +74,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -164,6 +165,11 @@ int main(int argc, char **argv)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     shell = G_define_flag();
diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c
index c84408551af..9aadd481f38 100644
--- a/misc/m.nviz.image/surface.c
+++ b/misc/m.nviz.image/surface.c
@@ -116,6 +116,7 @@ int load_rasters(const struct GParams *params, nv_data *data)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -156,6 +157,8 @@ int load_rasters(const struct GParams *params, nv_data *data)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         /* color */
         /* check for color map */
@@ -180,6 +183,7 @@ int load_rasters(const struct GParams *params, nv_data *data)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -248,6 +252,10 @@ int load_rasters(const struct GParams *params, nv_data *data)
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         mapset = G_find_raster2(params->color_map->answers[i], "");
         if (mapset == NULL) {
@@ -274,6 +282,7 @@ int load_rasters(const struct GParams *params, nv_data *data)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -364,6 +373,11 @@ int load_rasters(const struct GParams *params, nv_data *data)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             Nviz_set_attr(
                 id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT,
diff --git a/misc/m.nviz.image/volume.c b/misc/m.nviz.image/volume.c
index 65fb6035e56..8e9ff4d79c1 100644
--- a/misc/m.nviz.image/volume.c
+++ b/misc/m.nviz.image/volume.c
@@ -94,6 +94,7 @@ int load_rasters3d(const struct GParams *params, nv_data *data)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 int add_isosurfs(const struct GParams *params, nv_data *data)
 =======
 <<<<<<< HEAD
@@ -136,6 +137,8 @@ int add_isosurfs(const struct GParams *params, nv_data *data)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int add_isosurfs(const struct GParams *params, nv_data *data UNUSED)
 =======
 int add_isosurfs(const struct GParams *params, nv_data *data)
@@ -154,6 +157,7 @@ int add_isosurfs(const struct GParams *params, nv_data *data)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 int add_isosurfs(const struct GParams *params, nv_data *data)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -237,6 +241,11 @@ int add_isosurfs(const struct GParams *params, nv_data *data)
 int add_isosurfs(const struct GParams *params, nv_data *data)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+int add_isosurfs(const struct GParams *params, nv_data *data)
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 {
     int i;
     float level;
@@ -423,6 +432,7 @@ int add_isosurfs(const struct GParams *params, nv_data *data)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 int add_slices(const struct GParams *params, nv_data *data)
 =======
 <<<<<<< HEAD
@@ -465,6 +475,8 @@ int add_slices(const struct GParams *params, nv_data *data)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int add_slices(const struct GParams *params, nv_data *data UNUSED)
 =======
 int add_slices(const struct GParams *params, nv_data *data)
@@ -483,6 +495,7 @@ int add_slices(const struct GParams *params, nv_data *data)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 int add_slices(const struct GParams *params, nv_data *data)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -566,6 +579,11 @@ int add_slices(const struct GParams *params, nv_data *data)
 int add_slices(const struct GParams *params, nv_data *data)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+int add_slices(const struct GParams *params, nv_data *data)
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 {
     int i;
     int num, nvols, *vol_list, id, nslices, axis;
diff --git a/misc/m.nviz.script/main.c b/misc/m.nviz.script/main.c
index 2afe54b681b..bb4c46a8286 100644
--- a/misc/m.nviz.script/main.c
+++ b/misc/m.nviz.script/main.c
@@ -341,6 +341,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 int do_profile(double e1, double e2, double n1, double n2, const char *name,
                int fd, int data_type)
 =======
@@ -384,6 +385,8 @@ int do_profile(double e1, double e2, double n1, double n2, const char *name,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int do_profile(double e1, double e2, double n1, double n2,
                const char *name UNUSED, int fd, int data_type)
 =======
@@ -404,6 +407,7 @@ int do_profile(double e1, double e2, double n1, double n2, const char *name,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -433,6 +437,8 @@ int do_profile(double e1, double e2, double n1, double n2, const char *name,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 int do_profile(double e1, double e2, double n1, double n2, const char *name,
                int fd, int data_type)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -450,6 +456,7 @@ int do_profile(double e1, double e2, double n1, double n2, const char *name,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -492,6 +499,8 @@ int do_profile(double e1, double e2, double n1, double n2, const char *name,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     float rows, cols, LEN;
     double Y, X, AZI;
diff --git a/mswindows/GRASS-Installer.nsi.tmpl b/mswindows/GRASS-Installer.nsi.tmpl
index d76c2175b77..4f3f48c72d5 100644
--- a/mswindows/GRASS-Installer.nsi.tmpl
+++ b/mswindows/GRASS-Installer.nsi.tmpl
@@ -821,6 +821,7 @@ Function DownloadInstallMSRuntime
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -911,6 +912,11 @@ Function DownloadInstallMSRuntime
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 	Pop $0
 	StrCmp $0 "success" untar_ok untar_failed
diff --git a/mswindows/GRASS-Packager.bat.tmpl b/mswindows/GRASS-Packager.bat.tmpl
index 43a0b80aaf4..43cbe769bd8 100644
--- a/mswindows/GRASS-Packager.bat.tmpl
+++ b/mswindows/GRASS-Packager.bat.tmpl
@@ -106,6 +106,7 @@ xcopy %OSGEO4W_PKG_DIR%\share\gdal %PACKAGE_DIR%\share\gdal /S/V/F/I
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 mkdir %PACKAGE_DIR%\Python39
 
 xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
@@ -150,6 +151,8 @@ xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 mkdir %PACKAGE_DIR%\Python312
 
 xcopy %OSGEO4W_PKG_DIR%\apps\Python312\* %PACKAGE_DIR%\Python312 /S/V/F/I
@@ -172,6 +175,7 @@ xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -201,6 +205,8 @@ xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 mkdir %PACKAGE_DIR%\Python39
 
 xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
@@ -219,6 +225,7 @@ xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -261,6 +268,8 @@ xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
diff --git a/mswindows/Installer-Files/WinGRASS-README.url b/mswindows/Installer-Files/WinGRASS-README.url
index b799752030d..8e9c78a62c6 100644
--- a/mswindows/Installer-Files/WinGRASS-README.url
+++ b/mswindows/Installer-Files/WinGRASS-README.url
@@ -23,6 +23,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -98,6 +99,10 @@ URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
 URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
 =======
 >>>>>>> osgeo-main
+=======
+URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
+=======
+>>>>>>> osgeo-main
 URL=https://grass.osgeo.org/grass80/binary/mswindows/native/README.html
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -120,6 +125,7 @@ URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -245,6 +251,11 @@ URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
 URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 IDList=
 IconFile=https://grass.osgeo.org/images/favicon/favicon.ico
 IconIndex=1
diff --git a/mswindows/crosscompile.sh b/mswindows/crosscompile.sh
index 8abf8cd9042..457d44853b6 100755
--- a/mswindows/crosscompile.sh
+++ b/mswindows/crosscompile.sh
@@ -85,6 +85,7 @@ Usage: crosscompile.sh [OPTIONS]
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -159,6 +160,10 @@ Usage: crosscompile.sh [OPTIONS]
 =======
                              grassVV-x86_64-w64-mingw32-YYYYMMDD.zip
 =======
+>>>>>>> osgeo-main
+=======
+                             grassVV-x86_64-w64-mingw32-YYYYMMDD.zip
+=======
 >>>>>>> osgeo-main
                              grass80-x86_64-w64-mingw32-YYYYMMDD.zip
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -182,6 +187,7 @@ Usage: crosscompile.sh [OPTIONS]
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                              grassVV-x86_64-w64-mingw32-YYYYMMDD.zip
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -307,6 +313,11 @@ Usage: crosscompile.sh [OPTIONS]
                              grassVV-x86_64-w64-mingw32-YYYYMMDD.zip
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+                             grassVV-x86_64-w64-mingw32-YYYYMMDD.zip
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 EOT
 		exit
 		;;
@@ -611,6 +622,7 @@ if defined GRASS_PYTHON (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 	set GRASS_PYTHON=C:\Python39\python.exe
 
@@ -656,6 +668,8 @@ if defined GRASS_PYTHON (
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	set GRASS_PYTHON=C:\Python312\python.exe
 
@@ -681,6 +695,7 @@ if defined GRASS_PYTHON (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -709,6 +724,8 @@ if defined GRASS_PYTHON (
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	set GRASS_PYTHON=C:\Python39\python.exe
 
@@ -729,6 +746,7 @@ if defined GRASS_PYTHON (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -770,6 +788,8 @@ if defined GRASS_PYTHON (
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
 	if not exist "%GRASS_PYTHON%" (
@@ -812,6 +832,7 @@ rem for %%i in (%GRASS_PYTHON%) do set PYTHONHOME=%%~dpi
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -852,6 +873,8 @@ rem for %%i in (%GRASS_PYTHON%) do set PYTHONHOME=%%~dpi
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -869,6 +892,7 @@ rem for %%i in (%GRASS_PYTHON%) do set PYTHONHOME=%%~dpi
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -929,6 +953,8 @@ rem for %%i in (%GRASS_PYTHON%) do set PYTHONHOME=%%~dpi
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 rem If GRASS_SH is externally defined, that shell will be used; Otherwise,
 rem GISBASE\etc\sh.bat will be used if it exists; If not, cmd.exe will be used;
 rem This check is mainly for supporting BusyBox for Windows (busybox64.exe)
@@ -987,6 +1013,7 @@ if not exist "%GISBASE%\etc\fontcap" (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1040,6 +1067,9 @@ if not exist "%GISBASE%\etc\fontcap" (
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 "%GRASS_PYTHON%" "%GISBASE%\etc\grass80.py" %*
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -1061,6 +1091,7 @@ if not exist "%GISBASE%\etc\fontcap" (
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1162,6 +1193,10 @@ if not exist "%GISBASE%\etc\fontcap" (
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 if %ERRORLEVEL% geq 1 pause
 EOT
 unix2dos $dist/grass.bat
diff --git a/mswindows/env.bat b/mswindows/env.bat
index 655ade97f7c..0e2b836643b 100644
--- a/mswindows/env.bat
+++ b/mswindows/env.bat
@@ -20,6 +20,7 @@ set GRASS_PYTHON=%GISBASE%\extrabin\python3.exe
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 set PYTHONHOME=%GISBASE%\Python39
 =======
 <<<<<<< HEAD
@@ -62,6 +63,8 @@ set PYTHONHOME=%GISBASE%\Python39
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 set PYTHONHOME=%GISBASE%\Python312
 =======
 set PYTHONHOME=%GISBASE%\Python39
@@ -80,6 +83,7 @@ set PYTHONHOME=%GISBASE%\Python39
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 set PYTHONHOME=%GISBASE%\Python39
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -163,6 +167,11 @@ set PYTHONHOME=%GISBASE%\Python39
 set PYTHONHOME=%GISBASE%\Python39
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+set PYTHONHOME=%GISBASE%\Python39
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 set GRASS_PROJSHARE=%GISBASE%\share\proj
 
diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh
index d748b922673..95cdfec7fe6 100644
--- a/mswindows/osgeo4w/build_osgeo4w.sh
+++ b/mswindows/osgeo4w/build_osgeo4w.sh
@@ -35,6 +35,7 @@ export C_INCLUDE_PATH=".:${OSGEO4W_ROOT_MSYS}/include:${SRC}/dist.${ARCH}/includ
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
 =======
 <<<<<<< HEAD
@@ -77,6 +78,8 @@ export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python312
 =======
 export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
@@ -95,6 +98,7 @@ export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -178,6 +182,11 @@ export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
 export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 export ARCH=x86_64-w64-mingw32
 
 ./configure \
@@ -238,6 +247,7 @@ export ARCH=x86_64-w64-mingw32
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     --with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config
 =======
@@ -280,6 +290,8 @@ export ARCH=x86_64-w64-mingw32
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     --with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config \
     --without-pdal
@@ -300,6 +312,7 @@ export ARCH=x86_64-w64-mingw32
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     --with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -383,6 +396,11 @@ export ARCH=x86_64-w64-mingw32
     --with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+    --with-netcdf=${OSGEO4W_ROOT_MSYS}/bin/nc-config
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 make
 
diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
index 04615fce4b8..c9c6a11b83a 100755
--- a/mswindows/osgeo4w/package.sh
+++ b/mswindows/osgeo4w/package.sh
@@ -126,6 +126,7 @@ DLLS="
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 	/mingw64/bin/libexpat-1.dll
 =======
@@ -163,6 +164,8 @@ DLLS="
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	/mingw64/bin/libexpat-1.dll
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -183,6 +186,7 @@ DLLS="
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -233,6 +237,8 @@ DLLS="
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	/mingw64/bin/libfontconfig-1.dll
 	/mingw64/bin/libgfortran-5.dll
@@ -272,6 +278,7 @@ DLLS="
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 	/mingw64/bin/libomp.dll
 =======
@@ -309,6 +316,8 @@ DLLS="
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	/mingw64/bin/libomp.dll
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -329,6 +338,7 @@ DLLS="
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -379,6 +389,8 @@ DLLS="
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	/mingw64/bin/libquadmath-0.dll
 "
@@ -456,6 +468,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config
 =======
@@ -498,6 +511,8 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config \
 		--without-pdal
@@ -518,6 +533,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -600,6 +616,11 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 =======
 		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+		--with-liblas=$PWD/mswindows/osgeo4w/liblas-config
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
 	touch mswindows/osgeo4w/configure-stamp
diff --git a/mswindows/osgeo4w/postinstall.bat b/mswindows/osgeo4w/postinstall.bat
index 1e755b1c9d0..504d5c2bee8 100644
--- a/mswindows/osgeo4w/postinstall.bat
+++ b/mswindows/osgeo4w/postinstall.bat
@@ -41,6 +41,7 @@ rem run g.mkfontcap outside a GRASS session
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "%GISBASE%\bin\g.mkfontcap.exe" -o
 =======
 <<<<<<< HEAD
@@ -83,6 +84,8 @@ rem run g.mkfontcap outside a GRASS session
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 "%GISBASE%\bin\g.mkfontcap.exe" --overwrite
 =======
 "%GISBASE%\bin\g.mkfontcap.exe" -o
@@ -101,6 +104,7 @@ rem run g.mkfontcap outside a GRASS session
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 "%GISBASE%\bin\g.mkfontcap.exe" -o
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -184,5 +188,10 @@ rem run g.mkfontcap outside a GRASS session
 "%GISBASE%\bin\g.mkfontcap.exe" -o
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+"%GISBASE%\bin\g.mkfontcap.exe" -o
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 del "%BATCH%.tmpl
diff --git a/mswindows/osgeo4w/setup.hint.tmpl b/mswindows/osgeo4w/setup.hint.tmpl
index 4e3d7d675bf..350a4dc3380 100644
--- a/mswindows/osgeo4w/setup.hint.tmpl
+++ b/mswindows/osgeo4w/setup.hint.tmpl
@@ -18,6 +18,7 @@ category: Desktop
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal python3-matplotlib libtiff python3-wxpython python3-pillow python3-pip python3-ply python3-pyopengl python3-psycopg2-binary python3-six zstd python3-pywin32
 =======
 <<<<<<< HEAD
@@ -60,6 +61,8 @@ requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal python3-matplotlib libtiff python3-wxpython python3-pillow python3-pip python3-ply python3-pyopengl python3-psycopg2-binary zstd python3-pywin32
 =======
 requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal python3-matplotlib libtiff python3-wxpython python3-pillow python3-pip python3-ply python3-pyopengl python3-psycopg2-binary python3-six zstd python3-pywin32
@@ -78,6 +81,7 @@ requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal python3-matplotlib libtiff python3-wxpython python3-pillow python3-pip python3-ply python3-pyopengl python3-psycopg2-binary python3-six zstd python3-pywin32
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -161,6 +165,11 @@ requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal
 requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal python3-matplotlib libtiff python3-wxpython python3-pillow python3-pip python3-ply python3-pyopengl python3-psycopg2-binary python3-six zstd python3-pywin32
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal python3-matplotlib libtiff python3-wxpython python3-pillow python3-pip python3-ply python3-pyopengl python3-psycopg2-binary python3-six zstd python3-pywin32
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 maintainer: MartinLanda
 curr: @GRASS_VERSION_NUMBER@-1
 prev: @GRASS_VERSION_NUMBER@-1
diff --git a/ps/ps.map/do_geogrid.c b/ps/ps.map/do_geogrid.c
index c14f5ae63cd..8c77195d6fa 100644
--- a/ps/ps.map/do_geogrid.c
+++ b/ps/ps.map/do_geogrid.c
@@ -98,6 +98,7 @@ int do_geogrid(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -169,6 +170,10 @@ int do_geogrid(void)
 =======
     for (; g >= south; g -= grid) {
 =======
+>>>>>>> osgeo-main
+=======
+    for (; g >= south; g -= grid) {
+=======
 >>>>>>> osgeo-main
     for (j = 0; g >= south; j++, g -= grid) {
 <<<<<<< HEAD
@@ -192,6 +197,7 @@ int do_geogrid(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -220,6 +226,8 @@ int do_geogrid(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     for (j = 0; g >= south; j++, g -= grid) {
 =======
@@ -240,6 +248,7 @@ int do_geogrid(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -317,6 +326,8 @@ int do_geogrid(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (g == north || g == south)
             continue;
@@ -367,6 +378,7 @@ int do_geogrid(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -438,6 +450,10 @@ int do_geogrid(void)
 =======
     for (; g > west; g -= grid) {
 =======
+>>>>>>> osgeo-main
+=======
+    for (; g > west; g -= grid) {
+=======
 >>>>>>> osgeo-main
     for (j = 0; g > west; j++, g -= grid) {
 <<<<<<< HEAD
@@ -461,6 +477,7 @@ int do_geogrid(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -489,6 +506,8 @@ int do_geogrid(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     for (j = 0; g > west; j++, g -= grid) {
 =======
@@ -509,6 +528,7 @@ int do_geogrid(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -586,6 +606,8 @@ int do_geogrid(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (g == east || g == west)
             continue;
diff --git a/ps/ps.map/do_grid.c b/ps/ps.map/do_grid.c
index 6455e6aec29..ecbd380614b 100644
--- a/ps/ps.map/do_grid.c
+++ b/ps/ps.map/do_grid.c
@@ -110,6 +110,7 @@ int do_grid_cross(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -189,6 +190,11 @@ int do_grid_cross(void)
     for (; g_north >= PS.w.south; g_north -= PS.grid) {
         for (; g_east > PS.w.west; g_east -= PS.grid) {
 =======
+>>>>>>> osgeo-main
+=======
+    for (; g_north >= PS.w.south; g_north -= PS.grid) {
+        for (; g_east > PS.w.west; g_east -= PS.grid) {
+=======
 >>>>>>> osgeo-main
     for (j = 0; g_north >= PS.w.south; j++, g_north -= PS.grid) {
         for (k = 0; g_east > PS.w.west; k++, g_east -= PS.grid) {
@@ -222,6 +228,7 @@ int do_grid_cross(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -324,6 +331,8 @@ int do_grid_cross(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             if (g_north == PS.w.north || g_north == PS.w.south)
diff --git a/ps/ps.map/ps.map.html b/ps/ps.map/ps.map.html
index 9678f55c50e..3eaafb53aba 100644
--- a/ps/ps.map/ps.map.html
+++ b/ps/ps.map/ps.map.html
@@ -31,6 +31,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -101,6 +102,10 @@ 
    NOTES
    
 =======
 >>>>>>> osgeo-main
 =======
+
    NOTES
    
+=======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 
    NOTES
     
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -127,6 +132,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -217,6 +223,8 @@ 
    NOTES
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 The order of commands is generally unimportant but may affect how some layers
 are drawn. For example to plot vpoints above vareas list the
diff --git a/ps/ps.map/ps_clrtbl.c b/ps/ps.map/ps_clrtbl.c
index 692848bd6a0..29920476789 100644
--- a/ps/ps.map/ps_clrtbl.c
+++ b/ps/ps.map/ps_clrtbl.c
@@ -53,6 +53,7 @@ int PS_colortable(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -143,6 +144,11 @@ int PS_colortable(void)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     G_message(_("Creating color table for <%s in %s>..."), ct.name, ct.mapset);
 
diff --git a/ps/ps.map/ps_fclrtbl.c b/ps/ps.map/ps_fclrtbl.c
index 3d7101934aa..795bfecb317 100644
--- a/ps/ps.map/ps_fclrtbl.c
+++ b/ps/ps.map/ps_fclrtbl.c
@@ -63,6 +63,7 @@ int PS_fcolortable(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -153,6 +154,11 @@ int PS_fcolortable(void)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     G_message(_("Creating color table for <%s in %s>..."), ct.name, ct.mapset);
 
diff --git a/ps/ps.map/ps_outline.c b/ps/ps.map/ps_outline.c
index e6819946e4b..de4731d1add 100644
--- a/ps/ps.map/ps_outline.c
+++ b/ps/ps.map/ps_outline.c
@@ -59,6 +59,7 @@ int ps_outline(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -149,6 +150,11 @@ int ps_outline(void)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     G_message(_("Outlining areas in raster map <%s in %s> ..."), PS.cell_name,
               PS.cell_mapset);
diff --git a/ps/ps.map/r_text.c b/ps/ps.map/r_text.c
index c5c353016eb..ee8387f590e 100644
--- a/ps/ps.map/r_text.c
+++ b/ps/ps.map/r_text.c
@@ -41,6 +41,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -92,6 +93,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 extern char *get_color_name();
 extern int get_color_number();
 
@@ -111,6 +114,7 @@ extern int get_color_number();
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -133,6 +137,8 @@ extern int get_color_number();
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -152,6 +158,7 @@ extern int get_color_number();
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -181,6 +188,8 @@ extern int get_color_number();
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 extern char *get_color_name();
 extern int get_color_number();
 
@@ -201,6 +210,7 @@ extern int get_color_number();
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -267,6 +277,8 @@ extern int get_color_number();
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 static char *help[] = {"font        fontname",
                        "color       color",
                        "width       #",
diff --git a/ps/ps.map/scan_gis.c b/ps/ps.map/scan_gis.c
index 486e8404792..b66c9b1ada0 100644
--- a/ps/ps.map/scan_gis.c
+++ b/ps/ps.map/scan_gis.c
@@ -42,6 +42,7 @@ int scan_gis(char *element, char *desc, char *key, char *data, char *name,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -116,6 +117,10 @@ int scan_gis(char *element, char *desc, char *key, char *data, char *name,
 =======
             G_list_element(element, desc, mapset, NULL);
 =======
+>>>>>>> osgeo-main
+=======
+            G_list_element(element, desc, mapset, NULL);
+=======
 >>>>>>> osgeo-main
             G_list_element(element, desc, mapset, (int (*)())NULL);
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -139,6 +144,7 @@ int scan_gis(char *element, char *desc, char *key, char *data, char *name,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -167,6 +173,8 @@ int scan_gis(char *element, char *desc, char *key, char *data, char *name,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             G_list_element(element, desc, mapset, (int (*)())NULL);
 =======
@@ -187,6 +195,7 @@ int scan_gis(char *element, char *desc, char *key, char *data, char *name,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -270,6 +279,8 @@ int scan_gis(char *element, char *desc, char *key, char *data, char *name,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         reject();
         return 0;
diff --git a/ps/ps.map/scan_ref.c b/ps/ps.map/scan_ref.c
index f2feb8717c7..c3ca85e33f8 100644
--- a/ps/ps.map/scan_ref.c
+++ b/ps/ps.map/scan_ref.c
@@ -46,6 +46,7 @@ int scan_ref(char *buf, int *xref, int *yref)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -80,6 +81,8 @@ int scan_ref(char *buf, int *xref, int *yref)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         FALLTHROUGH;
 =======
@@ -100,6 +103,7 @@ int scan_ref(char *buf, int *xref, int *yref)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -150,6 +154,8 @@ int scan_ref(char *buf, int *xref, int *yref)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     case 1:
         lowercase(word1);
@@ -172,6 +178,7 @@ int scan_ref(char *buf, int *xref, int *yref)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -206,6 +213,8 @@ int scan_ref(char *buf, int *xref, int *yref)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         FALLTHROUGH;
 =======
@@ -226,6 +235,7 @@ int scan_ref(char *buf, int *xref, int *yref)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -276,6 +286,8 @@ int scan_ref(char *buf, int *xref, int *yref)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     default:
         return 0;
diff --git a/pyproject.toml b/pyproject.toml
index be7adf77f0e..c375780a152 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,6 +29,7 @@ line-length = 88
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 target-version = ['py37', 'py38', 'py39', 'py310']
@@ -87,6 +88,8 @@ target-version = ['py37', 'py38', 'py39', 'py310']
 =======
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
 =======
 =======
@@ -97,6 +100,9 @@ target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -121,6 +127,7 @@ extend-exclude = '''
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> e946d8e472 (Dockerfile: fix broken lib link (#1625))
 =======
@@ -150,6 +157,8 @@ extend-exclude = '''
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 target-version = ['py36', 'py37', 'py38', 'py39']
 =======
@@ -169,6 +178,7 @@ target-version = ['py37', 'py38', 'py39', 'py310']
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 target-version = ['py37', 'py38', 'py39', 'py310']
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -261,6 +271,11 @@ target-version = ['py37', 'py38', 'py39', 'py310']
 target-version = ['py37', 'py38', 'py39', 'py310']
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+target-version = ['py37', 'py38', 'py39', 'py310']
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 include = '\.pyi?$'
 exclude = '''
 (
@@ -299,6 +314,7 @@ exclude = '''
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
     | python/libgrass_interface_generator/
@@ -348,6 +364,8 @@ exclude = '''
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     | python/grass/ctypes/
     # Bug in Black related to r-string prefix capitalization reformats
@@ -371,6 +389,7 @@ exclude = '''
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -393,6 +412,8 @@ exclude = '''
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
@@ -413,6 +434,7 @@ exclude = '''
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     | python/libgrass_interface_generator/
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -520,6 +542,11 @@ exclude = '''
     | python/libgrass_interface_generator/
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+    | python/libgrass_interface_generator/
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 )
 '''
 
@@ -544,9 +571,7 @@ select = [
     "COM",    # flake8-commas (COM)
     "D",      # pydocstyle (D)
     "DTZ",    # flake8-datetimez (DTZ)
-    "E4",     # pycodestyle (E, W)
-    "E7",     # pycodestyle (E, W)
-    "E9",     # pycodestyle (E, W)
+    "E",      # pycodestyle (E, W)
     "F",      # Pyflakes (F)
     "FA",     # flake8-future-annotations (FA)
     "FBT",    # flake8-boolean-trap (FBT)
@@ -558,6 +583,7 @@ select = [
     "INT",    # flake8-gettext (INT)
     "ISC",    # flake8-implicit-str-concat (ISC)
     "LOG",    # flake8-logging (LOG)
+    "N",      # pep8-naming (N)
     "NPY",    # NumPy-specific rules (NPY)
     "PERF",   # Perflint (PERF)
     "PGH",    # pygrep-hooks (PGH)
@@ -649,8 +675,8 @@ ignore = [
     "DTZ006",  # call-datetime-fromtimestamp
     "DTZ007",  # call-datetime-strptime-without-zone
     "DTZ011",  # call-date-today
-    "E401",    # multiple-imports-on-one-line
     "E402",    # module-import-not-at-top-of-file
+    "E501",    # line-too-long
     "E721",    # type-comparison
     "E722",    # bare-except
     "E731",    # lambda-assignment
@@ -658,11 +684,14 @@ ignore = [
     "F401",    # unused-import
     "F403",    # undefined-local-with-import-star
     "F405",    # undefined-local-with-import-star-usage
+<<<<<<< HEAD
     "F601",    # multi-value-repeated-key-literal
 <<<<<<< HEAD
     "F632",    # is-literal
 =======
 >>>>>>> main
+=======
+>>>>>>> osgeo-main
     "F811",    # redefined-while-unused
     "F821",    # undefined-name
     "F822",    # undefined-export
@@ -697,6 +726,16 @@ ignore = [
 >>>>>>> osgeo-main
     "I001",    # unsorted-imports
     "ISC003",  # explicit-string-concatenation
+    "N801",    # invalid-class-name
+    "N802",    # invalid-function-name
+    "N803",    # invalid-argument-name
+    "N806",    # non-lowercase-variable-in-function
+    "N812",    # lowercase-imported-as-non-lowercase
+    "N814",    # camelcase-imported-as-constant
+    "N815",    # mixed-case-variable-in-class-scope
+    "N816",    # mixed-case-variable-in-global-scope
+    "N818",    # error-suffix-on-exception-name
+    "N999",    # invalid-module-name
     "PERF203", # try-except-in-loop
     "PERF401", # manual-list-comprehension
     "PERF402", # manual-list-copy
@@ -829,11 +868,14 @@ ignore = [
     "SIM116",  # if-else-block-instead-of-dict-lookup
     "SIM118",  # in-dict-keys
     "SIM223",  # expr-and-false
+<<<<<<< HEAD
 <<<<<<< HEAD
     "SIM300",  # yoda-conditions
 =======
 >>>>>>> main
     "SIM401",  # if-else-block-instead-of-dict-get
+=======
+>>>>>>> osgeo-main
     "SLF001",  # private-member-access
     "TRY002",  # raise-vanilla-class
     "TRY003",  # raise-vanilla-args
@@ -1047,7 +1089,7 @@ ignore = [
 "temporal/t.rast.algebra/testsu*/*_algebra_arithmetic.py" = ["FLY002"]
 "temporal/t.rast.colors/t.rast.colors.py" = ["SIM115"]
 "temporal/t.rast.series/t.rast.series.py" = ["SIM115"]
-"temporal/t.rast.what/t.rast.what.py" = ["SIM115"]
+"temporal/t.rast.what/t.rast.what.py" = ["E265", "E266", "SIM115"]
 "temporal/t.register/testsu*/*_raster_different_local.py" = ["FLY002"]
 "temporal/t.register/testsu*/*_raster_mapmetadata.py" = ["FLY002"]
 "temporal/t.register/testsuite/test_t_register_raster.py" = ["FLY002"]
@@ -1091,6 +1133,7 @@ timeout = 300
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1131,6 +1174,8 @@ timeout = 300
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 markers = [
     "slow: marks tests as slow (deselect with '-m \"not slow\"')",
     "needs_solo_run: marks tests that must be run without any other tests running in parallel",
@@ -1148,6 +1193,7 @@ markers = [
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
@@ -1208,6 +1254,11 @@ markers = [
 <<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+<<<<<<< HEAD
+>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 
 [tool.bandit]
@@ -1220,6 +1271,7 @@ markers = [
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1233,6 +1285,8 @@ markers = [
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 exclude_dirs = [
     "./testsuite",
     "*/tests/*",
@@ -1247,6 +1301,7 @@ skips = ["B324", "B110", "B101", "B112", "B311", "B404", "B603"]
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> main
 exclude_dirs = ["./testsuite", "*/tests/*", "*/testsuite/*", "utils/test_generate_last_commit_file.py"]
 <<<<<<< HEAD
@@ -1370,6 +1425,8 @@ skips = ["B324", "B110", "B101", "B112", "B311", "B404", "B603"]
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 exclude_dirs = ["./testsuite", "*/tests/*", "*/testsuite/*", "utils/test_generate_last_commit_file.py"]
 <<<<<<< HEAD
 skips = ["B324","B110", "B101", "B112", "B311", "B404", "B603"]
@@ -1388,6 +1445,7 @@ skips = ["B324","B110", "B101", "B112", "B311", "B404"]
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -1403,6 +1461,8 @@ skips = ["B324","B110", "B101", "B112", "B311", "B404"]
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1414,6 +1474,7 @@ skips = ["B324","B110", "B101", "B112", "B311", "B404"]
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -1427,3 +1488,5 @@ skips = ["B324","B110", "B101", "B112", "B311", "B404"]
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/python/.pylintrc b/python/.pylintrc
index b520293f43c..3efbe2706f3 100644
--- a/python/.pylintrc
+++ b/python/.pylintrc
@@ -101,6 +101,7 @@ confidence=
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 # disable everything first and then reenable specific checks. For example, if
 =======
 <<<<<<< HEAD
@@ -143,6 +144,8 @@ confidence=
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # disable everything first and then re-enable specific checks. For example, if
 =======
 # disable everything first and then reenable specific checks. For example, if
@@ -161,6 +164,7 @@ confidence=
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # disable everything first and then reenable specific checks. For example, if
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -244,6 +248,11 @@ confidence=
 # disable everything first and then reenable specific checks. For example, if
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+# disable everything first and then reenable specific checks. For example, if
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 # you want to run only the similarities checker, you can use "--disable=all
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
@@ -270,6 +279,7 @@ disable=raw-checker-failed,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         use-symbolic-message-instead
 =======
@@ -312,6 +322,8 @@ disable=raw-checker-failed,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         use-symbolic-message-instead,
         duplicate-code
@@ -332,6 +344,7 @@ disable=raw-checker-failed,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         use-symbolic-message-instead
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -415,6 +428,11 @@ disable=raw-checker-failed,
         use-symbolic-message-instead
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+        use-symbolic-message-instead
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -629,6 +647,7 @@ init-import=no
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
 =======
 <<<<<<< HEAD
@@ -671,6 +690,8 @@ redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 redefining-builtins-modules=past.builtins,future.builtins,builtins,io
 =======
 redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
@@ -689,6 +710,7 @@ redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -772,6 +794,11 @@ redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
 redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 
 [SIMILARITIES]
diff --git a/python/grass/.flake8 b/python/grass/.flake8
index 7ff7880d437..95881b88785 100644
--- a/python/grass/.flake8
+++ b/python/grass/.flake8
@@ -33,6 +33,7 @@ ignore =
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -116,6 +117,10 @@ ignore =
 =======
 >>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582))
+>>>>>>> osgeo-main
 =======
     E722, # do not use bare 'except'
 >>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
@@ -140,6 +145,7 @@ ignore =
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 95f198e1e0 (g.proj: fix reading input WKT (#1582))
 =======
@@ -197,6 +203,9 @@ ignore =
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 =======
     E722, # do not use bare 'except'
 >>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
@@ -215,6 +224,7 @@ ignore =
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582))
 <<<<<<< HEAD
@@ -320,6 +330,10 @@ ignore =
 =======
 >>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 7e7871fd90 (g.proj: fix reading input WKT (#1582))
+>>>>>>> osgeo-main
 
 per-file-ignores =
     # C wrappers call libgis.G_gisinit before importing other modules.
@@ -360,6 +374,7 @@ per-file-ignores =
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 398a3c2388 (g.proj: fix reading input WKT (#1582))
 =======
@@ -387,6 +402,8 @@ per-file-ignores =
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     temporal/abstract_map_dataset.py: E501
     temporal/abstract_space_time_dataset.py: W605, E501, F841, E722
@@ -419,6 +436,7 @@ per-file-ignores =
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -441,6 +459,8 @@ per-file-ignores =
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     temporal/temporal_raster_algebra.py: E741
     temporal/temporal_raster_base_algebra.py: E501, F841, E722
@@ -458,6 +478,7 @@ per-file-ignores =
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     temporal/*.py: E501, F841
     temporal/abstract_space_time_dataset.py: W605, E501, F841
@@ -527,6 +548,8 @@ per-file-ignores =
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # Current benchmarks/tests are changing sys.path before import.
     # Possibly, a different approach should be taken there anyway.
diff --git a/python/grass/Makefile b/python/grass/Makefile
index e585cecdfee..f888e78f86b 100644
--- a/python/grass/Makefile
+++ b/python/grass/Makefile
@@ -32,6 +32,7 @@ PYDIR = $(ETC)/python/grass
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -131,6 +132,10 @@ PYDIR = $(ETC)/python/grass
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 SUBDIRS = \
 	app \
 	benchmark \
@@ -150,6 +155,7 @@ SUBDIRS = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -186,6 +192,8 @@ SUBDIRS = \
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	experimental \
 =======
@@ -206,6 +214,7 @@ SUBDIRS = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -227,6 +236,8 @@ SUBDIRS = \
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	benchmark \
 	exceptions \
@@ -247,6 +258,7 @@ SUBDIRS = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -306,6 +318,8 @@ SUBDIRS = \
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	grassdb \
 	gunittest \
@@ -335,6 +349,7 @@ SUBDIRS = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -407,6 +422,10 @@ SUBDIRS = \
 =======
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 	semantic_label \
 	temporal \
@@ -429,6 +448,7 @@ SUBDIRS = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -468,6 +488,8 @@ SUBDIRS = \
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 SUBDIRS = app exceptions script ctypes grassdb temporal pygrass pydispatch imaging gunittest bandref jupyter
 >>>>>>> 584e61d06d (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 =======
@@ -488,6 +510,7 @@ SUBDIRS = app exceptions script ctypes grassdb temporal pygrass pydispatch imagi
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -511,6 +534,8 @@ SUBDIRS = app exceptions script ctypes grassdb temporal pygrass pydispatch imagi
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 SUBDIRS = app benchmark exceptions script ctypes grassdb temporal pygrass pydispatch imaging gunittest bandref jupyter
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
@@ -531,6 +556,7 @@ SUBDIRS = app benchmark exceptions script ctypes grassdb temporal pygrass pydisp
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -559,6 +585,8 @@ SUBDIRS = app benchmark exceptions script ctypes grassdb temporal pygrass pydisp
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 	semantic_label \
 	temporal \
@@ -578,6 +606,7 @@ SUBDIRS = app benchmark exceptions script ctypes grassdb temporal pygrass pydisp
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -653,6 +682,8 @@ SUBDIRS = app benchmark exceptions script ctypes grassdb temporal pygrass pydisp
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 default: $(PYDIR)/__init__.py
 	$(MAKE) subdirs
diff --git a/python/grass/__init__.py b/python/grass/__init__.py
index 46b4dbd2b32..142b2086721 100644
--- a/python/grass/__init__.py
+++ b/python/grass/__init__.py
@@ -30,6 +30,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 so that the function ``_`` appears in the global namespace (as an additional build-in).
 =======
 <<<<<<< HEAD
@@ -72,6 +73,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 so that the function ``_`` appears in the global namespace (as an additional built-in).
 =======
 so that the function ``_`` appears in the global namespace (as an additional build-in).
@@ -90,6 +93,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 so that the function ``_`` appears in the global namespace (as an additional build-in).
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -173,6 +177,11 @@
 so that the function ``_`` appears in the global namespace (as an additional build-in).
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+so that the function ``_`` appears in the global namespace (as an additional build-in).
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 """
 
 import builtins as _builtins
@@ -233,6 +242,7 @@ def _translate(text):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     the package does not require the translations to be availabe. However, a first
 =======
@@ -275,6 +285,8 @@ def _translate(text):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     the package does not require the translations to be available. However, a first
 =======
@@ -294,6 +306,7 @@ def _translate(text):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     the package does not require the translations to be availabe. However, a first
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -376,6 +389,11 @@ def _translate(text):
 =======
     the package does not require the translations to be availabe. However, a first
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    the package does not require the translations to be availabe. However, a first
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     call to translate a message will do the initialization first before translating
     the message.
diff --git a/python/grass/benchmark/Makefile b/python/grass/benchmark/Makefile
index 1394db87f5e..29e39763dc2 100644
--- a/python/grass/benchmark/Makefile
+++ b/python/grass/benchmark/Makefile
@@ -26,6 +26,7 @@ DSTDIR = $(ETC)/python/grass/benchmark
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -92,6 +93,10 @@ MODULES = app plots results runners __main__
 MODULES = app plots results runners __main__
 =======
 >>>>>>> osgeo-main
+=======
+MODULES = app plots results runners __main__
+=======
+>>>>>>> osgeo-main
 MODULES = plots results runners
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
@@ -114,6 +119,7 @@ MODULES = app plots results runners __main__
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -192,6 +198,8 @@ MODULES = app plots results runners __main__
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
 PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
diff --git a/python/grass/benchmark/__init__.py b/python/grass/benchmark/__init__.py
index 299daec0fbc..82a19f4c11a 100644
--- a/python/grass/benchmark/__init__.py
+++ b/python/grass/benchmark/__init__.py
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -58,6 +59,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -75,6 +78,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -129,6 +133,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # MODULE:    grass.benchmark
 #
 # AUTHOR(S): Vaclav Petras 
@@ -161,6 +167,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -202,6 +209,9 @@
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
@@ -219,6 +229,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -297,6 +308,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 """Benchmarking for GRASS GIS modules
 
 This subpackage of the grass package is experimental and the API can change anytime.
@@ -323,6 +336,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -362,6 +376,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -379,6 +395,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -433,6 +450,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 The functions in the Python API raise exceptions, although calls of other functions from
 the grass package may call grass.script.fatal and exit
@@ -460,6 +479,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -501,6 +521,9 @@
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
@@ -518,6 +541,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -596,6 +620,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 """
 
 from .plots import nprocs_plot, num_cells_plot
@@ -622,6 +648,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
     join_results_from_files,
@@ -682,6 +709,10 @@
     join_results_from_files,
 =======
 >>>>>>> osgeo-main
+=======
+    join_results_from_files,
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
     join_results_from_files,
@@ -701,6 +732,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -790,6 +822,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     load_results,
     load_results_from_file,
@@ -817,6 +851,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -883,6 +918,10 @@
 from .runners import benchmark_nprocs, benchmark_resolutions, benchmark_single
 =======
 >>>>>>> osgeo-main
+=======
+from .runners import benchmark_nprocs, benchmark_resolutions, benchmark_single
+=======
+>>>>>>> osgeo-main
 from .runners import benchmark_nprocs, benchmark_resolutions
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
@@ -905,6 +944,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -983,3 +1023,5 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/python/grass/benchmark/app.py b/python/grass/benchmark/app.py
index cd0aa03acbd..cc32e7daf9b 100644
--- a/python/grass/benchmark/app.py
+++ b/python/grass/benchmark/app.py
@@ -41,6 +41,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
     nprocs_plot,
@@ -101,6 +102,10 @@
     nprocs_plot,
 =======
 >>>>>>> osgeo-main
+=======
+    nprocs_plot,
+=======
+>>>>>>> osgeo-main
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
     nprocs_plot,
@@ -120,6 +125,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -209,6 +215,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     num_cells_plot,
     save_results_to_file,
@@ -244,6 +252,7 @@ class CliUsageError(ValueError):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -288,6 +297,8 @@ class CliUsageError(ValueError):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     pass
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
@@ -307,6 +318,7 @@ class CliUsageError(ValueError):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -390,6 +402,10 @@ class CliUsageError(ValueError):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 
 def join_results_cli(args):
@@ -420,6 +436,7 @@ def join_results_cli(args):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -459,6 +476,8 @@ def join_results_cli(args):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -476,6 +495,7 @@ def join_results_cli(args):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -529,6 +549,8 @@ def join_results_cli(args):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     def select_only(result):
@@ -555,6 +577,7 @@ def select_only(result):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -629,6 +652,10 @@ def select_only(result):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     results = join_results_from_files(
         source_filenames=args.results,
@@ -667,6 +694,7 @@ def plot_nprocs_cli(args):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -715,6 +743,9 @@ def plot_nprocs_cli(args):
 =======
 >>>>>>> osgeo-main
 =======
+=======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
     results = join_results_from_files(
         source_filenames=args.results,
@@ -756,6 +787,7 @@ def plot_nprocs_cli(args):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -888,6 +920,8 @@ def plot_nprocs_cli(args):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def plot_cells_cli(args):
     """Translate CLI parser result to API calls."""
     results = load_results_from_file(args.input)
@@ -983,6 +1017,7 @@ def add_results_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1022,6 +1057,8 @@ def add_results_subcommand(parent_subparsers):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1039,6 +1076,7 @@ def add_results_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1092,6 +1130,8 @@ def add_results_subcommand(parent_subparsers):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     join.add_argument(
         "--only",
@@ -1152,6 +1192,7 @@ def add_plot_title_argument(parser):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1219,6 +1260,8 @@ def add_plot_title_argument(parser):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def add_plot_metric_argument(parser):
     """Add metric argument to *parser*."""
     parser.add_argument(
@@ -1241,6 +1284,7 @@ def add_plot_metric_argument(parser):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1269,6 +1313,8 @@ def add_plot_metric_argument(parser):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 9f045df12f (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -1283,6 +1329,7 @@ def add_plot_metric_argument(parser):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1323,6 +1370,8 @@ def add_plot_metric_argument(parser):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     join.set_defaults(handler=join_results_cli)
 
@@ -1339,6 +1388,7 @@ def add_plot_metric_argument(parser):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ea17e86303 (libpython: Support benchmarks of non-parallel runs better (#1733))
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1394,6 +1444,8 @@ def add_plot_metric_argument(parser):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> ea17e86303 (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 =======
@@ -1409,6 +1461,7 @@ def add_plot_metric_argument(parser):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8c89098fcc (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 =======
@@ -1428,6 +1481,8 @@ def add_plot_metric_argument(parser):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
@@ -1439,6 +1494,7 @@ def add_plot_metric_argument(parser):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -1476,6 +1532,8 @@ def add_plot_metric_argument(parser):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def add_plot_subcommand(parent_subparsers):
     """Add plot subcommand."""
     main_parser = add_subcommand_parser(
@@ -1505,6 +1563,7 @@ def add_plot_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1604,6 +1663,11 @@ def add_plot_subcommand(parent_subparsers):
     add_plot_io_arguments(join)
     add_plot_title_argument(join)
 =======
+>>>>>>> osgeo-main
+=======
+    add_plot_io_arguments(join)
+    add_plot_title_argument(join)
+=======
 >>>>>>> osgeo-main
     join.add_argument("input", help="file with results (JSON)", metavar="input_file")
     join.add_argument(
@@ -1629,6 +1693,7 @@ def add_plot_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a4c9b5af1d (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -1657,6 +1722,8 @@ def add_plot_subcommand(parent_subparsers):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     add_plot_io_arguments(join)
     add_plot_title_argument(join)
@@ -1675,6 +1742,7 @@ def add_plot_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1703,6 +1771,8 @@ def add_plot_subcommand(parent_subparsers):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     add_plot_io_arguments(join)
     add_plot_title_argument(join)
@@ -1721,6 +1791,7 @@ def add_plot_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1768,6 +1839,8 @@ def add_plot_subcommand(parent_subparsers):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     join.add_argument(
         "--resolutions",
@@ -1797,6 +1870,7 @@ def add_plot_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1836,6 +1910,8 @@ def add_plot_subcommand(parent_subparsers):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1853,6 +1929,7 @@ def add_plot_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1906,6 +1983,8 @@ def add_plot_subcommand(parent_subparsers):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     nprocs = main_subparsers.add_parser(
         "nprocs", help="Plot for variable number of processing elements"
@@ -1935,6 +2014,7 @@ def add_plot_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1976,6 +2056,9 @@ def add_plot_subcommand(parent_subparsers):
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
@@ -1993,6 +2076,7 @@ def add_plot_subcommand(parent_subparsers):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2071,6 +2155,8 @@ def add_plot_subcommand(parent_subparsers):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 def define_arguments():
     """Define top level parser and create subparsers."""
diff --git a/python/grass/benchmark/plots.py b/python/grass/benchmark/plots.py
index f11908ac535..fb7f373ccbe 100644
--- a/python/grass/benchmark/plots.py
+++ b/python/grass/benchmark/plots.py
@@ -58,6 +58,7 @@ def get_pyplot(to_file):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -147,6 +148,13 @@ def nprocs_plot(results, filename=None, title=None, metric="time"):
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
+def nprocs_plot(results, filename=None, title=None, metric="time"):
+=======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 >>>>>>> 9f045df12f (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -160,6 +168,7 @@ def nprocs_plot(results, filename=None, title=None, metric="time"):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -190,6 +199,8 @@ def nprocs_plot(results, filename=None, title=None, metric="time"):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -206,6 +217,7 @@ def nprocs_plot(results, filename=None, title=None, metric="time"):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -283,6 +295,11 @@ def nprocs_plot(results, filename=None, title=None):
 >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
 def nprocs_plot(results, filename=None, title=None):
 >>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
+def nprocs_plot(results, filename=None, title=None):
+>>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
     """Plot results from a multiple nprocs (thread) benchmarks.
 
@@ -302,7 +319,10 @@ def nprocs_plot(results, filename=None, title=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
 =======
@@ -351,6 +371,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -475,6 +496,8 @@ def nprocs_plot(results, filename=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     One result is required to have attributes: *nprocs*, *times*, *label*.
     The *nprocs* attribute is a list of all processing elements
@@ -536,6 +559,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -575,6 +599,8 @@ def nprocs_plot(results, filename=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -592,6 +618,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -645,6 +672,8 @@ def nprocs_plot(results, filename=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # If there is not many x values, show ticks for each, but use default
     # ticks when there is a lot of x values.
@@ -671,6 +700,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -710,6 +740,8 @@ def nprocs_plot(results, filename=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -727,6 +759,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -780,6 +813,8 @@ def nprocs_plot(results, filename=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     else:
         from matplotlib.ticker import (  # pylint: disable=import-outside-toplevel
@@ -812,6 +847,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -850,6 +886,9 @@ def nprocs_plot(results, filename=None):
 =======
     elif metric in {"speedup", "efficiency"}:
 >>>>>>> osgeo-main
+=======
+    elif metric in {"speedup", "efficiency"}:
+>>>>>>> osgeo-main
 =======
 =======
 >>>>>>> dad8f82179 (wxpyimgview: explicit conversion to int (#2704))
@@ -862,6 +901,9 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -888,6 +930,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -945,6 +988,8 @@ def nprocs_plot(results, filename=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     axes.set(xticks=sorted(x_ticks))
     plt.xlabel("Number of cores (threads, processes)")
@@ -962,6 +1007,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1001,6 +1047,10 @@ def nprocs_plot(results, filename=None):
 >>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
+=======
+>>>>>>> osgeo-main
 =======
     plt.xlabel("Number of processing elements (cores, threads, processes)")
     plt.ylabel("Time [s]")
@@ -1020,6 +1070,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1137,6 +1188,9 @@ def nprocs_plot(results, filename=None):
 >>>>>>> 9f045df12f (wxGUI: fix layout flag assert in wms dialog (#1764))
 >>>>>>> osgeo-main
 =======
+>>>>>>> 9f045df12f (wxGUI: fix layout flag assert in wms dialog (#1764))
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
@@ -1151,6 +1205,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1192,6 +1247,8 @@ def nprocs_plot(results, filename=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if filename:
         plt.savefig(filename)
@@ -1220,6 +1277,7 @@ def nprocs_plot(results, filename=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1305,6 +1363,10 @@ def nprocs_plot(results, filename=None):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 def num_cells_plot(results, filename=None, title=None, show_resolution=False):
     """Plot results from a multiple raster grid size benchmarks.
 
@@ -1325,6 +1387,7 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1382,6 +1445,9 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 def num_cells_plot(results, filename=None, show_resolution=False):
     """Plot results from a multiple raster grid size benchmarks.
 
@@ -1401,6 +1467,7 @@ def num_cells_plot(results, filename=None, show_resolution=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 01a506d3d3 (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
@@ -1430,6 +1497,8 @@ def num_cells_plot(results, filename=None, show_resolution=False):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 def num_cells_plot(results, filename=None, title=None, show_resolution=False):
     """Plot results from a multiple raster grid size benchmarks.
 
@@ -1449,6 +1518,7 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1523,6 +1593,10 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     with one result being similar to the :func:`nprocs_plot` function.
     The result is required to have *times* and *label* attributes
@@ -1581,6 +1655,7 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1620,6 +1695,8 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1637,6 +1714,7 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1690,6 +1768,8 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if title:
         plt.title(title)
@@ -1717,6 +1797,7 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1758,6 +1839,9 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
@@ -1775,6 +1859,7 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1852,6 +1937,8 @@ def num_cells_plot(results, filename=None, title=None, show_resolution=False):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if filename:
         plt.savefig(filename)
diff --git a/python/grass/benchmark/results.py b/python/grass/benchmark/results.py
index d9d43c983f8..5cc34a9aae0 100644
--- a/python/grass/benchmark/results.py
+++ b/python/grass/benchmark/results.py
@@ -70,6 +70,7 @@ def save_results_to_file(results, filename):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -120,6 +121,8 @@ def save_results_to_file(results, filename):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     Path(filename).write_text(text, encoding="utf-8")
 =======
@@ -136,6 +139,9 @@ def save_results_to_file(results, filename):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -171,6 +177,7 @@ def save_results_to_file(results, filename):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -248,6 +255,8 @@ def save_results_to_file(results, filename):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         file.write(text)
 >>>>>>> 033a57360f (libpython: Save and load benchmark results (#1711))
@@ -288,6 +297,7 @@ def load_results_from_file(filename):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
     return load_results(Path(filename).read_text(encoding="utf-8"))
@@ -403,6 +413,13 @@ def load_results_from_file(filename):
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+    return load_results(Path(filename).read_text(encoding="utf-8"))
+=======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
@@ -414,6 +431,7 @@ def load_results_from_file(filename):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -430,6 +448,8 @@ def load_results_from_file(filename):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -440,6 +460,7 @@ def load_results_from_file(filename):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 >>>>>>> main
 =======
@@ -453,6 +474,8 @@ def load_results_from_file(filename):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     with open(filename, "r", encoding="utf-8") as file:
         return load_results(file.read())
@@ -476,6 +499,7 @@ def join_results(results, prefixes=None, select=None, prefixes_as_labels=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -532,6 +556,9 @@ def join_results(results, prefixes=None, select=None, prefixes_as_labels=False):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     with open(filename, "r") as file:
         return load_results(file.read())
@@ -552,6 +579,7 @@ def join_results(results, prefixes=None, select=None, prefixes_as_labels=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a4c9b5af1d (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -580,6 +608,8 @@ def join_results(results, prefixes=None, select=None, prefixes_as_labels=False):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def join_results(results, prefixes=None):
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
@@ -599,6 +629,7 @@ def join_results(results, prefixes=None, select=None, prefixes_as_labels=False):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -679,6 +710,10 @@ def join_results(results, prefixes=None):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     """Join multiple lists of results together
 
@@ -717,6 +752,7 @@ def join_results(results, prefixes=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -801,6 +837,10 @@ def join_results(results, prefixes=None):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             if select and not select(result):
                 continue
@@ -843,6 +883,7 @@ def join_results_from_files(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -890,6 +931,9 @@ def join_results_from_files(
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 =======
             if select and not select(result):
                 continue
@@ -941,6 +985,7 @@ def join_results_from_files(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1109,3 +1154,5 @@ def join_results_from_files(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/python/grass/benchmark/runners.py b/python/grass/benchmark/runners.py
index 371cb60dca3..89281456d83 100644
--- a/python/grass/benchmark/runners.py
+++ b/python/grass/benchmark/runners.py
@@ -35,6 +35,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 import random
@@ -95,6 +96,10 @@
 import random
 =======
 >>>>>>> osgeo-main
+=======
+import random
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
 import random
@@ -114,6 +119,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -204,6 +210,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 import shutil
 from types import SimpleNamespace
 
@@ -231,6 +239,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 def benchmark_single(module, label, repeat=5):
@@ -283,6 +292,8 @@ def benchmark_single(module, label, repeat=5):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def benchmark_single(module, label, repeat=5):
     """Benchmark module as is without changing anything.
 =======
@@ -303,6 +314,7 @@ def benchmark_single(module, label, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -332,6 +344,8 @@ def benchmark_single(module, label, repeat=5):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 def benchmark_single(module, label, repeat=5):
     """Benchmark module as is without chaning anything.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -349,6 +363,7 @@ def benchmark_single(module, label, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -390,6 +405,8 @@ def benchmark_single(module, label, repeat=5):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     *module* is an instance of PyGRASS Module class or any object which
@@ -457,6 +474,7 @@ def benchmark_single(module, label, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -496,6 +514,8 @@ def benchmark_single(module, label, repeat=5):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -513,6 +533,7 @@ def benchmark_single(module, label, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -567,6 +588,8 @@ def benchmark_single(module, label, repeat=5):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def benchmark_nprocs(module, label, max_nprocs, repeat=5, shuffle=True):
     """Benchmark module using values of nprocs up to *max_nprocs*.
 
@@ -603,6 +626,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5, shuffle=True):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -650,6 +674,9 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5, shuffle=True):
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 def benchmark_nprocs(module, label, max_nprocs, repeat):
 =======
 def benchmark_nprocs(module, label, max_nprocs, repeat=5):
@@ -686,6 +713,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -805,6 +833,8 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     *label* is a text to add to the result (for user-facing display).
@@ -832,6 +862,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -916,6 +947,10 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     *all_times* (list of lists of measured execution times),
     *efficiency* (parallel efficiency), *nprocs* (list of *nprocs* values used),
@@ -961,6 +996,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1089,6 +1125,11 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
         result.times.append(avg)
         result.all_times.append(times[nprocs])
 =======
+>>>>>>> osgeo-main
+=======
+        result.times.append(avg)
+        result.all_times.append(times[nprocs])
+=======
 >>>>>>> osgeo-main
         avg_times.append(avg)
         all_times.append(times[nprocs])
@@ -1146,6 +1187,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
 =======
@@ -1179,6 +1221,8 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
         all_times.append(times[nprocs])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1193,6 +1237,9 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1226,6 +1273,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -1382,6 +1430,8 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if nprocs == 1:
             serial_avg = avg
@@ -1409,6 +1459,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1491,6 +1542,11 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
         result.efficiency.append(serial_avg / (nprocs * avg))
 =======
 >>>>>>> osgeo-main
+=======
+        result.speedup.append(serial_avg / avg)
+        result.efficiency.append(serial_avg / (nprocs * avg))
+=======
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
@@ -1513,6 +1569,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
 >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
@@ -1598,6 +1655,8 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     print("\u2500" * term_size.columns)
@@ -1618,6 +1677,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1656,6 +1716,9 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         print(f"\nResult - {avg}s")
 
@@ -1681,6 +1744,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1792,6 +1856,13 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 =======
     print(f"Best average time - {min_avg}s ({min_time} threads)\n")
 
+<<<<<<< HEAD
+    return result
+=======
+>>>>>>> osgeo-main
+=======
+    print(f"Best average time - {min_avg}s ({min_time} threads)\n")
+
 <<<<<<< HEAD
     return result
 =======
@@ -1815,6 +1886,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
         efficiency=efficiency,
@@ -1870,6 +1942,10 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
         efficiency=efficiency,
 =======
 >>>>>>> osgeo-main
+=======
+        efficiency=efficiency,
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
         efficiency=efficiency,
@@ -1888,6 +1964,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1995,6 +2072,8 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         nprocs=nprocs_list,
         label=label,
@@ -2010,6 +2089,7 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2044,6 +2124,8 @@ def benchmark_nprocs(module, label, max_nprocs, repeat=5):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
@@ -2070,6 +2152,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2109,6 +2192,8 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 392c6e8e0b (pygrass: Add update parameters method to Module (#1712))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2126,6 +2211,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2179,6 +2265,8 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     *module* is an instance of PyGRASS Module class or any object
     with attributes as specified in :func:`benchmark_nprocs`
@@ -2204,6 +2292,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2244,6 +2333,9 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     *module* is an instance of PyGRASS Module class.
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -2263,6 +2355,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2346,6 +2439,8 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     *resolutions* is a list of resolutions to set (current region is currently
     used and changed but that may change in the future).
@@ -2374,6 +2469,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2453,6 +2549,11 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
     Optional *nprocs* is passed to the module if present
     (the called module does not have to support nprocs parameter).
 =======
+>>>>>>> osgeo-main
+=======
+    Optional *nprocs* is passed to the module if present
+    (the called module does not have to support nprocs parameter).
+=======
 >>>>>>> osgeo-main
     Optional *nprocs* is passed to the module if present.
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -2478,6 +2579,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2559,6 +2661,8 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     Returns an object with attributes *times* (list of average execution times),
@@ -2588,6 +2692,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2627,6 +2732,8 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2644,6 +2751,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2697,6 +2805,8 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if hasattr(module, "get_bash"):
         print(module.get_bash())
@@ -2722,6 +2832,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2762,6 +2873,9 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     print(module.get_bash())
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -2781,6 +2895,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2864,6 +2979,8 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     avg_times = []
@@ -2900,6 +3017,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2965,6 +3083,10 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
                 module.update(nprocs=nprocs)
 =======
+>>>>>>> osgeo-main
+=======
+                module.update(nprocs=nprocs)
+=======
 >>>>>>> osgeo-main
                 module(nprocs=nprocs)
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -2988,6 +3110,7 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3065,6 +3188,8 @@ def benchmark_resolutions(module, resolutions, label, repeat=5, nprocs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             module.run()
             print(f"{module.time}s")
diff --git a/python/grass/benchmark/testsuite/test_benchmark.py b/python/grass/benchmark/testsuite/test_benchmark.py
index ad6d3c87650..d75f3804de5 100644
--- a/python/grass/benchmark/testsuite/test_benchmark.py
+++ b/python/grass/benchmark/testsuite/test_benchmark.py
@@ -40,6 +40,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -203,6 +204,20 @@
     benchmark_single,
 =======
 >>>>>>> osgeo-main
+=======
+    benchmark_nprocs,
+=======
+<<<<<<< HEAD
+>>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
+=======
+<<<<<<< HEAD
+>>>>>>> ea17e86303 (libpython: Support benchmarks of non-parallel runs better (#1733))
+=======
+<<<<<<< HEAD
+>>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
+    benchmark_single,
+=======
+>>>>>>> osgeo-main
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
     benchmark_single,
@@ -222,6 +237,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -341,6 +357,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     join_results,
     load_results,
@@ -407,6 +425,7 @@ def test_resolutions(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -446,6 +465,8 @@ def test_resolutions(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -463,6 +484,7 @@ def test_resolutions(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -516,6 +538,8 @@ def test_resolutions(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     def test_single(self):
         """Test that single benchmark function runs"""
@@ -561,6 +585,7 @@ def test_single(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -624,6 +649,8 @@ def test_single(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     def test_nprocs(self):
         """Test that benchmark function runs for nprocs"""
@@ -663,6 +690,7 @@ def test_nprocs(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -695,6 +723,8 @@ def test_nprocs(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 >>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
@@ -711,6 +741,7 @@ def test_nprocs(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 923408bf7e (libpython: Save and load benchmark results (#1711))
 =======
 =======
@@ -734,6 +765,8 @@ def test_nprocs(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -753,6 +786,7 @@ def test_nprocs(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 01a506d3d3 (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 =======
@@ -776,6 +810,8 @@ def test_nprocs(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
@@ -789,6 +825,7 @@ def test_nprocs(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -852,6 +889,8 @@ def test_nprocs(self):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 class TestBenchmarkResults(TestCase):
     """Tests that saving results work"""
diff --git a/python/grass/benchmark/testsuite/test_benchmark_cli.py b/python/grass/benchmark/testsuite/test_benchmark_cli.py
index 4bddd828790..9175dce7ea1 100644
--- a/python/grass/benchmark/testsuite/test_benchmark_cli.py
+++ b/python/grass/benchmark/testsuite/test_benchmark_cli.py
@@ -33,6 +33,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -118,6 +119,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 import sys
 from pathlib import Path
 from subprocess import DEVNULL
@@ -144,6 +149,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -201,6 +207,9 @@
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 from pathlib import Path
 from subprocess import DEVNULL
 
@@ -220,6 +229,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a4c9b5af1d (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
@@ -249,6 +259,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 import sys
 from pathlib import Path
 from subprocess import DEVNULL
@@ -274,6 +286,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -349,6 +362,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 from grass.benchmark.app import main as benchmark_main
 from grass.gunittest.case import TestCase
 from grass.gunittest.main import test
@@ -376,6 +393,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -415,6 +433,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -432,6 +452,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -486,6 +507,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def remove_file(path):
     """Remove filename if exists"""
     if sys.version_info < (3, 8):
@@ -513,6 +536,7 @@ def remove_file(path):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -588,6 +612,10 @@ def remove_file(path):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 class TestBenchmarkCLI(TestCase):
     """Tests that benchmarkin CLI works"""
 
@@ -646,6 +674,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -694,6 +723,9 @@ def test_plot_cells_workflow(self):
 =======
 >>>>>>> osgeo-main
 =======
+=======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 class TestBenchmarkCLI(TestCase):
     """Tests that benchmarkin CLI works"""
@@ -741,6 +773,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 =======
@@ -894,6 +927,8 @@ def test_plot_cells_workflow(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         json_filename = "plot_test.json"
         png_filename = "plot_test.png"
@@ -914,6 +949,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -937,6 +973,8 @@ def test_plot_cells_workflow(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -954,6 +992,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1007,6 +1046,8 @@ def test_plot_cells_workflow(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         # The benchmark part has only Python API, not CLI.
         result = benchmark_resolutions(
@@ -1036,6 +1077,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1120,6 +1162,10 @@ def test_plot_cells_workflow(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         save_results_to_file([result], self.json_filename)
         benchmark_main(["plot", "cells", self.json_filename, self.png_filenames[0]])
@@ -1146,6 +1192,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1178,6 +1225,8 @@ def test_plot_cells_workflow(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.assertTrue(Path(self.png_filenames[-1]).is_file())
 =======
@@ -1193,6 +1242,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
         save_results_to_file([result], json_filename)
         benchmark_main(["plot", "cells", json_filename, png_filename])
@@ -1247,6 +1297,8 @@ def test_plot_cells_workflow(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         save_results_to_file([result], json_filename)
         benchmark_main(["plot", "cells", json_filename, png_filename])
@@ -1274,6 +1326,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 01a506d3d3 (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 =======
@@ -1307,6 +1360,8 @@ def test_plot_cells_workflow(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
         self.assertTrue(Path(self.png_filename2).is_file())
 >>>>>>> 953489b535 (wxGUI: fix layout flag assert in wms dialog (#1764))
@@ -1321,6 +1376,9 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -1354,6 +1412,7 @@ def test_plot_cells_workflow(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -1454,6 +1513,8 @@ def test_plot_cells_workflow(self):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 if __name__ == "__main__":
diff --git a/python/grass/docs/conf.py b/python/grass/docs/conf.py
index 2e8f91b4d82..a0aff2620e6 100644
--- a/python/grass/docs/conf.py
+++ b/python/grass/docs/conf.py
@@ -152,6 +152,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 copyright = "2023, GRASS Development Team"
@@ -211,6 +212,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 copyright = "2024, GRASS Development Team"
 =======
 copyright = "2022, GRASS Development Team"
@@ -230,6 +233,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -253,6 +257,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 copyright = "2022, GRASS Development Team"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -272,6 +278,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 copyright = "2023, GRASS Development Team"
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -376,6 +383,11 @@
 copyright = "2023, GRASS Development Team"
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+copyright = "2023, GRASS Development Team"
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -634,6 +646,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 epub_copyright = "2023, GRASS Development Team"
@@ -678,6 +691,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 epub_copyright = "2022, GRASS Development Team"
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -700,6 +715,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 epub_copyright = "2023, GRASS Development Team"
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -813,6 +829,11 @@
 epub_copyright = "2023, GRASS Development Team"
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+epub_copyright = "2023, GRASS Development Team"
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 
 # The basename for the epub file. It defaults to the project name.
 # epub_basename = u'wxGUI'
diff --git a/python/grass/docs/src/gunittest_running_tests.rst b/python/grass/docs/src/gunittest_running_tests.rst
index b6a756c720b..d0825c54063 100644
--- a/python/grass/docs/src/gunittest_running_tests.rst
+++ b/python/grass/docs/src/gunittest_running_tests.rst
@@ -116,6 +116,7 @@ you would use::
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         raster/r.contour/testsuite/testrc.py
 =======
@@ -158,6 +159,8 @@ you would use::
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         raster/r.contour/testsuite/test_broken.py
 =======
@@ -177,6 +180,7 @@ you would use::
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         raster/r.contour/testsuite/testrc.py
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
@@ -260,6 +264,11 @@ you would use::
         raster/r.contour/testsuite/testrc.py
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
+=======
+=======
+        raster/r.contour/testsuite/testrc.py
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
 
 
 Running tests and creating report
diff --git a/python/grass/docs/src/pygrass_gis.rst b/python/grass/docs/src/pygrass_gis.rst
index 6c884f649fe..1077b084654 100644
--- a/python/grass/docs/src/pygrass_gis.rst
+++ b/python/grass/docs/src/pygrass_gis.rst
@@ -38,6 +38,7 @@ GIS 7 User's Manual: GRASS GIS Quickstart
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -113,6 +114,10 @@ GIS 7 User's Manual: GRASS GIS Quickstart
 `_.
 =======
 >>>>>>> osgeo-main
+=======
+`_.
+=======
+>>>>>>> osgeo-main
 `_.
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -135,6 +140,7 @@ GIS 7 User's Manual: GRASS GIS Quickstart
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 `_.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -260,6 +266,11 @@ GIS 7 User's Manual: GRASS GIS Quickstart
 `_.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+`_.
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 .. _Region-label:
 
diff --git a/python/grass/exceptions/__init__.py b/python/grass/exceptions/__init__.py
index 91e65cc104f..cfbf3a7c8e1 100644
--- a/python/grass/exceptions/__init__.py
+++ b/python/grass/exceptions/__init__.py
@@ -91,6 +91,7 @@ def __init__(self, module, code, returncode, errors=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -181,6 +182,11 @@ def __init__(self, module, code, returncode, errors=None):
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
 =======
 >>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
 >>>>>>> osgeo-main
         if not module or module in code:
             # No need to include module name if it is directly in code
diff --git a/python/grass/grassdb/checks.py b/python/grass/grassdb/checks.py
index 957d92131fc..ced2ef4ee0d 100644
--- a/python/grass/grassdb/checks.py
+++ b/python/grass/grassdb/checks.py
@@ -94,6 +94,7 @@ def is_location_valid(path, location=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -159,6 +160,10 @@ def is_location_valid(path, location=None):
 =======
     :param path: Path to a Location or to a GRASS GIS database directory
 =======
+>>>>>>> osgeo-main
+=======
+    :param path: Path to a Location or to a GRASS GIS database directory
+=======
 >>>>>>> osgeo-main
     :param database: Path to a Location or to a GRASS GIS database directory
 >>>>>>> 6d691c8cd4 (wxGUI/splashscreen: use standard one, try to show it before main app, increase timeout (#1718))
@@ -182,6 +187,7 @@ def is_location_valid(path, location=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -259,6 +265,8 @@ def is_location_valid(path, location=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     :param location: name of a Location if not part of *path*
     """
@@ -288,6 +296,7 @@ def is_location_valid(path, location=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -353,6 +362,10 @@ def is_location_valid(path, location=None):
 =======
         path = os.path.join(path, location)
 =======
+>>>>>>> osgeo-main
+=======
+        path = os.path.join(path, location)
+=======
 >>>>>>> osgeo-main
         path = os.path.join(location)
 >>>>>>> 6d691c8cd4 (wxGUI/splashscreen: use standard one, try to show it before main app, increase timeout (#1718))
@@ -376,6 +389,7 @@ def is_location_valid(path, location=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -453,6 +467,8 @@ def is_location_valid(path, location=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     return os.access(os.path.join(path, "PERMANENT", "DEFAULT_WIND"), os.F_OK)
 
diff --git a/python/grass/grassdb/manage.py b/python/grass/grassdb/manage.py
index cfe0625d8d6..315c8b137be 100644
--- a/python/grass/grassdb/manage.py
+++ b/python/grass/grassdb/manage.py
@@ -135,6 +135,7 @@ def split_mapset_path(mapset_path):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 def resolve_mapset_path(path, location=None, mapset=None):
 =======
 <<<<<<< HEAD
@@ -177,6 +178,8 @@ def resolve_mapset_path(path, location=None, mapset=None):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def resolve_mapset_path(path, location=None, mapset=None) -> MapsetPath:
 =======
 def resolve_mapset_path(path, location=None, mapset=None):
@@ -195,6 +198,7 @@ def resolve_mapset_path(path, location=None, mapset=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 def resolve_mapset_path(path, location=None, mapset=None):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -277,6 +281,11 @@ def resolve_mapset_path(path, location=None, mapset=None):
 =======
 def resolve_mapset_path(path, location=None, mapset=None):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+def resolve_mapset_path(path, location=None, mapset=None):
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     """Resolve full path to mapset from given combination of parameters.
 
diff --git a/python/grass/gunittest/README.md b/python/grass/gunittest/README.md
index c1779cc0ca9..b5241ad79f7 100644
--- a/python/grass/gunittest/README.md
+++ b/python/grass/gunittest/README.md
@@ -26,6 +26,7 @@ For more information on the test suite and unit tests, visit:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -101,6 +102,10 @@ For more information on the test suite and unit tests, visit:
 
 =======
 >>>>>>> osgeo-main
+=======
+
+=======
+>>>>>>> osgeo-main
 https://grass.osgeo.org/grass80/manuals/libpython/gunittest_testing.html
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -123,6 +128,7 @@ https://grass.osgeo.org/grass80/manuals/libpython/gunittest_testing.html
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -248,3 +254,8 @@ https://grass.osgeo.org/grass80/manuals/libpython/gunittest_testing.html
 
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/python/grass/gunittest/invoker.py b/python/grass/gunittest/invoker.py
index 509c8fa029c..c12ddc27520 100644
--- a/python/grass/gunittest/invoker.py
+++ b/python/grass/gunittest/invoker.py
@@ -157,6 +157,7 @@ def _create_mapset(self, gisdbase, location, module):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -247,6 +248,11 @@ def _create_mapset(self, gisdbase, location, module):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         shutil.copy(
             os.path.join(gisdbase, location, "PERMANENT", "DEFAULT_WIND"),
@@ -343,6 +349,7 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -389,6 +396,8 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -406,6 +415,7 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 57aff3a06a (pythonlib: Remove star imports (#1546))
 <<<<<<< HEAD
@@ -492,6 +502,10 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 =======
 =======
 >>>>>>> 57aff3a06a (pythonlib: Remove star imports (#1546))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 57aff3a06a (pythonlib: Remove star imports (#1546))
 >>>>>>> osgeo-main
             stdout = p.stdout
             stderr = p.stderr
@@ -521,6 +535,7 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 stderr = f"Process has timed out in {timeout}s and produced no error output.\n"
 =======
@@ -563,6 +578,8 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 stderr = (
                     f"Process has timed out in {timeout}s and produced no error "
@@ -585,6 +602,7 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                 stderr = f"Process has timed out in {timeout}s and produced no error output.\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -667,6 +685,11 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 =======
                 stderr = f"Process has timed out in {timeout}s and produced no error output.\n"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                stderr = f"Process has timed out in {timeout}s and produced no error output.\n"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             # Return code is None if the process times out.
             # Rest of the code expects success to evaluate as False.
@@ -692,6 +715,7 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -800,6 +824,13 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
         encodings = [_get_encoding(), "utf8", "latin-1", "ascii"]
 
+=======
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+        encodings = [_get_encoding(), "utf8", "latin-1", "ascii"]
+
 =======
 >>>>>>> osgeo-main
         stdout, stderr = p.communicate()
@@ -829,6 +860,7 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -915,6 +947,8 @@ def _run_test_module(self, module, results_dir, gisdbase, location, timeout):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         def try_decode(data, encodings):
             """Try to decode data (bytes) using one of encodings
@@ -951,6 +985,7 @@ def try_decode(data, encodings):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1034,6 +1069,10 @@ def try_decode(data, encodings):
 =======
                     return decode(data, encoding=encoding)
 =======
+>>>>>>> osgeo-main
+=======
+                    return decode(data, encoding=encoding)
+=======
 >>>>>>> osgeo-main
                     return decode(stdout, encoding=encoding)
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -1058,6 +1097,7 @@ def try_decode(data, encodings):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1080,6 +1120,8 @@ def try_decode(data, encodings):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                     return decode(data, encoding=encoding)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1103,6 +1145,7 @@ def try_decode(data, encodings):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1201,6 +1244,8 @@ def try_decode(data, encodings):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 except UnicodeError:
                     pass
@@ -1213,7 +1258,7 @@ def try_decode(data, encodings):
 
         Path(stdout_path).write_text(stdout)
         with open(stderr_path, "w") as stderr_file:
-            if type(stderr) == "bytes":
+            if isinstance(stderr, bytes):
                 stderr_file.write(decode(stderr))
             elif isinstance(stderr, str):
                 stderr_file.write(stderr)
diff --git a/python/grass/gunittest/main.py b/python/grass/gunittest/main.py
index a9a02df46f7..ebb1b752512 100644
--- a/python/grass/gunittest/main.py
+++ b/python/grass/gunittest/main.py
@@ -154,6 +154,7 @@ def discovery():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -194,6 +195,8 @@ def discovery():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -211,6 +214,7 @@ def discovery():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -271,6 +275,8 @@ def discovery():
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def get_config(start_directory, config_file):
     """Read configuration if available, return empty section proxy if not
 
@@ -296,6 +302,7 @@ def get_config(start_directory, config_file):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -338,6 +345,8 @@ def get_config(start_directory, config_file):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     config_parser = configparser.ConfigParser()
     if config_file:
@@ -368,6 +377,7 @@ def get_config(start_directory, config_file):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -397,6 +407,8 @@ def get_config(start_directory, config_file):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 def get_config(start_directory):
@@ -447,6 +459,7 @@ def get_config(start_directory):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -624,6 +637,8 @@ def get_config(start_directory):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 def main():
@@ -706,6 +721,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -743,6 +759,8 @@ def main():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -762,6 +780,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -812,6 +831,8 @@ def main():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         return f"GISDBASE (grassdata directory) <{gisdbase}> does not exist\n"
     if not os.path.exists(os.path.join(gisdbase, location)):
@@ -849,6 +870,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -889,6 +911,8 @@ def main():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -906,6 +930,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -965,6 +990,8 @@ def main():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     try:
         config = get_config(start_directory=start_dir, config_file=args.config)
@@ -990,6 +1017,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1042,6 +1070,9 @@ def main():
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     config = get_config(start_dir)
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
@@ -1064,6 +1095,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1164,6 +1196,10 @@ def main():
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     invoker = GrassTestFilesInvoker(
diff --git a/python/grass/gunittest/multirunner.py b/python/grass/gunittest/multirunner.py
index 5a5e2c8d875..fde8c867ecf 100644
--- a/python/grass/gunittest/multirunner.py
+++ b/python/grass/gunittest/multirunner.py
@@ -128,6 +128,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -233,6 +234,8 @@ def main():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     grass_executable = args.grassbin
 
@@ -256,6 +259,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -287,6 +291,8 @@ def main():
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     # grass8bin = 'C:\Program Files (x86)\GRASS GIS 8.0.git\grass.bat'
     grass8bin = args.grassbin  # TODO: can be used if pressent
@@ -304,6 +310,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -327,6 +334,8 @@ def main():
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     # grass8bin = 'C:\Program Files (x86)\GRASS GIS 8.0.git\grass.bat'
     grass8bin = args.grassbin  # TODO: can be used if pressent
@@ -343,6 +352,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -370,6 +380,8 @@ def main():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # query GRASS GIS 8 itself for its GISBASE
     # we assume that GRASS GIS' start script is available and in the PATH
@@ -388,6 +400,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -411,6 +424,8 @@ def main():
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -425,6 +440,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -446,6 +462,8 @@ def main():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     grass_executable = args.grassbin
 
@@ -466,6 +484,9 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -512,6 +533,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -582,6 +604,8 @@ def main():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     p = subprocess.Popen(
         startcmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
@@ -613,6 +637,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -687,6 +712,10 @@ def main():
 =======
             "ERROR: Cannot find GRASS GIS start script (%s):\n%s" % (startcmd, err),
 =======
+>>>>>>> osgeo-main
+=======
+            "ERROR: Cannot find GRASS GIS start script (%s):\n%s" % (startcmd, err),
+=======
 >>>>>>> osgeo-main
             "ERROR: Cannot find GRASS GIS 8 start script (%s):\n%s" % (startcmd, err),
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -710,6 +739,7 @@ def main():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             "ERROR: Cannot find GRASS GIS start script (%s):\n%s" % (startcmd, err),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -834,6 +864,11 @@ def main():
 =======
             "ERROR: Cannot find GRASS GIS start script (%s):\n%s" % (startcmd, err),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            "ERROR: Cannot find GRASS GIS start script (%s):\n%s" % (startcmd, err),
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             file=sys.stderr,
         )
diff --git a/python/grass/gunittest/reporters.py b/python/grass/gunittest/reporters.py
index ffd20a4bdc6..73298ced183 100644
--- a/python/grass/gunittest/reporters.py
+++ b/python/grass/gunittest/reporters.py
@@ -666,6 +666,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(GrassTestFilesHtmlReporter, self).end_file_test(
 =======
@@ -708,6 +709,8 @@ def end_file_test(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         super().end_file_test(
 =======
@@ -727,6 +730,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         super(GrassTestFilesHtmlReporter, self).end_file_test(
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -809,6 +813,11 @@ def end_file_test(
 =======
         super(GrassTestFilesHtmlReporter, self).end_file_test(
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        super(GrassTestFilesHtmlReporter, self).end_file_test(
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             module=module,
             cwd=cwd,
@@ -1080,6 +1089,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(GrassTestFilesKeyValueReporter, self).end_file_test(
 =======
@@ -1122,6 +1132,8 @@ def end_file_test(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         super().end_file_test(
 =======
@@ -1141,6 +1153,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         super(GrassTestFilesKeyValueReporter, self).end_file_test(
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1223,6 +1236,11 @@ def end_file_test(
 =======
         super(GrassTestFilesKeyValueReporter, self).end_file_test(
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        super(GrassTestFilesKeyValueReporter, self).end_file_test(
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             module=module,
             cwd=cwd,
@@ -1334,6 +1352,7 @@ def start_file_test(self, module):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
@@ -1424,6 +1443,11 @@ def start_file_test(self, module):
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         self._stream.write("Running {file}...\n".format(file=module.file_path))
         # get the above line and all previous ones to the report
@@ -1448,6 +1472,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         super(GrassTestFilesTextReporter, self).end_file_test(
 =======
@@ -1490,6 +1515,8 @@ def end_file_test(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         super().end_file_test(
 =======
@@ -1509,6 +1536,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         super(GrassTestFilesTextReporter, self).end_file_test(
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1591,6 +1619,11 @@ def end_file_test(
 =======
         super(GrassTestFilesTextReporter, self).end_file_test(
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        super(GrassTestFilesTextReporter, self).end_file_test(
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             module=module,
             cwd=cwd,
@@ -1631,6 +1664,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1687,6 +1721,8 @@ def end_file_test(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             self._stream.write(f"FAILED {module.file_path}")
             if timed_out:
@@ -1710,6 +1746,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1740,6 +1777,8 @@ def end_file_test(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             self._stream.write("FAILED {file}".format(file=module.file_path))
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
@@ -1760,6 +1799,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1788,6 +1828,8 @@ def end_file_test(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             self._stream.write(f"FAILED {module.file_path}")
             if timed_out:
@@ -1807,6 +1849,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1835,6 +1878,8 @@ def end_file_test(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             self._stream.write(f"FAILED {module.file_path}")
             if timed_out:
@@ -1854,6 +1899,7 @@ def end_file_test(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1913,6 +1959,8 @@ def end_file_test(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             num_failed = test_summary.get("failures", 0)
             num_failed += test_summary.get("errors", 0)
diff --git a/python/grass/imaging/images2gif.py b/python/grass/imaging/images2gif.py
index 3c23ec238f3..cdd23497b05 100644
--- a/python/grass/imaging/images2gif.py
+++ b/python/grass/imaging/images2gif.py
@@ -231,6 +231,7 @@ def getAppExt(self, loops=float("inf")):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -300,6 +301,10 @@ def getAppExt(self, loops=float("inf")):
             loops = 2**16 - 1
 =======
 >>>>>>> osgeo-main
+=======
+            loops = 2**16 - 1
+=======
+>>>>>>> osgeo-main
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
             loops = 2 ** 16 - 1
@@ -324,6 +329,7 @@ def getAppExt(self, loops=float("inf")):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -413,6 +419,8 @@ def getAppExt(self, loops=float("inf")):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             # bb = ""
             # application extension should not be used
@@ -867,6 +875,7 @@ def readGif(filename, asNumpy=True):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         raise IOError("File not found: " + str(filename))
 =======
@@ -909,6 +918,8 @@ def readGif(filename, asNumpy=True):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         raise OSError("File not found: " + str(filename))
 =======
@@ -928,6 +939,7 @@ def readGif(filename, asNumpy=True):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         raise IOError("File not found: " + str(filename))
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
@@ -1010,6 +1022,11 @@ def readGif(filename, asNumpy=True):
 =======
         raise IOError("File not found: " + str(filename))
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+        raise IOError("File not found: " + str(filename))
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
 
     # Load file using PIL
diff --git a/python/grass/jupyter/Makefile b/python/grass/jupyter/Makefile
index fb2fb42fe68..1208f56ed7b 100644
--- a/python/grass/jupyter/Makefile
+++ b/python/grass/jupyter/Makefile
@@ -32,6 +32,7 @@ DSTDIR = $(ETC)/python/grass/jupyter
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -131,6 +132,10 @@ DSTDIR = $(ETC)/python/grass/jupyter
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 MODULES = \
 	setup \
 	map \
@@ -152,6 +157,7 @@ MODULES = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -195,6 +201,8 @@ MODULES = \
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 	seriesmap \
 	reprojection_renderer \
@@ -211,6 +219,7 @@ MODULES = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -333,6 +342,13 @@ MODULES = \
 	timeseriesmap
 =======
 >>>>>>> osgeo-main
+=======
+	timeseriesmap \
+	baseseriesmap
+=======
+	timeseriesmap
+=======
+>>>>>>> osgeo-main
 MODULES = setup
 >>>>>>> 584e61d06d (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 <<<<<<< HEAD
@@ -348,6 +364,7 @@ MODULES = setup
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 4625684fca (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 =======
 =======
@@ -377,6 +394,8 @@ MODULES = setup
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 MODULES = setup
 >>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
@@ -389,6 +408,7 @@ MODULES = setup
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> dc994d1258 (Add session initiations functions for Jupyter Notebooks (#1629))
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -429,6 +449,9 @@ MODULES = setup
 >>>>>>> dc994d1258 (Add session initiations functions for Jupyter Notebooks (#1629))
 >>>>>>> osgeo-main
 =======
+>>>>>>> dc994d1258 (Add session initiations functions for Jupyter Notebooks (#1629))
+>>>>>>> osgeo-main
+=======
 =======
 MODULES = setup display
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -440,6 +463,7 @@ MODULES = setup display
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -475,6 +499,9 @@ MODULES = setup display
 >>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
 =======
+>>>>>>> f541ee3b09 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
+=======
 =======
 MODULES = \
 	setup \
@@ -496,6 +523,7 @@ MODULES = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 01a506d3d3 (libpython: Support benchmarks of non-parallel runs better (#1733))
 =======
 =======
@@ -519,6 +547,8 @@ MODULES = \
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 	interact_display \
 	utils
@@ -536,6 +566,7 @@ MODULES = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 2a3f5af732 (wxGUI/Single-Window: New change page event for AuiNotebook (#1780))
 =======
 =======
@@ -559,6 +590,8 @@ MODULES = \
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 	map \
 	interactivemap \
@@ -581,6 +614,7 @@ MODULES = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -604,6 +638,8 @@ MODULES = \
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 	reprojection_renderer \
 	utils \
@@ -620,6 +656,7 @@ MODULES = \
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -782,6 +819,8 @@ MODULES = \
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
 PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
diff --git a/python/grass/jupyter/__init__.py b/python/grass/jupyter/__init__.py
index 70225674629..e437f7aaf8e 100644
--- a/python/grass/jupyter/__init__.py
+++ b/python/grass/jupyter/__init__.py
@@ -22,6 +22,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -62,6 +63,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -79,6 +82,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -139,6 +143,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # MODULE:    grass.jupyter
 #
 # AUTHOR(S): Caitlin Haedrich 
@@ -208,6 +214,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -249,6 +256,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 .. note::
     Contrary to typical command line / GUI module usage, grass.jupyter
     enables output overwrite by default to align with behaviour of other
@@ -273,6 +282,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -342,6 +352,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 All classes and functions for interaction in notebooks are now available under *gj*,
 for example we can display a map with a selected raster and vector::
 
@@ -412,6 +426,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -453,6 +468,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 from .seriesmap import SeriesMap
 =======
 from .setup import *
@@ -476,6 +493,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -512,6 +530,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 584e61d06d (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 =======
 from .setup import *
@@ -531,6 +551,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -554,6 +575,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 from .interact_display import *
 >>>>>>> ba3c0640fa (libpython: Support benchmarks of non-parallel runs better (#1733))
@@ -579,6 +602,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -708,3 +732,7 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/python/grass/jupyter/display.py b/python/grass/jupyter/display.py
index ad13476baf8..f246fd4bd56 100644
--- a/python/grass/jupyter/display.py
+++ b/python/grass/jupyter/display.py
@@ -29,6 +29,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 import shutil
 =======
 <<<<<<< HEAD
@@ -56,6 +57,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 from pathlib import Path
 =======
 import shutil
@@ -76,6 +79,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -171,6 +175,9 @@
 =======
 import tempfile
 >>>>>>> osgeo-main
+=======
+import tempfile
+>>>>>>> osgeo-main
 import grass.script as gs
 
 
@@ -190,6 +197,7 @@ class GrassRenderer:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -253,6 +261,10 @@ class GrassRenderer:
     """The grassRenderer class creates and displays GRASS maps in
     Jupyter Notebooks."""
 >>>>>>> osgeo-main
+=======
+    """The grassRenderer class creates and displays GRASS maps in
+    Jupyter Notebooks."""
+>>>>>>> osgeo-main
 =======
     """The grassRenderer class creates and displays GRASS maps in
     Jupyter Notebooks."""
@@ -278,6 +290,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
         """Initiates an instance of the GrassRenderer class."""
@@ -398,6 +411,11 @@ def __init__(
         """Initiates an instance of the GrassRenderer class."""
 =======
 
+>>>>>>> osgeo-main
+=======
+        """Initiates an instance of the GrassRenderer class."""
+=======
+
 >>>>>>> osgeo-main
         """Creates an instance of the GrassRenderer class.
 
@@ -421,6 +439,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> d7075af684 (r.in.pdal: info.cpp also needs PDALCPPFLAGS (#1768))
 =======
 >>>>>>> osgeo-main
@@ -493,6 +512,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if env:
             self._env = env.copy()
@@ -513,6 +534,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -534,6 +556,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         # Environment Settings
         self._env["GRASS_RENDER_WIDTH"] = str(width)
@@ -550,6 +574,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         self._env["GRASS_RENDER_TEXT_SIZE"] = str(text_size)
         self._env["GRASS_RENDER_IMMEDIATE"] = renderer
@@ -617,6 +642,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self._env["GRASS_TEXT_SIZE"] = str(text_size)
         self._env["GRASS_RENDER_IMMEDIATE"] = "cairo"
@@ -655,6 +682,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 
 =======
@@ -775,6 +803,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     def run(self, module, **kwargs):
         """Run modules from "d." GRASS library"""
@@ -799,6 +829,7 @@ def run(self, module, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -850,6 +881,8 @@ def show(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     def show(self):
 <<<<<<< HEAD
@@ -871,6 +904,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -936,5 +970,7 @@ def show(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         return Image(self._filename)
diff --git a/python/grass/jupyter/interact_display.py b/python/grass/jupyter/interact_display.py
index 612ecc3753f..929e44b84b4 100644
--- a/python/grass/jupyter/interact_display.py
+++ b/python/grass/jupyter/interact_display.py
@@ -21,6 +21,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -43,6 +44,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #            This program is free software under the GNU General Public
 #            License (>=v2). Read the file COPYING that comes with GRASS
 #            for details.
@@ -64,6 +67,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -87,6 +91,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 import grass.script as gs
 from .display import GrassRenderer
 from .utils import (
@@ -129,6 +135,7 @@ def __init__(self, width=400, height=400):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #            This program is free software under the GNU Gernal Public
 #            License (>=v2). Read teh file COPYING that comes with GRASS
@@ -318,6 +325,8 @@ def __init__(self, width=400, height=400):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         # Store height and width
@@ -338,6 +347,7 @@ def __init__(self, width=400, height=400):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 2a3f5af732 (wxGUI/Single-Window: New change page event for AuiNotebook (#1780))
 =======
@@ -365,6 +375,8 @@ def __init__(self, width=400, height=400):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self._tmp_dir = tempfile.TemporaryDirectory()
 
@@ -389,6 +401,7 @@ def __init__(self, width=400, height=400):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -411,6 +424,8 @@ def __init__(self, width=400, height=400):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         )
         self.rcfile_wgs84, self._wgs84_env = setup_location(
@@ -433,6 +448,7 @@ def __init__(self, width=400, height=400):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> a4624812dc (libpython: Support benchmarks of non-parallel runs better (#1733))
@@ -525,6 +541,8 @@ def __init__(self, width=400, height=400):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             width=self.width,
             height=self.height,
@@ -546,6 +564,7 @@ def __init__(self, width=400, height=400):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -567,6 +586,8 @@ def __init__(self, width=400, height=400):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         # Set LayerControl default
         self.layer_control = False
@@ -598,6 +619,7 @@ def clean_up(paths):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         # Create LayerControl default
 =======
@@ -732,6 +754,8 @@ def _folium_bounding_box(self, extent):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     def add_vector(self, name):
@@ -751,6 +775,7 @@ def add_vector(self, name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         :param str name: name of vector to be added to map;
                          positional-only parameter
@@ -832,6 +857,11 @@ def add_vector(self, name):
                          positional-only parameter
         """
 >>>>>>> osgeo-main
+=======
+        :param str name: name of vector to be added to map;
+                         positional-only parameter
+        """
+>>>>>>> osgeo-main
 =======
         :param str name: name of vector to be added to map;
                          positional-only parameter
@@ -857,6 +887,7 @@ def add_vector(self, name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -878,6 +909,8 @@ def add_vector(self, name):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         mapset = file_info["mapset"]
         new_name = full_name.replace("@", "_")
@@ -992,6 +1025,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
         mapset = file_info["mapset"]
@@ -1346,6 +1380,8 @@ def show(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         overlayed on a basemap.
 
@@ -1368,6 +1404,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         fig = self._folium.Figure(width=self.width, height=self.height)
 =======
@@ -1417,6 +1454,9 @@ def show(self):
 =======
         fig = self._folium.Figure(width=self.width, height=self.height)
 >>>>>>> osgeo-main
+=======
+        fig = self._folium.Figure(width=self.width, height=self.height)
+>>>>>>> osgeo-main
 =======
         fig = self._folium.Figure(width=self.width, height=self.height)
 >>>>>>> osgeo-main
@@ -1438,6 +1478,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 2a3f5af732 (wxGUI/Single-Window: New change page event for AuiNotebook (#1780))
 =======
@@ -1465,6 +1506,8 @@ def show(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     def save(self, filename):
@@ -1485,6 +1528,7 @@ def save(self, filename):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1522,3 +1566,5 @@ def save(self, filename):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/python/grass/jupyter/interactivemap.py b/python/grass/jupyter/interactivemap.py
index feb1b40b1fa..9d87ac4db12 100644
--- a/python/grass/jupyter/interactivemap.py
+++ b/python/grass/jupyter/interactivemap.py
@@ -17,6 +17,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -111,6 +112,9 @@
 =======
 #            Anna Petrasova 
 >>>>>>> osgeo-main
+=======
+#            Anna Petrasova 
+>>>>>>> osgeo-main
 <<<<<<< HEAD
 #            Riya Saxena <29riyasaxena AT gmail>
 =======
@@ -126,6 +130,9 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -156,6 +163,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 # COPYRIGHT: (C) 2021-2022 Caitlin Haedrich, and by the GRASS Development Team
 =======
 <<<<<<< HEAD
@@ -198,6 +206,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # COPYRIGHT: (C) 2021-2024 Caitlin Haedrich, and by the GRASS Development Team
 =======
 # COPYRIGHT: (C) 2021-2022 Caitlin Haedrich, and by the GRASS Development Team
@@ -216,6 +226,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # COPYRIGHT: (C) 2021-2022 Caitlin Haedrich, and by the GRASS Development Team
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -299,6 +310,11 @@
 # COPYRIGHT: (C) 2021-2022 Caitlin Haedrich, and by the GRASS Development Team
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+# COPYRIGHT: (C) 2021-2022 Caitlin Haedrich, and by the GRASS Development Team
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #
 #            This program is free software under the GNU General Public
 #            License (>=v2). Read the file COPYING that comes with GRASS
@@ -321,6 +337,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -362,6 +379,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 """Interactive visualizations map with folium or ipyleaflet"""
 import os
 import base64
@@ -414,6 +433,7 @@ class Layer:  # pylint: disable=too-few-public-methods
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -483,6 +503,10 @@ class Layer:  # pylint: disable=too-few-public-methods
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 """Interactive visualizations map with folium"""
 
 from .reprojection_renderer import ReprojectionRenderer
@@ -512,6 +536,7 @@ class Raster:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -602,6 +627,11 @@ class Raster:
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     """
 
@@ -633,6 +663,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -673,6 +704,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         param str name: layer name
         param str title: title of layer to display in layer control legend
@@ -698,6 +731,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -766,6 +800,10 @@ def __init__(
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         param str name: raster name
         param str title: title of raster to display in layer control legend
@@ -797,6 +835,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -887,6 +926,11 @@ def __init__(
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         self._title = title
         if not self._title:
@@ -915,6 +959,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -956,6 +1001,8 @@ def __init__(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 class Raster(Layer):
@@ -998,6 +1045,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1066,6 +1114,10 @@ def __init__(
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         # Render overlay
         # By doing this here instead of in add_to, we avoid rendering
@@ -1090,6 +1142,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1130,6 +1183,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     def add_to(self, interactive_map):
         """Add raster to map object which is an instance of either
@@ -1176,6 +1231,7 @@ class Vector(Layer):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1244,6 +1300,10 @@ class Vector(Layer):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     def add_to(self, folium_map):
         """Add raster to folium map with folium.raster_layers.ImageOverlay()
@@ -1281,6 +1341,7 @@ class Vector:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1371,6 +1432,11 @@ class Vector:
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     Basic Usage:
@@ -1394,6 +1460,7 @@ class Vector:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1434,6 +1501,8 @@ class Vector:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     >>> m = ipyleaflet.Map()
@@ -1455,6 +1524,7 @@ class Vector:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1523,6 +1593,10 @@ class Vector:
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     """
 
@@ -1552,6 +1626,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1592,6 +1667,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         """Reproject GRASS vector and export to GeoJSON."""
         super().__init__(name, title, use_region, saved_region, renderer, **kwargs)
@@ -1641,6 +1718,7 @@ class InteractiveMap:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1709,6 +1787,10 @@ class InteractiveMap:
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         """Reproject GRASS vector and export to folium-ready PNG. Also computes bounding
         box for PNG overlay in folium map.
@@ -1764,6 +1846,7 @@ class InteractiveMap:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1854,6 +1937,11 @@ class InteractiveMap:
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     Basic Usage:
@@ -1889,6 +1977,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1929,6 +2018,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         map_backend=None,
     ):
@@ -1956,6 +2047,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2024,6 +2116,10 @@ def __init__(
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     ):
         """Creates a blank folium map centered on g.region.
@@ -2047,6 +2143,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2137,6 +2234,11 @@ def __init__(
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         "Stamen Watercolor", "Mapbox Bright", "Mapbox Control Room", "CartoDB positron",
         "CartoDB dark_matter") as well as custom tileset URL (i.e.
@@ -2160,6 +2262,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2200,6 +2303,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         In case of ipyleaflet, only the tileset name and not the URL is
         currently supported.
@@ -2219,6 +2324,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2287,6 +2393,10 @@ def __init__(
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         Raster and vector data are always reprojected to Pseudo-Mercator.
@@ -2322,6 +2432,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2362,6 +2473,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :param str map_backend: "ipyleaflet" or "folium" or None
         """
@@ -2423,6 +2536,7 @@ def _import_ipyleaflet(error):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2491,6 +2605,10 @@ def _import_ipyleaflet(error):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         """
         import folium  # pylint: disable=import-outside-toplevel
@@ -2513,6 +2631,7 @@ def _import_ipyleaflet(error):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2603,6 +2722,11 @@ def _import_ipyleaflet(error):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         # Store height and width
@@ -2668,6 +2792,9 @@ def _import_ipyleaflet(error):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2708,6 +2835,7 @@ def _import_ipyleaflet(error):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2776,6 +2904,10 @@ def _import_ipyleaflet(error):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         # Create Folium Map
         self.map = self._folium.Map(
@@ -2801,6 +2933,7 @@ def _import_ipyleaflet(error):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2891,6 +3024,11 @@ def _import_ipyleaflet(error):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         # Set LayerControl default
         self.layer_control_object = None
@@ -2918,6 +3056,7 @@ def add_vector(self, name, title=None, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         adds to folium map.
 =======
@@ -2960,6 +3099,8 @@ def add_vector(self, name, title=None, **kwargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         adds to map.
 =======
@@ -2979,6 +3120,7 @@ def add_vector(self, name, title=None, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         adds to folium map.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3061,6 +3203,11 @@ def add_vector(self, name, title=None, **kwargs):
 =======
         adds to folium map.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        adds to folium map.
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         :param str name: name of vector to be added to map;
@@ -3082,6 +3229,7 @@ def add_vector(self, name, title=None, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         :**kwargs: keyword arguments passed to folium.GeoJson()
 =======
@@ -3124,6 +3272,8 @@ def add_vector(self, name, title=None, **kwargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :**kwargs: keyword arguments passed to GeoJSON overlay
 =======
@@ -3143,6 +3293,7 @@ def add_vector(self, name, title=None, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         :**kwargs: keyword arguments passed to folium.GeoJson()
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3225,6 +3376,11 @@ def add_vector(self, name, title=None, **kwargs):
 =======
         :**kwargs: keyword arguments passed to folium.GeoJson()
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        :**kwargs: keyword arguments passed to folium.GeoJson()
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         """
         self.vector_name.append(name)
@@ -3248,6 +3404,7 @@ def add_raster(self, name, title=None, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         exports as png and overlays on folium map.
 =======
@@ -3290,6 +3447,8 @@ def add_raster(self, name, title=None, **kwargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         exports as png and overlays on a map.
 =======
@@ -3309,6 +3468,7 @@ def add_raster(self, name, title=None, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         exports as png and overlays on folium map.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3391,6 +3551,11 @@ def add_raster(self, name, title=None, **kwargs):
 =======
         exports as png and overlays on folium map.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        exports as png and overlays on folium map.
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         Color table for the raster can be modified with `r.colors` before calling
@@ -3419,6 +3584,7 @@ def add_raster(self, name, title=None, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         :**kwargs: keyword arguments passed to folium.raster_layers.ImageOverlay()
 =======
@@ -3461,6 +3627,8 @@ def add_raster(self, name, title=None, **kwargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :**kwargs: keyword arguments passed to image overlay
 =======
@@ -3480,6 +3648,7 @@ def add_raster(self, name, title=None, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         :**kwargs: keyword arguments passed to folium.raster_layers.ImageOverlay()
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3562,6 +3731,11 @@ def add_raster(self, name, title=None, **kwargs):
 =======
         :**kwargs: keyword arguments passed to folium.raster_layers.ImageOverlay()
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        :**kwargs: keyword arguments passed to folium.raster_layers.ImageOverlay()
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         """
         self.raster_name.append(name)
@@ -3587,6 +3761,7 @@ def add_layer_control(self, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3626,6 +3801,8 @@ def add_layer_control(self, **kwargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         A Layer Control is added by default. Call this function to customize
         layer control object. Accepts keyword arguments to be passed to leaflet
@@ -3642,6 +3819,7 @@ def add_layer_control(self, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3672,6 +3850,8 @@ def add_layer_control(self, **kwargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         Accepts keyword arguments to be passed to layer control object"""
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
@@ -3772,6 +3952,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3840,6 +4021,10 @@ def show(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         Accepts keyword arguments to be passed to folium.LayerControl()"""
 
@@ -3866,6 +4051,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3956,6 +4142,11 @@ def show(self):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         If map has layer control enabled, additional layers cannot be
@@ -3996,6 +4187,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -4040,6 +4232,8 @@ def show(self):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 7f1fd5e3ad (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> ee7e1bb8ec (wxpyimgview: explicit conversion to int (#2704))
@@ -4052,6 +4246,9 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -4092,6 +4289,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4160,6 +4358,10 @@ def show(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         if self.layer_control:
             self.map.add_child(self.layer_control_object)
@@ -4187,6 +4389,7 @@ def show(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4277,6 +4480,11 @@ def show(self):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     def save(self, filename):
diff --git a/python/grass/jupyter/map.py b/python/grass/jupyter/map.py
index def91d8ea88..f6354401f2c 100644
--- a/python/grass/jupyter/map.py
+++ b/python/grass/jupyter/map.py
@@ -78,6 +78,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -115,6 +116,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -134,6 +137,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -184,6 +188,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         """Creates an instance of the Map class.
 
diff --git a/python/grass/jupyter/region.py b/python/grass/jupyter/region.py
index 7f4f2805abf..5e2b2486d27 100644
--- a/python/grass/jupyter/region.py
+++ b/python/grass/jupyter/region.py
@@ -225,6 +225,7 @@ def set_region_from_command(self, module, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -266,6 +267,8 @@ def set_region_from_command(self, module, **kwargs):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 class RegionManagerForSeries:
     """Region manager for SeriesMap"""
 
@@ -354,6 +357,7 @@ def set_region_from_vectors(self, vectors):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -423,6 +427,10 @@ def set_region_from_vectors(self, vectors):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 class RegionManagerFor3D:
     """Region manager for 3D displays (gets region from m.nviz.image command)"""
 
diff --git a/python/grass/jupyter/reprojection_renderer.py b/python/grass/jupyter/reprojection_renderer.py
index 51b3414984b..534663bb877 100644
--- a/python/grass/jupyter/reprojection_renderer.py
+++ b/python/grass/jupyter/reprojection_renderer.py
@@ -120,6 +120,7 @@ def render_raster(self, name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             location=env_info["LOCATION_NAME"],
 =======
@@ -162,6 +163,8 @@ def render_raster(self, name):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             project=env_info["LOCATION_NAME"],
 =======
@@ -181,6 +184,7 @@ def render_raster(self, name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             location=env_info["LOCATION_NAME"],
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -263,6 +267,11 @@ def render_raster(self, name):
 =======
             location=env_info["LOCATION_NAME"],
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            location=env_info["LOCATION_NAME"],
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             dbase=env_info["GISDBASE"],
             resolution=self._region_manager.resolution,
@@ -328,6 +337,7 @@ def render_vector(self, name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             location=env_info["LOCATION_NAME"],
 =======
@@ -370,6 +380,8 @@ def render_vector(self, name):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             project=env_info["LOCATION_NAME"],
 =======
@@ -389,6 +401,7 @@ def render_vector(self, name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             location=env_info["LOCATION_NAME"],
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -471,6 +484,11 @@ def render_vector(self, name):
 =======
             location=env_info["LOCATION_NAME"],
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            location=env_info["LOCATION_NAME"],
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             dbase=env_info["GISDBASE"],
             env=self._wgs84_env,
diff --git a/python/grass/jupyter/setup.py b/python/grass/jupyter/setup.py
index 901490a6197..72b435d869d 100644
--- a/python/grass/jupyter/setup.py
+++ b/python/grass/jupyter/setup.py
@@ -25,6 +25,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -117,6 +118,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #            Vaclav Petras 
 #
 # PURPOSE:   This module contains functions for launching a GRASS session
@@ -147,6 +152,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -184,6 +190,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 from pathlib import Path
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -209,6 +217,7 @@ def _set_notebook_defaults():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
@@ -300,6 +309,8 @@ def _set_notebook_defaults():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
 =======
@@ -339,6 +350,7 @@ def _set_notebook_defaults():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 4625684fca (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 =======
 =======
@@ -386,6 +398,10 @@ def _set_notebook_defaults():
 =======
 >>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
+>>>>>>> osgeo-main
 =======
     """Set defaults appropriate for Jupyter Notebooks.
 
@@ -402,6 +418,7 @@ def _set_notebook_defaults():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -544,6 +561,10 @@ def _set_notebook_defaults():
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     This function sets several GRASS environment variables that are
     important for GRASS to run smoothly in Jupyter.
@@ -583,6 +604,7 @@ def _set_notebook_defaults():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -675,6 +697,10 @@ def _set_notebook_defaults():
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 class _JupyterGlobalSession:
     """Represents a global GRASS session for Jupyter Notebooks.
 
@@ -700,6 +726,7 @@ class _JupyterGlobalSession:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -736,6 +763,8 @@ class _JupyterGlobalSession:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     called explicitly.
 
@@ -874,6 +903,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
 =======
@@ -936,6 +966,10 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
+>>>>>>> osgeo-main
 def init(path, location, mapset):
     """
     This function initiates a GRASS session and sets GRASS
@@ -954,6 +988,7 @@ def init(path, location, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -983,6 +1018,8 @@ def init(path, location, mapset):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 class _JupyterGlobalSession:
     """Represents a global GRASS session for Jupyter Notebooks.
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -998,6 +1035,7 @@ class _JupyterGlobalSession:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1144,6 +1182,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     Do not create objects of this class directly. Use the standalone *init* function
@@ -1261,6 +1301,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 4625684fca (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 =======
 <<<<<<< HEAD
@@ -1512,6 +1553,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # Create a GRASS GIS session.
     gsetup.init(os.environ["GISBASE"], path, location, mapset)
@@ -1532,6 +1575,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 4625684fca (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 =======
@@ -1566,6 +1610,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 def display_settings(font="sans", driver="cairo"):
@@ -1607,6 +1653,7 @@ def display_settings(font="sans", driver="cairo"):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1629,6 +1676,8 @@ def display_settings(font="sans", driver="cairo"):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 584e61d06d (wxGUI/datacatalog: fix setting output vector/raster format (#1596))
 =======
 >>>>>>> 847046a031 (Add session initiations functions for Jupyter Notebooks (#1629))
@@ -1648,6 +1697,7 @@ def display_settings(font="sans", driver="cairo"):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1676,6 +1726,8 @@ def display_settings(font="sans", driver="cairo"):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 
     def __init__(self):
@@ -1775,6 +1827,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1810,6 +1863,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     >>> import grass.jupyter as gj
@@ -1850,6 +1905,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1883,6 +1939,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     The session is ended when `session.finish` is called or when the object is
     destroyed when kernel ends or restarts. This function returns a copy of an
@@ -1917,6 +1975,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1958,6 +2017,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     global _global_session_handle  # pylint: disable=global-statement,invalid-name
     if not _global_session_handle or not _global_session_handle.active:
@@ -1986,6 +2047,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2108,3 +2170,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/python/grass/jupyter/tests/timeseriesmap_test.py b/python/grass/jupyter/tests/timeseriesmap_test.py
index fdc949131e0..4ad33146861 100644
--- a/python/grass/jupyter/tests/timeseriesmap_test.py
+++ b/python/grass/jupyter/tests/timeseriesmap_test.py
@@ -17,6 +17,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -54,6 +55,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -73,6 +76,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -124,6 +128,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 from pathlib import Path
 
 import pytest
@@ -212,6 +218,7 @@ def test_render_layers(space_time_raster_dataset, fill_gaps):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -252,6 +259,8 @@ def test_render_layers(space_time_raster_dataset, fill_gaps):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> ba9afcba1b (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -259,6 +268,9 @@ def test_render_layers(space_time_raster_dataset, fill_gaps):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -286,6 +298,7 @@ def test_save(space_time_raster_dataset, tmp_path):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -355,6 +368,10 @@ def test_save(space_time_raster_dataset, tmp_path):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 def test_save(space_time_raster_dataset):
     """Test returns from animate and time_slider are correct object types"""
     img = gj.TimeSeriesMap()
@@ -377,6 +394,7 @@ def test_save(space_time_raster_dataset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -467,5 +485,10 @@ def test_save(space_time_raster_dataset):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     assert Path(gif_file).is_file()
diff --git a/python/grass/jupyter/testsuite/interactivemap_test.py b/python/grass/jupyter/testsuite/interactivemap_test.py
index d77922c9944..6cb8eb31d90 100644
--- a/python/grass/jupyter/testsuite/interactivemap_test.py
+++ b/python/grass/jupyter/testsuite/interactivemap_test.py
@@ -39,6 +39,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -124,6 +125,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 import sys
 import unittest
 from pathlib import Path
@@ -144,6 +149,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -191,6 +197,9 @@
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 import unittest
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -218,6 +227,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -305,6 +315,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 import grass.jupyter as gj
 from grass.gunittest.case import TestCase
 from grass.gunittest.main import test
@@ -334,6 +346,7 @@ def can_import_folium():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -399,6 +412,10 @@ def can_import_folium():
 =======
         import folium  # noqa
 =======
+>>>>>>> osgeo-main
+=======
+        import folium  # noqa
+=======
 >>>>>>> osgeo-main
         import folium
 >>>>>>> 920471e340 (libraster: fix Rast_legal_bandref() (#1796))
@@ -422,6 +439,7 @@ def can_import_folium():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -498,6 +516,8 @@ def can_import_folium():
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         return True
diff --git a/python/grass/jupyter/timeseriesmap.py b/python/grass/jupyter/timeseriesmap.py
index 26d41cc012f..99e7687773e 100644
--- a/python/grass/jupyter/timeseriesmap.py
+++ b/python/grass/jupyter/timeseriesmap.py
@@ -32,6 +32,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -67,6 +68,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -86,6 +89,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -137,6 +141,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 import grass.script as gs
 
 from .map import Map
@@ -158,6 +164,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -248,6 +255,16 @@
 >>>>>>> osgeo-main
 =======
 =======
+=======
+>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
+<<<<<<< HEAD
+from .utils import save_gif
+<<<<<<< HEAD
+>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704))
+from .baseseriesmap import BaseSeriesMap
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 12b43eb397 (wxpyimgview: explicit conversion to int (#2704))
@@ -262,6 +279,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -285,6 +303,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 3ab4f90615 (wxpyimgview: explicit conversion to int (#2704))
@@ -298,6 +318,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> osgeo-main
@@ -359,6 +380,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 def fill_none_values(names):
@@ -485,6 +508,7 @@ class TimeSeriesMap(BaseSeriesMap):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -519,6 +543,8 @@ class TimeSeriesMap(BaseSeriesMap):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # pylint: disable=duplicate-code
 =======
@@ -539,6 +565,7 @@ class TimeSeriesMap(BaseSeriesMap):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -589,6 +616,8 @@ class TimeSeriesMap(BaseSeriesMap):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     def __init__(
@@ -812,6 +841,7 @@ def save(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -903,6 +933,11 @@ def save(
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         # Create a GIF from the PNG images
         import PIL.Image  # pylint: disable=import-outside-toplevel
@@ -925,6 +960,7 @@ def save(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1015,6 +1051,11 @@ def save(
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         # Render images if they have not been already
@@ -1038,6 +1079,7 @@ def save(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1078,6 +1120,8 @@ def save(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         input_files = []
         for date in self._labels:
@@ -1107,6 +1151,7 @@ def save(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1175,6 +1220,10 @@ def save(
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         # filepath to output GIF
         if not filename.endswith(".gif"):
@@ -1219,6 +1268,7 @@ def save(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1309,6 +1359,11 @@ def save(
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         )
 
diff --git a/python/grass/jupyter/utils.py b/python/grass/jupyter/utils.py
index 015de5fca13..e7ab634d765 100644
--- a/python/grass/jupyter/utils.py
+++ b/python/grass/jupyter/utils.py
@@ -25,6 +25,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -165,6 +166,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # COPYRIGHT: (C) 2021-2024 Caitlin Haedrich, and by the GRASS Development Team
 =======
 =======
@@ -193,6 +196,9 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -228,6 +234,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 """Utility functions warpping existing processes in a suitable way"""
@@ -280,6 +287,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 """Utility functions warpping existing processes in a suitable way"""
 import tempfile
 import json
@@ -304,6 +313,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -333,6 +343,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 """Utility functions warpping existing processes in a suitable way"""
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -350,6 +362,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -379,6 +392,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 """Utility functions warpping existing processes in a suitable way"""
 
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -396,6 +411,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -444,6 +460,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 import grass.script as gs
 
 
@@ -470,6 +488,7 @@ def get_region(env=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -549,6 +568,11 @@ def get_region(env=None):
 
     Additionally, it adds long key names.
 =======
+>>>>>>> osgeo-main
+=======
+
+    Additionally, it adds long key names.
+=======
 >>>>>>> osgeo-main
     Adds long key names.
 >>>>>>> 7896e1a53f (wxGUI/Single-Window: New change page event for AuiNotebook (#1780))
@@ -574,6 +598,7 @@ def get_region(env=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -655,6 +680,8 @@ def get_region(env=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     """
     region = gs.region(env=env)
@@ -704,6 +731,7 @@ def reproject_region(region, from_proj, to_proj):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -743,6 +771,8 @@ def reproject_region(region, from_proj, to_proj):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -760,6 +790,7 @@ def reproject_region(region, from_proj, to_proj):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -813,6 +844,8 @@ def reproject_region(region, from_proj, to_proj):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # reproject all corners, otherwise reproj. region may be underestimated
     # even better solution would be reprojecting vector region like in r.import
@@ -842,6 +875,7 @@ def reproject_region(region, from_proj, to_proj):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -882,6 +916,9 @@ def reproject_region(region, from_proj, to_proj):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     proj_input = "{east} {north}\n{west} {south}".format(**region)
 >>>>>>> 7896e1a53f (wxGUI/Single-Window: New change page event for AuiNotebook (#1780))
@@ -901,6 +938,7 @@ def reproject_region(region, from_proj, to_proj):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -984,6 +1022,8 @@ def reproject_region(region, from_proj, to_proj):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     proc = gs.start_command(
         "m.proj",
@@ -1022,6 +1062,7 @@ def reproject_region(region, from_proj, to_proj):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1061,6 +1102,8 @@ def reproject_region(region, from_proj, to_proj):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1078,6 +1121,7 @@ def reproject_region(region, from_proj, to_proj):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1131,6 +1175,8 @@ def reproject_region(region, from_proj, to_proj):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         raise RuntimeError(
             _("Encountered error while running m.proj: {}").format(stderr)
@@ -1163,6 +1209,7 @@ def reproject_region(region, from_proj, to_proj):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1237,6 +1284,10 @@ def reproject_region(region, from_proj, to_proj):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     return region
 
@@ -1474,6 +1525,7 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1530,6 +1582,9 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         raise RuntimeError("reprojecting region: m.proj error: " + stderr)
     enws = gs.decode(proj_output).split(os.linesep)
@@ -1553,6 +1608,7 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1582,6 +1638,8 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
     return region
 
@@ -1613,6 +1671,7 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1705,6 +1764,8 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     :param dict env: target environment
 
@@ -1733,6 +1794,7 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1772,6 +1834,8 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 920471e340 (libraster: fix Rast_legal_bandref() (#1796))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1789,6 +1853,7 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1842,6 +1907,8 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         "r.proj",
         flags="g",
@@ -1870,6 +1937,7 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1910,6 +1978,9 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         "r.proj", flags="g", input=raster, dbase=dbase, location=location, env=env
 >>>>>>> 7896e1a53f (wxGUI/Single-Window: New change page event for AuiNotebook (#1780))
@@ -1929,6 +2000,7 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -2012,6 +2084,8 @@ def estimate_resolution(raster, mapset, location, dbase, env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     ).strip()
     params = gs.parse_key_val(output, vsep=" ")
@@ -2060,6 +2134,7 @@ def setup_location(name, path, epsg, src_env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2099,6 +2174,8 @@ def setup_location(name, path, epsg, src_env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2116,6 +2193,7 @@ def setup_location(name, path, epsg, src_env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2169,6 +2247,8 @@ def setup_location(name, path, epsg, src_env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     set_target_region(src_env, new_env)
     return rcfile, new_env
@@ -2196,6 +2276,7 @@ def set_target_region(src_env, tgt_env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
@@ -2234,6 +2315,8 @@ def set_target_region(src_env, tgt_env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     region = get_region(env=src_env)
     from_proj = get_location_proj_string(src_env)
@@ -2255,6 +2338,7 @@ def set_target_region(src_env, tgt_env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2293,6 +2377,8 @@ def set_target_region(src_env, tgt_env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     region = get_region(env=src_env)
     from_proj = get_location_proj_string(src_env)
@@ -2312,6 +2398,7 @@ def set_target_region(src_env, tgt_env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2340,6 +2427,8 @@ def set_target_region(src_env, tgt_env):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     region = get_region(env=src_env)
     from_proj = get_location_proj_string(src_env)
@@ -2359,6 +2448,7 @@ def set_target_region(src_env, tgt_env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2387,6 +2477,8 @@ def set_target_region(src_env, tgt_env):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     region = get_region(env=src_env)
     from_proj = get_location_proj_string(src_env)
@@ -2406,6 +2498,7 @@ def set_target_region(src_env, tgt_env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2453,6 +2546,8 @@ def set_target_region(src_env, tgt_env):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     new_region = reproject_region(region, from_proj, to_proj)
     # Set region to match original region extent
@@ -2483,6 +2578,7 @@ def set_target_region(src_env, tgt_env):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2567,6 +2663,10 @@ def set_target_region(src_env, tgt_env):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         rows=new_region["rows"],
         cols=new_region["cols"],
@@ -2629,6 +2729,7 @@ def get_rendering_size(region, width, height, default_width=600, default_height=
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2664,6 +2765,8 @@ def get_rendering_size(region, width, height, default_width=600, default_height=
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 def save_vector(name, geo_json):
@@ -2818,6 +2921,7 @@ def save_gif(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2846,6 +2950,8 @@ def save_gif(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         rows=new_region["rows"],
         cols=new_region["cols"],
@@ -2908,6 +3014,7 @@ def get_rendering_size(region, width, height, default_width=600, default_height=
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2983,3 +3090,7 @@ def get_rendering_size(region, width, height, default_width=600, default_height=
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/python/grass/pygrass/modules/grid/grid.py b/python/grass/pygrass/modules/grid/grid.py
index fe4a77e544e..26d43876544 100644
--- a/python/grass/pygrass/modules/grid/grid.py
+++ b/python/grass/pygrass/modules/grid/grid.py
@@ -26,6 +26,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -117,6 +118,11 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 import contextlib
 import os
 import sys
@@ -157,6 +163,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -248,6 +255,11 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 from grass.pygrass.modules.grid.patch import rpatch_map, rpatch_map_r_patch_backend
 
 
@@ -757,6 +769,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -847,6 +860,11 @@ def __init__(
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             region=region, width=self.width, height=self.height, overlap=overlap
         )
diff --git a/python/grass/pygrass/modules/interface/module.py b/python/grass/pygrass/modules/interface/module.py
index 876af96b197..570cb0e06e6 100644
--- a/python/grass/pygrass/modules/interface/module.py
+++ b/python/grass/pygrass/modules/interface/module.py
@@ -367,6 +367,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -432,6 +433,10 @@ class Module:
 =======
     'r.neighbors input=mapA size=5 method=average weighting_function=none quantile=0.5 nprocs=1 memory=300 output=mapB'
 =======
+>>>>>>> osgeo-main
+=======
+    'r.neighbors input=mapA size=5 method=average weighting_function=none quantile=0.5 nprocs=1 memory=300 output=mapB'
+=======
 >>>>>>> osgeo-main
     'r.neighbors input=mapA size=5 method=average weighting_function=none quantile=0.5 output=mapB'
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -455,6 +460,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -532,6 +538,8 @@ class Module:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     >>> new_neighbors1 = copy.deepcopy(neighbors)
@@ -560,6 +568,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -625,6 +634,10 @@ class Module:
 =======
     'r.neighbors input=mapD size=3 method=average weighting_function=none quantile=0.5 nprocs=1 memory=300 output=mapB'
 =======
+>>>>>>> osgeo-main
+=======
+    'r.neighbors input=mapD size=3 method=average weighting_function=none quantile=0.5 nprocs=1 memory=300 output=mapB'
+=======
 >>>>>>> osgeo-main
     'r.neighbors input=mapD size=3 method=average weighting_function=none quantile=0.5 output=mapB'
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -648,6 +661,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -725,6 +739,8 @@ class Module:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     >>> new_neighbors2 = copy.deepcopy(neighbors)
@@ -752,6 +768,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -836,6 +853,10 @@ class Module:
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     'r.neighbors input=mapD size=3 method=average weighting_function=none quantile=0.5 nprocs=1 memory=300 output=mapB'
 
@@ -858,6 +879,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -914,6 +936,9 @@ class Module:
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     'r.neighbors input=mapD size=3 method=average weighting_function=none quantile=0.5 output=mapB'
 
@@ -935,6 +960,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -963,6 +989,8 @@ class Module:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     'r.neighbors input=mapD size=3 method=average weighting_function=none quantile=0.5 nprocs=1 memory=300 output=mapB'
 
@@ -984,6 +1012,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1058,6 +1087,10 @@ class Module:
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     >>> new_neighbors3 = copy.deepcopy(neighbors)
@@ -1085,6 +1118,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1150,6 +1184,10 @@ class Module:
 =======
     'r.neighbors input=mapA size=3 method=average weighting_function=none nprocs=1 memory=300 output=mapB'
 =======
+>>>>>>> osgeo-main
+=======
+    'r.neighbors input=mapA size=3 method=average weighting_function=none nprocs=1 memory=300 output=mapB'
+=======
 >>>>>>> osgeo-main
     'r.neighbors input=mapA size=3 method=average weighting_function=none output=mapB'
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -1173,6 +1211,7 @@ class Module:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1250,6 +1289,8 @@ class Module:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     >>> mapcalc = Module(
diff --git a/python/grass/pygrass/modules/interface/testsuite/test_modules.py b/python/grass/pygrass/modules/interface/testsuite/test_modules.py
index 3318154f87d..ee005498692 100644
--- a/python/grass/pygrass/modules/interface/testsuite/test_modules.py
+++ b/python/grass/pygrass/modules/interface/testsuite/test_modules.py
@@ -21,7 +21,7 @@
 
 
 class ModulesMeta(type):
-    def __new__(mcs, name, bases, dict):
+    def __new__(cls, name, bases, dict):
         def gen_test(cmd):
             def test(self):
                 Module(cmd)
@@ -36,7 +36,7 @@ def test(self):
         for cmd in cmds:
             test_name = "test__%s" % cmd.replace(".", "_")
             dict[test_name] = gen_test(cmd)
-        return type.__new__(mcs, name, bases, dict)
+        return type.__new__(cls, name, bases, dict)
 
 
 class TestModules(TestCase, metaclass=ModulesMeta):
diff --git a/python/grass/pygrass/modules/shortcuts.py b/python/grass/pygrass/modules/shortcuts.py
index 5bd2970406e..edc6660f570 100644
--- a/python/grass/pygrass/modules/shortcuts.py
+++ b/python/grass/pygrass/modules/shortcuts.py
@@ -95,6 +95,7 @@ def __getattr__(self, name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -170,6 +171,10 @@ def __getattr__(self, name):
 # https://grass.osgeo.org/grass-devel/manuals/full_index.html
 =======
 >>>>>>> osgeo-main
+=======
+# https://grass.osgeo.org/grass-devel/manuals/full_index.html
+=======
+>>>>>>> osgeo-main
 # https://grass.osgeo.org/grass80/manuals/full_index.html
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -192,6 +197,7 @@ def __getattr__(self, name):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # https://grass.osgeo.org/grass-devel/manuals/full_index.html
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -317,6 +323,11 @@ def __getattr__(self, name):
 # https://grass.osgeo.org/grass-devel/manuals/full_index.html
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+# https://grass.osgeo.org/grass-devel/manuals/full_index.html
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 # [ d.* | db.* | g.* | i.* | m.* | ps.* | r.* | r3.* | t.* | v.* ]
 #
 #  d.*	display commands
diff --git a/python/grass/pygrass/modules/tests/grass_pygrass_grid_test.py b/python/grass/pygrass/modules/tests/grass_pygrass_grid_test.py
index 3ec4770f83c..719ad9c6088 100644
--- a/python/grass/pygrass/modules/tests/grass_pygrass_grid_test.py
+++ b/python/grass/pygrass/modules/tests/grass_pygrass_grid_test.py
@@ -261,6 +261,7 @@ def run_grid_module():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -302,6 +303,8 @@ def run_grid_module():
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 @xfail_mp_spawn
@@ -355,6 +358,7 @@ def run_grid_module():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -424,3 +428,7 @@ def run_grid_module():
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
diff --git a/python/grass/pygrass/raster/abstract.py b/python/grass/pygrass/raster/abstract.py
index 8be8dbe7040..05c9cab6df4 100644
--- a/python/grass/pygrass/raster/abstract.py
+++ b/python/grass/pygrass/raster/abstract.py
@@ -175,6 +175,7 @@ def mtype(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -254,6 +255,11 @@ def _get_semantic_label(self):
     def _get_semantic_label(self):
         """Get semantic label identifier.
 =======
+>>>>>>> osgeo-main
+=======
+    def _get_semantic_label(self):
+        """Get semantic label identifier.
+=======
 >>>>>>> osgeo-main
     def _get_bandref(self):
         """Get band reference identifier.
@@ -280,6 +286,7 @@ def _get_semantic_label(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -364,6 +371,8 @@ def _get_bandref(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         :return str: semantic label (eg. S2_1) or None
@@ -390,6 +399,7 @@ def _get_bandref(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -474,6 +484,10 @@ def _get_bandref(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         semantic_label = libraster.Rast_read_semantic_label(self.name, self.mapset)
         if semantic_label:
@@ -510,6 +524,7 @@ def _set_semantic_label(self, semantic_label):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -556,6 +571,9 @@ def _set_semantic_label(self, semantic_label):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         bandref = libraster.Rast_read_bandref(self.name, self.mapset)
         if bandref:
@@ -602,6 +620,7 @@ def _set_semantic_label(self, semantic_label):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -742,6 +761,8 @@ def _set_semantic_label(self, semantic_label):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     def _get_units(self):
diff --git a/python/grass/pygrass/raster/category.py b/python/grass/pygrass/raster/category.py
index 8f92b1f80ae..5b989a8aa74 100644
--- a/python/grass/pygrass/raster/category.py
+++ b/python/grass/pygrass/raster/category.py
@@ -78,6 +78,7 @@ def __init__(self, name, mapset="", mtype="CELL", *args, **kargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -112,6 +113,8 @@ def __init__(self, name, mapset="", mtype="CELL", *args, **kargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         super().__init__(*args, **kargs)
 =======
@@ -131,6 +134,7 @@ def __init__(self, name, mapset="", mtype="CELL", *args, **kargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -178,6 +182,8 @@ def __init__(self, name, mapset="", mtype="CELL", *args, **kargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         super(Category, self).__init__(*args, **kargs)
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
@@ -265,6 +271,7 @@ def __setitem__(self, index, value):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         return super(Category, self).__setitem__(
             self._chk_index(index), self._chk_value(value)
@@ -309,6 +316,8 @@ def __setitem__(self, index, value):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         return super().__setitem__(self._chk_index(index), self._chk_value(value))
 =======
@@ -330,6 +339,7 @@ def __setitem__(self, index, value):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> e946d8e472 (Dockerfile: fix broken lib link (#1625))
 =======
@@ -358,6 +368,8 @@ def __setitem__(self, index, value):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         return super(Category, self).__setitem__(
             self._chk_index(index), self._chk_value(value)
@@ -377,6 +389,7 @@ def __setitem__(self, index, value):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -418,6 +431,8 @@ def __setitem__(self, index, value):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     def _get_c_cat(self, index):
@@ -588,6 +603,7 @@ def read_rules(self, filename, sep=":"):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -622,6 +638,8 @@ def read_rules(self, filename, sep=":"):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         """Copy categories from a rules file, default separator is ':', the
 =======
@@ -641,6 +659,7 @@ def read_rules(self, filename, sep=":"):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -688,6 +707,8 @@ def read_rules(self, filename, sep=":"):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         """Copy categories from a rules file, default separetor is ':', the
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
@@ -736,6 +757,7 @@ def write_rules(self, filename, sep=":"):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -770,6 +792,8 @@ def write_rules(self, filename, sep=":"):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         """Copy categories from a rules file, default separator is ':', the
 =======
@@ -789,6 +813,7 @@ def write_rules(self, filename, sep=":"):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -836,6 +861,8 @@ def write_rules(self, filename, sep=":"):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         """Copy categories from a rules file, default separetor is ':', the
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
diff --git a/python/grass/pygrass/vector/abstract.py b/python/grass/pygrass/vector/abstract.py
index 0978f5396eb..c143deed76b 100644
--- a/python/grass/pygrass/vector/abstract.py
+++ b/python/grass/pygrass/vector/abstract.py
@@ -444,6 +444,7 @@ def open(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     "The databse link for layer %d of <%s> references layer %d."
 =======
@@ -486,6 +487,8 @@ def open(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     "The database link for layer %d of <%s> references layer %d."
 =======
@@ -505,6 +508,7 @@ def open(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                     "The databse link for layer %d of <%s> references layer %d."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -587,6 +591,11 @@ def open(
 =======
                     "The databse link for layer %d of <%s> references layer %d."
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                    "The databse link for layer %d of <%s> references layer %d."
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     % (layer, self.name, layer_db_link.layer)
                 )
diff --git a/python/grass/pygrass/vector/geometry.py b/python/grass/pygrass/vector/geometry.py
index 8cfd7c3a469..6f7cdcb8858 100644
--- a/python/grass/pygrass/vector/geometry.py
+++ b/python/grass/pygrass/vector/geometry.py
@@ -1352,6 +1352,7 @@ class Boundary(Line):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1444,6 +1445,11 @@ class Boundary(Line):
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
 
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
     # geometry type
diff --git a/python/grass/pygrass/vector/table.py b/python/grass/pygrass/vector/table.py
index 10758b3848e..491042c8813 100644
--- a/python/grass/pygrass/vector/table.py
+++ b/python/grass/pygrass/vector/table.py
@@ -44,6 +44,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -136,6 +137,11 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 
 if sys.version_info.major >= 3:
diff --git a/python/grass/script/array.py b/python/grass/script/array.py
index 8983c28141d..272b722a03a 100644
--- a/python/grass/script/array.py
+++ b/python/grass/script/array.py
@@ -119,6 +119,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 import numpy as np
@@ -175,6 +176,11 @@
 <<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
+import numpy as np
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 from __future__ import absolute_import
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -186,6 +192,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
@@ -202,6 +209,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 from .utils import try_remove
 from . import core as gcore
diff --git a/python/grass/script/core.py b/python/grass/script/core.py
index 7eeafc72d76..23b5c9b813a 100644
--- a/python/grass/script/core.py
+++ b/python/grass/script/core.py
@@ -38,6 +38,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 (C) 2008-2023 by the GRASS Development Team
@@ -111,6 +112,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 (C) 2008-2024 by the GRASS Development Team
 =======
 (C) 2008-2021 by the GRASS Development Team
@@ -130,6 +133,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -153,6 +157,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 (C) 2008-2021 by the GRASS Development Team
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -173,6 +179,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -196,6 +203,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 (C) 2008-2022 by the GRASS Development Team
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -215,6 +224,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 (C) 2008-2023 by the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -340,6 +350,11 @@
 (C) 2008-2023 by the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+(C) 2008-2023 by the GRASS Development Team
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 This program is free software under the GNU General Public
 License (>=v2). Read the file COPYING that comes with GRASS
 for details.
@@ -386,6 +401,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -421,6 +437,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 from grass.grassdb.manage import resolve_mapset_path
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -440,6 +458,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -491,6 +510,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 # subprocess wrapper that uses shell on Windows
@@ -1169,6 +1190,7 @@ def debug(msg, debug=1):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1259,6 +1281,11 @@ def debug(msg, debug=1):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     """Display a debugging message using `g.message -d`.
 
@@ -1288,6 +1315,7 @@ def debug(msg, debug=1):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1322,6 +1350,8 @@ def debug(msg, debug=1):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     :param env: dictionary with system environment variables (`os.environ` by default)
 =======
@@ -1342,6 +1372,7 @@ def debug(msg, debug=1):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1392,6 +1423,8 @@ def debug(msg, debug=1):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     """
     if debug_level() >= debug:
@@ -1616,6 +1649,7 @@ def parser():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1690,6 +1724,10 @@ def parser():
 =======
     https://grass.osgeo.org/grass-devel/manuals/parser_standard_options.html
 =======
+>>>>>>> osgeo-main
+=======
+    https://grass.osgeo.org/grass-devel/manuals/parser_standard_options.html
+=======
 >>>>>>> osgeo-main
     https://grass.osgeo.org/grass80/manuals/parser_standard_options.html
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -1713,6 +1751,7 @@ def parser():
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     https://grass.osgeo.org/grass-devel/manuals/parser_standard_options.html
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1837,6 +1876,11 @@ def parser():
 =======
     https://grass.osgeo.org/grass-devel/manuals/parser_standard_options.html
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    https://grass.osgeo.org/grass-devel/manuals/parser_standard_options.html
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     """
     if not os.getenv("GISBASE"):
diff --git a/python/grass/script/db.py b/python/grass/script/db.py
index f6a583a302b..5666c757e74 100644
--- a/python/grass/script/db.py
+++ b/python/grass/script/db.py
@@ -38,6 +38,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -129,6 +130,11 @@
 =======
 >>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
+=======
+>>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
+>>>>>>> osgeo-main
 
 import os
 from .core import (
diff --git a/python/grass/script/raster.py b/python/grass/script/raster.py
index bcaab7ef596..54c1219dbaf 100644
--- a/python/grass/script/raster.py
+++ b/python/grass/script/raster.py
@@ -66,7 +66,7 @@ def raster_history(map, overwrite=False, env=None):
             "Unable to write history for <%(map)s>. "
             "Raster map <%(map)s> not found in current mapset."
         )
-        % {"map": map, "map": map}
+        % {"map": map}
     )
     return False
 
diff --git a/python/grass/script/setup.py b/python/grass/script/setup.py
index d9cb6147a75..9c44ade1e77 100644
--- a/python/grass/script/setup.py
+++ b/python/grass/script/setup.py
@@ -48,6 +48,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -110,6 +111,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     executable = "grass"
     if sys.platform.startswith("win"):
@@ -141,6 +144,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -170,6 +174,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
     grass8bin = 'grass'
@@ -204,6 +210,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 =======
@@ -324,6 +331,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # query GRASS GIS itself for its GISBASE
     startcmd = [grass8bin, '--config', 'path']
@@ -357,6 +366,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -385,6 +395,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     # query GRASS GIS itself for its Python package path
     grass_cmd = [executable, "--config", "python_path"]
@@ -404,6 +416,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -432,6 +445,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     # query GRASS GIS itself for its Python package path
     grass_cmd = [executable, "--config", "python_path"]
@@ -451,6 +466,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -498,6 +514,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     # define GRASS-Python environment
@@ -534,6 +552,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -608,6 +627,10 @@
 =======
     gs.message("Current GRASS GIS 8 environment:")
 =======
+>>>>>>> osgeo-main
+=======
+    gs.message("Current GRASS GIS 8 environment:")
+=======
 >>>>>>> osgeo-main
     gs.message('Current GRASS GIS 8 environment:')
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
@@ -631,6 +654,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     gs.message("Current GRASS GIS 8 environment:")
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -755,6 +779,11 @@
 =======
     gs.message("Current GRASS GIS 8 environment:")
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    gs.message("Current GRASS GIS 8 environment:")
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     print(gs.gisenv())
 
@@ -800,6 +829,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 (C) 2010-2023 by the GRASS Development Team
@@ -873,6 +903,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 (C) 2010-2024 by the GRASS Development Team
 =======
 (C) 2010-2021 by the GRASS Development Team
@@ -892,6 +924,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -915,6 +948,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 (C) 2010-2021 by the GRASS Development Team
 >>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -935,6 +970,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -958,6 +994,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 (C) 2010-2022 by the GRASS Development Team
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -977,6 +1015,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 (C) 2010-2023 by the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -1102,6 +1141,11 @@
 (C) 2010-2023 by the GRASS Development Team
 >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
 >>>>>>> osgeo-main
+=======
+=======
+(C) 2010-2023 by the GRASS Development Team
+>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
+>>>>>>> osgeo-main
 This program is free software under the GNU General Public
 License (>=v2). Read the file COPYING that comes with GRASS
 for details.
@@ -1166,6 +1210,7 @@ def get_install_path(path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
     The function tries to determine path tp GRASS GIS installation so that the
@@ -1323,6 +1368,8 @@ def setup_runtime_env(gisbase):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     The function tries to determine path tp GRASS GIS installation so that the
@@ -1583,6 +1630,7 @@ def init(path, location=None, mapset=None, *, grass_path=None, env=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1601,6 +1649,8 @@ def init(path, location=None, mapset=None, *, grass_path=None, env=None):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
 
     The function tries to determine path tp GRASS GIS installation so that the
@@ -1728,6 +1778,7 @@ def setup_runtime_env(gisbase):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1743,6 +1794,8 @@ def setup_runtime_env(gisbase):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     If *path* is not provided and no relevant environmental variables are set, the
@@ -1900,6 +1953,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
     Basic usage::
@@ -2590,6 +2644,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     Basic usage::
@@ -2658,6 +2714,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     # Set GRASS_PYTHON and PYTHONPATH to find GRASS Python modules
     if not os.getenv("GRASS_PYTHON"):
@@ -3148,6 +3205,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # TODO: lock the mapset?
     os.environ["GIS_LOCK"] = str(os.getpid())
@@ -3262,6 +3321,7 @@ def init(path, location=None, mapset=None, grass_path=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
     # TODO: lock the mapset?
@@ -3614,6 +3674,8 @@ def init(path, location=None, mapset=None, grass_path=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # TODO: lock the mapset?
     env["GIS_LOCK"] = str(os.getpid())
@@ -3643,6 +3705,7 @@ class SessionHandle:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 class SessionHandle:
     """Object used to manage GRASS sessions.
@@ -3704,6 +3767,9 @@ class SessionHandle:
 >>>>>>> osgeo-main
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     Do not create objects of this class directly. Use the *init* function
     to get a session object.
@@ -3776,6 +3842,7 @@ def active(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3816,6 +3883,8 @@ def active(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     @property
     def env(self):
@@ -3837,6 +3906,7 @@ def env(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3905,6 +3975,10 @@ def env(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     def __enter__(self):
         """Enter the context manager context.
diff --git a/python/grass/script/task.py b/python/grass/script/task.py
index f621687306d..535f57a090a 100644
--- a/python/grass/script/task.py
+++ b/python/grass/script/task.py
@@ -34,6 +34,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -69,6 +70,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 =======
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -88,6 +91,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -139,6 +143,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 import os
 import re
 import sys
@@ -154,6 +160,12 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+ETREE_EXCEPTIONS = (ET.ParseError, expat.ExpatError)
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 =======
 ETREE_EXCEPTIONS = (ET.ParseError, expat.ExpatError)
 =======
@@ -197,6 +209,10 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4bd0126b6c (pythonlib: Remove star imports (#1546))
+>>>>>>> osgeo-main
 =======
 >>>>>>> 4bd0126b6c (pythonlib: Remove star imports (#1546))
 >>>>>>> osgeo-main
diff --git a/python/grass/script/tests/test_script_task.py b/python/grass/script/tests/test_script_task.py
index 6799885761e..cae8735827e 100644
--- a/python/grass/script/tests/test_script_task.py
+++ b/python/grass/script/tests/test_script_task.py
@@ -1,11 +1,11 @@
-from grass.script.task import grassTask as gtask
+from grass.script.task import grassTask
 
 
 def test_mapcalc_simple_e_name():
-    gt = gtask("r.mapcalc.simple")
+    gt = grassTask("r.mapcalc.simple")
     assert gt.get_param("e")["name"] == "e"
 
 
 def test_mapcalc_simple_expession_name():
-    gt = gtask("r.mapcalc.simple")
+    gt = grassTask("r.mapcalc.simple")
     assert gt.get_param("expression")["name"] == "expression"
diff --git a/python/grass/script/testsuite/test_start_command_functions.py b/python/grass/script/testsuite/test_start_command_functions.py
index 5daa32e18d6..ca36ec6339c 100644
--- a/python/grass/script/testsuite/test_start_command_functions.py
+++ b/python/grass/script/testsuite/test_start_command_functions.py
@@ -119,6 +119,7 @@ def test_write_labels_unicode(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -209,6 +210,11 @@ def test_write_labels_unicode(self):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         self.assertIsInstance(res, str)
 
diff --git a/python/grass/script/vector.py b/python/grass/script/vector.py
index 4f44b5de4b4..3e693c03eb3 100644
--- a/python/grass/script/vector.py
+++ b/python/grass/script/vector.py
@@ -45,6 +45,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 from grass.exceptions import CalledModuleError, ScriptError
 =======
@@ -119,6 +120,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 
 from grass.exceptions import CalledModuleError, ScriptError
@@ -130,6 +133,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -146,6 +150,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 from grass.exceptions import CalledModuleError, ScriptError
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
diff --git a/python/grass/temporal/abstract_map_dataset.py b/python/grass/temporal/abstract_map_dataset.py
index e4207781f46..8f5f34daa1c 100644
--- a/python/grass/temporal/abstract_map_dataset.py
+++ b/python/grass/temporal/abstract_map_dataset.py
@@ -1022,6 +1022,7 @@ def delete(self, dbif=None, update=True, execute=True):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1114,6 +1115,11 @@ def delete(self, dbif=None, update=True, execute=True):
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
             # SELECT all needed information from the database
diff --git a/python/grass/temporal/abstract_space_time_dataset.py b/python/grass/temporal/abstract_space_time_dataset.py
index 4f433676e41..48628341396 100644
--- a/python/grass/temporal/abstract_space_time_dataset.py
+++ b/python/grass/temporal/abstract_space_time_dataset.py
@@ -43,6 +43,7 @@ class that is the base class for all space time datasets.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -74,6 +75,8 @@ class that is the base class for all space time datasets.
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     init_dbif,
 )
@@ -94,6 +97,9 @@ class that is the base class for all space time datasets.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -124,6 +130,7 @@ class that is the base class for all space time datasets.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -228,6 +235,9 @@ class that is the base class for all space time datasets.
 >>>>>>> 3309d04075 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 =======
+>>>>>>> 3309d04075 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> dad8f82179 (wxpyimgview: explicit conversion to int (#2704))
@@ -239,6 +249,7 @@ class that is the base class for all space time datasets.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 4f1b897788 (style(temporal): Sort and group imports (#3959))
@@ -267,6 +278,8 @@ class that is the base class for all space time datasets.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 )
 from .temporal_granularity import (
     check_granularity_string,
@@ -1651,6 +1664,7 @@ def get_registered_maps_as_objects_with_gaps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1691,6 +1705,8 @@ def get_registered_maps_as_objects_with_gaps(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :param spatial_extent: Spatial extent dict and projection information
             e.g. from g.region -ug3 with GRASS GIS region keys
@@ -1716,6 +1732,7 @@ def get_registered_maps_as_objects_with_gaps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -1784,6 +1801,10 @@ def get_registered_maps_as_objects_with_gaps(
 =======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
         :param spatial_extent: Return only maps with the provided spatial
                      relation to the given spatial extent (requires
@@ -1808,6 +1829,7 @@ def get_registered_maps_as_objects_with_gaps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -1898,6 +1920,11 @@ def get_registered_maps_as_objects_with_gaps(
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
 
         :return: ordered object list, in case nothing found None is returned
@@ -1985,6 +2012,7 @@ def get_registered_maps_as_objects_with_temporal_topology(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2025,6 +2053,8 @@ def get_registered_maps_as_objects_with_temporal_topology(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :param spatial_extent: Spatial extent dict and projection information
             e.g. from g.region -ug3 with GRASS GIS region keys
@@ -2050,6 +2080,7 @@ def get_registered_maps_as_objects_with_temporal_topology(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -2118,6 +2149,10 @@ def get_registered_maps_as_objects_with_temporal_topology(
 =======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
         :param spatial_extent: Return only maps with the provided spatial
                      relation to the given spatial extent (requires
@@ -2142,6 +2177,7 @@ def get_registered_maps_as_objects_with_temporal_topology(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -2232,6 +2268,11 @@ def get_registered_maps_as_objects_with_temporal_topology(
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
 
         :return: The ordered map object list,
@@ -2295,6 +2336,7 @@ def get_registered_maps_as_objects(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2335,6 +2377,8 @@ def get_registered_maps_as_objects(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :param spatial_extent: Spatial extent dict and projection information
             e.g. from g.region -ug3 with GRASS GIS region keys
@@ -2360,6 +2404,7 @@ def get_registered_maps_as_objects(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -2428,6 +2473,10 @@ def get_registered_maps_as_objects(
 =======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
         :param spatial_extent: Return only maps with the provided spatial
                      relation to the given spatial extent (requires
@@ -2452,6 +2501,7 @@ def get_registered_maps_as_objects(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -2542,6 +2592,11 @@ def get_registered_maps_as_objects(
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
 
         :return: The ordered map object list,
@@ -2583,6 +2638,7 @@ def get_registered_maps_as_objects(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         # use all columns
         rows = self.get_registered_maps(
@@ -2628,6 +2684,8 @@ def get_registered_maps_as_objects(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             # check keys in first row
             # note that 'if "bottom" in row' does not work
@@ -2688,6 +2746,7 @@ def get_registered_maps_as_objects(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -2711,6 +2770,8 @@ def get_registered_maps_as_objects(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
         # use all columns
 <<<<<<< HEAD
@@ -2728,6 +2789,7 @@ def get_registered_maps_as_objects(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -2755,6 +2817,8 @@ def get_registered_maps_as_objects(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         rows = self.get_registered_maps(
             None, where, order, dbif, spatial_extent, spatial_relation
@@ -2782,6 +2846,7 @@ def get_registered_maps_as_objects(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2856,6 +2921,8 @@ def get_registered_maps_as_objects(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         if rows is not None:
@@ -2988,6 +3055,7 @@ def leading_zero(value):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3078,6 +3146,11 @@ def leading_zero(value):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                         br="semantic_label",
                         si=shortcut_identifier,
@@ -3124,6 +3197,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         :param dict spatial_relation: Spatial relation to the provided
 =======
@@ -3166,6 +3240,8 @@ def _update_where_statement_by_spatial_extent(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :param str spatial_relation: Spatial relation to the provided
 =======
@@ -3185,6 +3261,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         :param dict spatial_relation: Spatial relation to the provided
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -3267,6 +3344,11 @@ def _update_where_statement_by_spatial_extent(
 =======
         :param dict spatial_relation: Spatial relation to the provided
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+        :param dict spatial_relation: Spatial relation to the provided
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
             spatial extent as a string with one of the following values:
             "overlaps": maps that spatially overlap ("intersect")
@@ -3296,6 +3378,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
              >>> _update_where_statement_by_spatial_extent(where, spatial_extent, "overlaps")
 =======
@@ -3338,6 +3421,8 @@ def _update_where_statement_by_spatial_extent(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
              >>> _update_where_statement_by_spatial_extent(
              ...     where, spatial_extent, "overlaps"
@@ -3359,6 +3444,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
              >>> _update_where_statement_by_spatial_extent(where, spatial_extent, "overlaps")
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -3441,6 +3527,11 @@ def _update_where_statement_by_spatial_extent(
 =======
              >>> _update_where_statement_by_spatial_extent(where, spatial_extent, "overlaps")
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+             >>> _update_where_statement_by_spatial_extent(where, spatial_extent, "overlaps")
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
              ((north > 0 AND south < 1 AND east > 0 AND west < 1))
         """
@@ -3473,6 +3564,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     "Only values 'overlaps', 'is_contained', and 'contains' are allowed."
 =======
@@ -3515,6 +3607,8 @@ def _update_where_statement_by_spatial_extent(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     "Only values 'overlaps', 'is_contained', and 'contains' are \
                         allowed."
@@ -3535,6 +3629,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                     "Only values 'overlaps', 'is_contained', and 'contains' are allowed."
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -3617,6 +3712,11 @@ def _update_where_statement_by_spatial_extent(
 =======
                     "Only values 'overlaps', 'is_contained', and 'contains' are allowed."
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+                    "Only values 'overlaps', 'is_contained', and 'contains' are allowed."
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
                 ).format(spatial_relation)
             )
@@ -3654,6 +3754,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 spatial_where_template += " AND top > {b}" " AND bottom < {t}"
 <<<<<<< HEAD
@@ -3718,6 +3819,9 @@ def _update_where_statement_by_spatial_extent(
 =======
                 spatial_where_template += " AND top > {b} AND bottom < {t}"
 >>>>>>> osgeo-main
+=======
+                spatial_where_template += " AND top > {b} AND bottom < {t}"
+>>>>>>> osgeo-main
 =======
                 spatial_where_template += " AND top > {b}" " AND bottom < {t}"
 <<<<<<< HEAD
@@ -3733,6 +3837,9 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -3760,6 +3867,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 spatial_where_template += " AND top >= {t}" " AND bottom <= {b}"
 =======
@@ -3920,6 +4028,9 @@ def _update_where_statement_by_spatial_extent(
 =======
                 spatial_where_template += " AND top >= {t} AND bottom <= {b}"
 >>>>>>> osgeo-main
+=======
+                spatial_where_template += " AND top >= {t} AND bottom <= {b}"
+>>>>>>> osgeo-main
 =======
                 spatial_where_template += " AND top >= {t}" " AND bottom <= {b}"
 =======
@@ -3940,6 +4051,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 7dcf663571 (r.horizon manual - fix typo (#2794))
 =======
 =======
@@ -3955,6 +4067,8 @@ def _update_where_statement_by_spatial_extent(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> 5247cc90df (r.horizon manual - fix typo (#2794))
@@ -3964,6 +4078,7 @@ def _update_where_statement_by_spatial_extent(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> dd6a87c0fa (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> osgeo-main
@@ -3981,6 +4096,8 @@ def _update_where_statement_by_spatial_extent(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         spatial_where_template += ")"
 
@@ -4053,6 +4170,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4080,6 +4198,8 @@ def get_registered_maps(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                       of the registered maps without "WHERE"
         :param group: The columns to be used in the SQL GROUP BY statement
@@ -4095,6 +4215,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4149,6 +4270,8 @@ def get_registered_maps(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                      of the registered maps without "WHERE"
         :param order: The SQL order statement to be used to order the
@@ -4167,6 +4290,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 08401a0a3a (r.horizon manual - fix typo (#2794))
 =======
 =======
@@ -4243,6 +4367,11 @@ def get_registered_maps(
 =======
 <<<<<<< HEAD
 >>>>>>> 17e5fe5619 (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+<<<<<<< HEAD
+>>>>>>> 17e5fe5619 (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
         :param spatial_extent: Spatial extent dict and projection information
             e.g. from g.region -ug3 with GRASS GIS region keys
@@ -4266,6 +4395,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4350,6 +4480,9 @@ def get_registered_maps(
 =======
         :param dbif: The database interface to be used
 >>>>>>> osgeo-main
+=======
+        :param dbif: The database interface to be used
+>>>>>>> osgeo-main
 =======
 =======
 =======
@@ -4362,6 +4495,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         :param dbif: The database interface to be used
 =======
@@ -4389,6 +4523,8 @@ def get_registered_maps(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :param spatial_extent: Return only maps with the provided spatial
                      relation to the given spatial extent (requires
@@ -4406,6 +4542,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4462,6 +4599,11 @@ def get_registered_maps(
 >>>>>>> ab7a7d8f0a (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
 =======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+<<<<<<< HEAD
+>>>>>>> ab7a7d8f0a (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> 17e5fe5619 (r.horizon manual - fix typo (#2794))
@@ -4475,6 +4617,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> osgeo-main
@@ -4525,6 +4668,8 @@ def get_registered_maps(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         :return: SQL rows of all registered maps grouped by the columns given in
@@ -4586,6 +4731,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4629,6 +4775,8 @@ def get_registered_maps(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             # filter by spatial extent
@@ -4650,6 +4798,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4677,6 +4826,8 @@ def get_registered_maps(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4691,6 +4842,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -4799,6 +4951,13 @@ def get_registered_maps(
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+
 <<<<<<< HEAD
 >>>>>>> osgeo-main
             sql = "SELECT %s FROM %s WHERE %s.id IN (SELECT id FROM %s)" % (
@@ -4825,6 +4984,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4902,6 +5062,8 @@ def get_registered_maps(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> ab7a7d8f0a (r.horizon manual - fix typo (#2794))
 =======
 <<<<<<< HEAD
@@ -4918,6 +5080,7 @@ def get_registered_maps(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4948,6 +5111,8 @@ def get_registered_maps(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             if where is not None and where != "":
@@ -5918,6 +6083,7 @@ def update_from_registered_maps(self, dbif=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -5958,6 +6124,8 @@ def update_from_registered_maps(self, dbif=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         # Comment out update of semantic labels for DB version < 3
         if get_tgis_db_version_from_metadata() < 3:
@@ -5982,6 +6150,7 @@ def update_from_registered_maps(self, dbif=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6021,6 +6190,8 @@ def update_from_registered_maps(self, dbif=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         elif old_sqlite_version and self.get_type() == "strds":
             semantic_label_sql = Path(
@@ -6043,6 +6214,7 @@ def update_from_registered_maps(self, dbif=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
@@ -6105,6 +6277,10 @@ def update_from_registered_maps(self, dbif=None):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         for version in range(3, get_tgis_db_version_from_metadata() + 1):
             sqlfile = os.path.join(
@@ -6132,6 +6308,7 @@ def update_from_registered_maps(self, dbif=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -6164,6 +6341,8 @@ def update_from_registered_maps(self, dbif=None):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> 196338e256 (wxpyimgview: explicit conversion to int (#2704))
@@ -6181,6 +6360,7 @@ def update_from_registered_maps(self, dbif=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -6245,6 +6425,8 @@ def update_from_registered_maps(self, dbif=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         sql = sql.replace("SPACETIME_REGISTER_TABLE", stds_register_table)
diff --git a/python/grass/temporal/c_libraries_interface.py b/python/grass/temporal/c_libraries_interface.py
index 806fd49bd05..21fec3850a1 100644
--- a/python/grass/temporal/c_libraries_interface.py
+++ b/python/grass/temporal/c_libraries_interface.py
@@ -40,6 +40,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -224,6 +225,10 @@
 from ctypes import CFUNCTYPE, POINTER, byref, c_int, c_void_p, cast
 >>>>>>> osgeo-main
 =======
+import sys
+from ctypes import CFUNCTYPE, POINTER, byref, c_int, c_void_p, cast
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 56010eb999 (pythonlib: Remove star imports (#1546))
 =======
@@ -241,6 +246,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -275,6 +281,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 from ctypes import byref, cast, c_char_p, c_int, c_void_p, CFUNCTYPE, POINTER
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
 <<<<<<< HEAD
@@ -284,6 +292,9 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -308,6 +319,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 56010eb999 (pythonlib: Remove star imports (#1546))
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -342,6 +354,9 @@
 >>>>>>> 56010eb999 (pythonlib: Remove star imports (#1546))
 >>>>>>> osgeo-main
 =======
+>>>>>>> 56010eb999 (pythonlib: Remove star imports (#1546))
+>>>>>>> osgeo-main
+=======
 =======
 from ctypes import byref, cast, c_int, c_void_p, CFUNCTYPE, POINTER
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -354,6 +369,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 2bf163e4b3 (libpython: Save and load benchmark results (#1711))
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -388,6 +404,9 @@
 >>>>>>> 2bf163e4b3 (libpython: Save and load benchmark results (#1711))
 >>>>>>> osgeo-main
 =======
+>>>>>>> 2bf163e4b3 (libpython: Save and load benchmark results (#1711))
+>>>>>>> osgeo-main
+=======
 =======
 from ctypes import byref, cast, c_int, c_void_p, CFUNCTYPE, POINTER
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -400,6 +419,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> dad8f82179 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -434,6 +454,9 @@
 >>>>>>> dad8f82179 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 =======
+>>>>>>> dad8f82179 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
 =======
 from ctypes import byref, cast, c_int, c_void_p, CFUNCTYPE, POINTER
 =======
@@ -449,6 +472,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> e2f520cfc3 (pythonlib: Remove star imports (#1546))
 =======
 import sys
@@ -488,6 +512,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 from datetime import datetime
 from multiprocessing import Lock, Pipe, Process
 
@@ -544,6 +570,7 @@ class RPCDefs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -578,6 +605,8 @@ class RPCDefs:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     READ_MAP_HISTORY = 18
 =======
@@ -598,6 +627,7 @@ class RPCDefs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -648,6 +678,8 @@ class RPCDefs:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     G_FATAL_ERROR = 49
 
@@ -1137,6 +1169,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1202,6 +1235,10 @@ def _read_semantic_label(lock, conn, data):
 =======
     Rast_read_semantic_label: either a semantic label string or None.
 =======
+>>>>>>> osgeo-main
+=======
+    Rast_read_semantic_label: either a semantic label string or None.
+=======
 >>>>>>> osgeo-main
     Rast_read_bandref: either a band reference string or None.
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -1225,6 +1262,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1302,6 +1340,8 @@ def _read_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     :param lock: A multiprocessing.Lock instance
@@ -1331,6 +1371,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1396,6 +1437,10 @@ def _read_semantic_label(lock, conn, data):
 =======
     semantic_label = None
 =======
+>>>>>>> osgeo-main
+=======
+    semantic_label = None
+=======
 >>>>>>> osgeo-main
     bandref = None
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -1419,6 +1464,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1496,6 +1542,8 @@ def _read_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     try:
         maptype = data[1]
@@ -1527,6 +1575,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1575,6 +1624,8 @@ def _read_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             ret = libraster.Rast_read_semantic_label(name, mapset)
             if ret:
@@ -1597,6 +1648,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1635,6 +1687,8 @@ def _read_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             ret = libraster.Rast_read_bandref(name, mapset)
             if ret:
@@ -1654,6 +1708,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1682,6 +1737,8 @@ def _read_semantic_label(lock, conn, data):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             ret = libraster.Rast_read_semantic_label(name, mapset)
             if ret:
@@ -1701,6 +1758,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1729,6 +1787,8 @@ def _read_semantic_label(lock, conn, data):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             ret = libraster.Rast_read_semantic_label(name, mapset)
             if ret:
@@ -1748,6 +1808,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1799,6 +1860,8 @@ def _read_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         else:
             logging.error(
@@ -1830,6 +1893,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1895,6 +1959,10 @@ def _read_semantic_label(lock, conn, data):
 =======
         conn.send(semantic_label)
 =======
+>>>>>>> osgeo-main
+=======
+        conn.send(semantic_label)
+=======
 >>>>>>> osgeo-main
         conn.send(bandref)
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -1918,6 +1986,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1996,6 +2065,8 @@ def _read_semantic_label(lock, conn, data):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
 ###############################################################################
@@ -2022,6 +2093,7 @@ def _read_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2071,6 +2143,8 @@ def _read_semantic_label(lock, conn, data):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def _write_semantic_label(lock, conn, data):
     """Write the file based GRASS band identifier.
 
@@ -2093,6 +2167,7 @@ def _write_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2133,6 +2208,8 @@ def _write_semantic_label(lock, conn, data):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 def _write_band_reference(lock, conn, data):
     """Write the file based GRASS band identifier.
 
@@ -2152,6 +2229,7 @@ def _write_band_reference(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2181,6 +2259,8 @@ def _write_band_reference(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 def _write_semantic_label(lock, conn, data):
     """Write the file based GRASS band identifier.
 
@@ -2200,6 +2280,7 @@ def _write_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2229,6 +2310,8 @@ def _write_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 def _write_semantic_label(lock, conn, data):
     """Write the file based GRASS band identifier.
 
@@ -2248,6 +2331,7 @@ def _write_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2295,6 +2379,8 @@ def _write_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     Always sends back True.
 
@@ -2330,6 +2416,7 @@ def _write_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2414,6 +2501,10 @@ def _write_semantic_label(lock, conn, data):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         semantic_label = data[5]
 
@@ -2437,6 +2528,7 @@ def _write_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2493,6 +2585,9 @@ def _write_semantic_label(lock, conn, data):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         bandref = data[5]
 
@@ -2515,6 +2610,7 @@ def _write_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2543,6 +2639,8 @@ def _write_semantic_label(lock, conn, data):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         semantic_label = data[5]
 
@@ -2565,6 +2663,7 @@ def _write_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2629,6 +2728,8 @@ def _write_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
         else:
             logging.error(
@@ -2666,6 +2767,7 @@ def _write_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2732,6 +2834,10 @@ def _remove_semantic_label(lock, conn, data):
 def _remove_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
+=======
+def _remove_semantic_label(lock, conn, data):
+=======
+>>>>>>> osgeo-main
 def _remove_band_reference(lock, conn, data):
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
 =======
@@ -2754,6 +2860,7 @@ def _remove_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2831,6 +2938,8 @@ def _remove_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     """Remove the file based GRASS band identifier.
 
@@ -2871,6 +2980,7 @@ def _remove_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2936,6 +3046,10 @@ def _remove_semantic_label(lock, conn, data):
 =======
             check = libgis.G_remove_misc("cell_misc", "semantic_label", name)
 =======
+>>>>>>> osgeo-main
+=======
+            check = libgis.G_remove_misc("cell_misc", "semantic_label", name)
+=======
 >>>>>>> osgeo-main
             check = libgis.G_remove_misc("cell_misc", "bandref", name)
 >>>>>>> da7f79c3f9 (libpython: Save and load benchmark results (#1711))
@@ -2959,6 +3073,7 @@ def _remove_semantic_label(lock, conn, data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3040,6 +3155,8 @@ def _remove_semantic_label(lock, conn, data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         else:
             logging.error(
@@ -3180,6 +3297,7 @@ def _read_raster_info(name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             logging.warning(_("Raster range file is empty"))
 =======
@@ -3222,6 +3340,8 @@ def _read_raster_info(name, mapset):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             logging.info(_("Raster range file is empty"))
 =======
@@ -3241,6 +3361,7 @@ def _read_raster_info(name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             logging.warning(_("Raster range file is empty"))
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3323,6 +3444,11 @@ def _read_raster_info(name, mapset):
 =======
             logging.warning(_("Raster range file is empty"))
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            logging.warning(_("Raster range file is empty"))
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             kvp["min"] = None
             kvp["max"] = None
@@ -3357,6 +3483,7 @@ def _read_raster_info(name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             logging.warning(_("Raster range file is empty"))
 =======
@@ -3399,6 +3526,8 @@ def _read_raster_info(name, mapset):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             logging.info(_("Raster range file is empty"))
 =======
@@ -3418,6 +3547,7 @@ def _read_raster_info(name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             logging.warning(_("Raster range file is empty"))
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3500,6 +3630,11 @@ def _read_raster_info(name, mapset):
 =======
             logging.warning(_("Raster range file is empty"))
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            logging.warning(_("Raster range file is empty"))
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             kvp["min"] = None
             kvp["max"] = None
@@ -4004,6 +4139,7 @@ def error_handler(data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -4038,6 +4174,8 @@ def error_handler(data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     functions[RPCDefs.READ_MAP_HISTORY] = _read_map_history
 =======
@@ -4058,6 +4196,7 @@ def error_handler(data):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4108,6 +4247,8 @@ def error_handler(data):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     functions[RPCDefs.G_FATAL_ERROR] = _fatal_error
 
@@ -4516,6 +4657,7 @@ def write_raster_timestamp(self, name, mapset, timestring):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4595,6 +4737,11 @@ def remove_raster_semantic_label(self, name, mapset):
     def remove_raster_semantic_label(self, name, mapset):
         """Remove a file based raster semantic label
 =======
+>>>>>>> osgeo-main
+=======
+    def remove_raster_semantic_label(self, name, mapset):
+        """Remove a file based raster semantic label
+=======
 >>>>>>> osgeo-main
     def remove_raster_band_reference(self, name, mapset):
         """Remove a file based raster band reference
@@ -4621,6 +4768,7 @@ def remove_raster_semantic_label(self, name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4705,6 +4853,8 @@ def remove_raster_band_reference(self, name, mapset):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         :param name: The name of the map
@@ -4741,6 +4891,7 @@ def read_raster_semantic_label(self, name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4825,6 +4976,10 @@ def read_raster_semantic_label(self, name, mapset):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         Returns semantic label or None
 
@@ -4847,6 +5002,7 @@ def read_raster_semantic_label(self, name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4903,6 +5059,9 @@ def read_raster_semantic_label(self, name, mapset):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         Returns band reference or None
 
@@ -4924,6 +5083,7 @@ def read_raster_semantic_label(self, name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4952,6 +5112,8 @@ def read_raster_semantic_label(self, name, mapset):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         Returns semantic label or None
 
@@ -4973,6 +5135,7 @@ def read_raster_semantic_label(self, name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -5047,6 +5210,10 @@ def read_raster_semantic_label(self, name, mapset):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         """
         self.check_server()
@@ -5076,6 +5243,7 @@ def read_raster_semantic_label(self, name, mapset):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5160,6 +5328,10 @@ def read_raster_semantic_label(self, name, mapset):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     def write_raster_semantic_label(self, name, mapset, semantic_label):
         """Write a file based raster semantic label
@@ -5186,6 +5358,7 @@ def write_raster_semantic_label(self, name, mapset, semantic_label):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5232,6 +5405,9 @@ def write_raster_semantic_label(self, name, mapset, semantic_label):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     def write_raster_band_reference(self, name, mapset, band_reference):
         """Write a file based raster band reference
@@ -5267,6 +5443,7 @@ def write_raster_semantic_label(self, name, mapset, semantic_label):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5374,6 +5551,8 @@ def write_raster_semantic_label(self, name, mapset, semantic_label):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         :returns: always True
         """
diff --git a/python/grass/temporal/list_stds.py b/python/grass/temporal/list_stds.py
index 41c0b6321a2..58bf99df7c8 100644
--- a/python/grass/temporal/list_stds.py
+++ b/python/grass/temporal/list_stds.py
@@ -281,6 +281,7 @@ def _write_table(rows, column_names, output_format, separator, file):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         # No particular reason for this separator expect that this is the original behavior.
 =======
@@ -323,6 +324,8 @@ def _write_table(rows, column_names, output_format, separator, file):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         # No particular reason for this separator except that this is the original
         # behavior.
@@ -343,6 +346,7 @@ def _write_table(rows, column_names, output_format, separator, file):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         # No particular reason for this separator expect that this is the original behavior.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -425,6 +429,11 @@ def _write_table(rows, column_names, output_format, separator, file):
 =======
         # No particular reason for this separator expect that this is the original behavior.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        # No particular reason for this separator expect that this is the original behavior.
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         if not separator:
             separator = "\t"
@@ -494,6 +503,7 @@ def _get_get_registered_maps_as_objects_delta_gran(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -531,6 +541,8 @@ def _get_get_registered_maps_as_objects_delta_gran(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -550,6 +562,7 @@ def _get_get_registered_maps_as_objects_delta_gran(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -600,6 +613,8 @@ def _get_get_registered_maps_as_objects_delta_gran(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if isinstance(map_object, list):
             if len(map_object) > 0:
@@ -759,6 +774,7 @@ def check_columns(column_names, output_format, element_type):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -799,6 +815,8 @@ def check_columns(column_names, output_format, element_type):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     detail=(
                         _(
@@ -823,6 +841,7 @@ def check_columns(column_names, output_format, element_type):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -891,6 +910,10 @@ def check_columns(column_names, output_format, element_type):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     detail=_(
                         "Dataset is empty or where clause is too constrained or incorrect"
@@ -914,6 +937,7 @@ def check_columns(column_names, output_format, element_type):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1004,6 +1028,11 @@ def check_columns(column_names, output_format, element_type):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 )
             )
diff --git a/python/grass/temporal/metadata.py b/python/grass/temporal/metadata.py
index df3a03ba9f6..696b0e0f4aa 100644
--- a/python/grass/temporal/metadata.py
+++ b/python/grass/temporal/metadata.py
@@ -399,6 +399,7 @@ def __init__(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if get_tgis_db_version_from_metadata() > 2:
             self.set_semantic_label(semantic_label)
@@ -441,6 +442,8 @@ def __init__(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     def set_semantic_label(self, semantic_label):
         """Set the semantic label identifier"""
@@ -463,6 +466,7 @@ def set_semantic_label(self, semantic_label):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -502,6 +506,8 @@ def set_semantic_label(self, semantic_label):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if get_tgis_db_version_from_metadata() > 2:
             self.set_semantic_label(semantic_label)
@@ -525,6 +531,7 @@ def set_semantic_label(self, semantic_label):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -553,6 +560,8 @@ def set_semantic_label(self, semantic_label):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         if get_tgis_db_version_from_metadata() > 2:
             self.set_semantic_label(semantic_label)
@@ -576,6 +585,7 @@ def set_semantic_label(self, semantic_label):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -617,6 +627,8 @@ def set_semantic_label(self, semantic_label):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     def get_semantic_label(self):
         """Get the semantic label identifier
diff --git a/python/grass/temporal/register.py b/python/grass/temporal/register.py
index 46092cd1d79..9dd6bb0a637 100644
--- a/python/grass/temporal/register.py
+++ b/python/grass/temporal/register.py
@@ -101,6 +101,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -135,6 +136,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     overwrite = gs.overwrite()
 =======
@@ -155,6 +158,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -205,6 +209,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     msgr = get_tgis_message_interface()
@@ -272,6 +278,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -299,6 +306,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # create new stds only in the current mapset
     # remove all connections to any other mapsets
@@ -321,6 +330,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -368,6 +378,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # The name of the space time dataset is optional
     if name:
@@ -480,6 +492,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -570,6 +583,11 @@ def register_maps_in_space_time_dataset(
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             if semantic_label_in_file:
                 idx = 3 if end_time_in_file else 2
@@ -593,6 +611,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -627,6 +646,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             row["id"] = AbstractMapDataset.build_id_from_search_path(mapname, type)
 =======
@@ -646,6 +667,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -693,6 +715,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             map_mapset = mapset
             if "@" not in mapname:
@@ -717,6 +741,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -807,6 +832,11 @@ def register_maps_in_space_time_dataset(
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
             maplist.append(row)
@@ -878,6 +908,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if "semantic_label" in maplist[count]:
             semantic_label = maplist[count]["semantic_label"]
@@ -921,6 +952,13 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
+        semantic_label = row.get("semantic_label", None)
+=======
+=======
+>>>>>>> 819790960a (wxpyimgview: explicit conversion to int (#2704))
+<<<<<<< HEAD
 >>>>>>> osgeo-main
         if "semantic_label" in row:
             semantic_label = row["semantic_label"]
@@ -942,6 +980,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -970,6 +1009,8 @@ def register_maps_in_space_time_dataset(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         if "semantic_label" in maplist[count]:
             semantic_label = maplist[count]["semantic_label"]
@@ -988,6 +1029,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1029,9 +1071,12 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         else:
             semantic_label = None
+>>>>>>> 6b3f525ed2 (wxpyimgview: explicit conversion to int (#2704))
 
         is_in_db = map_object.is_in_db(dbif, mapset)
 
@@ -1052,6 +1097,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if not map.is_in_db(dbif, mapset):
 =======
@@ -1094,6 +1140,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if not is_in_db:
 =======
@@ -1113,6 +1161,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if not map.is_in_db(dbif, mapset):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1195,6 +1244,11 @@ def register_maps_in_space_time_dataset(
 =======
         if not map.is_in_db(dbif, mapset):
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if not map.is_in_db(dbif, mapset):
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             # Break in case no valid time is provided
             if (start == "" or start is None) and not map_object.has_grass_timestamp():
@@ -1344,6 +1398,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             map.set_semantic_label(semantic_label)
         else:
@@ -1389,6 +1444,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             map_object.set_semantic_label(semantic_label)
         else:
@@ -1414,6 +1471,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1442,6 +1500,8 @@ def register_maps_in_space_time_dataset(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             map.set_semantic_label(semantic_label)
         else:
@@ -1462,6 +1522,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1503,6 +1564,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         if is_in_db:
@@ -1549,6 +1612,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1583,6 +1647,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         for count, map_object in enumerate(map_object_list):
 =======
@@ -1602,6 +1668,7 @@ def register_maps_in_space_time_dataset(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1649,6 +1716,8 @@ def register_maps_in_space_time_dataset(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         for map in map_object_list:
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
diff --git a/python/grass/temporal/space_time_datasets.py b/python/grass/temporal/space_time_datasets.py
index f4e2323d90a..2d87b246e02 100644
--- a/python/grass/temporal/space_time_datasets.py
+++ b/python/grass/temporal/space_time_datasets.py
@@ -369,6 +369,7 @@ def read_semantic_label_from_grass(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         set the internal semantic label that should be insert/updated
 =======
@@ -411,6 +412,8 @@ def read_semantic_label_from_grass(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         set the internal semantic label that should be inserted/updated
 =======
@@ -430,6 +433,7 @@ def read_semantic_label_from_grass(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         set the internal semantic label that should be insert/updated
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -512,6 +516,11 @@ def read_semantic_label_from_grass(self):
 =======
         set the internal semantic label that should be insert/updated
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        set the internal semantic label that should be insert/updated
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         in the temporal database.
 
@@ -540,6 +549,7 @@ def read_semantic_label_from_grass(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -624,6 +634,10 @@ def read_semantic_label_from_grass(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         semantic_label = self.ciface.read_raster_semantic_label(
             self.get_name(), self.get_mapset()
@@ -646,6 +660,7 @@ def read_semantic_label_from_grass(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -702,6 +717,9 @@ def read_semantic_label_from_grass(self):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         band_ref = self.ciface.read_raster_band_reference(
             self.get_name(), self.get_mapset()
@@ -723,6 +741,7 @@ def read_semantic_label_from_grass(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -751,6 +770,8 @@ def read_semantic_label_from_grass(self):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         semantic_label = self.ciface.read_raster_semantic_label(
             self.get_name(), self.get_mapset()
@@ -772,6 +793,7 @@ def read_semantic_label_from_grass(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -846,6 +868,10 @@ def read_semantic_label_from_grass(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             return False
 
@@ -954,6 +980,7 @@ def load(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1038,6 +1065,10 @@ def load(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             # Fill semantic label if defined
             semantic_label = self.ciface.read_raster_semantic_label(
@@ -1061,6 +1092,7 @@ def load(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1117,6 +1149,9 @@ def load(self):
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
             # Fill band reference if defined
             band_ref = self.ciface.read_raster_band_reference(
@@ -1139,6 +1174,7 @@ def load(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1167,6 +1203,8 @@ def load(self):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             # Fill semantic label if defined
             semantic_label = self.ciface.read_raster_semantic_label(
@@ -1189,6 +1227,7 @@ def load(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1263,6 +1302,10 @@ def load(self):
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
             return True
diff --git a/python/grass/temporal/temporal_granularity.py b/python/grass/temporal/temporal_granularity.py
index 8acf8fc2157..aa30cadd1b6 100644
--- a/python/grass/temporal/temporal_granularity.py
+++ b/python/grass/temporal/temporal_granularity.py
@@ -29,6 +29,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 240dcc86f4 (pythonlib: Remove star imports (#1546))
@@ -60,6 +61,9 @@
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 from .datetime_math import compute_datetime_delta
 from .abstract_map_dataset import AbstractMapDataset
 =======
@@ -82,6 +86,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
@@ -137,6 +142,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 3fce2ed438 (pythonlib: Remove star imports (#1546))
 =======
 >>>>>>> 7e8f036e2d (pythonlib: Remove star imports (#1546))
@@ -150,6 +157,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 240dcc86f4 (pythonlib: Remove star imports (#1546))
 =======
 <<<<<<< HEAD
@@ -184,6 +192,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 import ast
 from collections import OrderedDict
 from functools import reduce
diff --git a/python/grass/temporal/testsuite/unittests_temporal_algebra.py b/python/grass/temporal/testsuite/unittests_temporal_algebra.py
index dc2ef2b5f52..79950533bb5 100644
--- a/python/grass/temporal/testsuite/unittests_temporal_algebra.py
+++ b/python/grass/temporal/testsuite/unittests_temporal_algebra.py
@@ -143,6 +143,7 @@ def test_temporal_select1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -183,6 +184,8 @@ def test_temporal_select1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -203,6 +206,7 @@ def test_temporal_select1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -271,6 +275,10 @@ def test_temporal_select1(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(expression="R = A : A", stdstype="strds", basename="r", overwrite=True)
@@ -307,6 +315,7 @@ def test_temporal_select2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -347,6 +356,8 @@ def test_temporal_select2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -367,6 +378,7 @@ def test_temporal_select2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -435,6 +447,10 @@ def test_temporal_select2(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(expression="R = A : D", stdstype="strds", basename="r", overwrite=True)
@@ -471,6 +487,7 @@ def test_temporal_select3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -505,6 +522,8 @@ def test_temporal_select3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -525,6 +544,7 @@ def test_temporal_select3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -575,6 +595,8 @@ def test_temporal_select3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -613,6 +635,7 @@ def test_temporal_select_operators1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -647,6 +670,8 @@ def test_temporal_select_operators1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -667,6 +692,7 @@ def test_temporal_select_operators1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -717,6 +743,8 @@ def test_temporal_select_operators1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -758,6 +786,7 @@ def test_temporal_select_operators2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -792,6 +821,8 @@ def test_temporal_select_operators2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -812,6 +843,7 @@ def test_temporal_select_operators2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -862,6 +894,8 @@ def test_temporal_select_operators2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -982,6 +1016,7 @@ def test_temporal_extent1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1016,6 +1051,8 @@ def test_temporal_extent1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -1036,6 +1073,7 @@ def test_temporal_extent1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1086,6 +1124,8 @@ def test_temporal_extent1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -1127,6 +1167,7 @@ def test_temporal_extent2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1161,6 +1202,8 @@ def test_temporal_extent2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -1181,6 +1224,7 @@ def test_temporal_extent2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1231,6 +1275,8 @@ def test_temporal_extent2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -1272,6 +1318,7 @@ def test_temporal_extent3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1306,6 +1353,8 @@ def test_temporal_extent3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -1326,6 +1375,7 @@ def test_temporal_extent3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1376,6 +1426,8 @@ def test_temporal_extent3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -1422,6 +1474,7 @@ def test_temporal_hash1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1456,6 +1509,8 @@ def test_temporal_hash1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -1476,6 +1531,7 @@ def test_temporal_hash1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1526,6 +1582,8 @@ def test_temporal_hash1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -1567,6 +1625,7 @@ def test_temporal_hash_operator1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1601,6 +1660,8 @@ def test_temporal_hash_operator1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -1621,6 +1682,7 @@ def test_temporal_hash_operator1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1671,6 +1733,8 @@ def test_temporal_hash_operator1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -1712,6 +1776,7 @@ def test_temporal_hash_operator2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1746,6 +1811,8 @@ def test_temporal_hash_operator2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -1766,6 +1833,7 @@ def test_temporal_hash_operator2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1816,6 +1884,8 @@ def test_temporal_hash_operator2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -1857,6 +1927,7 @@ def test_tmap_function1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1891,6 +1962,8 @@ def test_tmap_function1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -1911,6 +1984,7 @@ def test_tmap_function1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1961,6 +2035,8 @@ def test_tmap_function1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -2002,6 +2078,7 @@ def test_tmap_function2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2036,6 +2113,8 @@ def test_tmap_function2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -2056,6 +2135,7 @@ def test_tmap_function2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2106,6 +2186,8 @@ def test_tmap_function2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -2147,6 +2229,7 @@ def test_merge_function1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2181,6 +2264,8 @@ def test_merge_function1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -2201,6 +2286,7 @@ def test_merge_function1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2251,6 +2337,8 @@ def test_merge_function1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -2289,6 +2377,7 @@ def test_merge_function2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2323,6 +2412,8 @@ def test_merge_function2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(run=True, debug=True)
         temporal_algebra_parser.parse(
@@ -2343,6 +2434,7 @@ def test_merge_function2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2393,6 +2485,8 @@ def test_merge_function2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=True)
         ta.parse(
@@ -2542,6 +2636,7 @@ def test_merge_function1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2582,6 +2677,8 @@ def test_merge_function1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(
             run=True, debug=False, dry_run=True
@@ -2602,6 +2699,7 @@ def test_merge_function1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -2670,6 +2768,10 @@ def test_merge_function1(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=False, dry_run=True)
         pc = ta.parse(
@@ -2703,6 +2805,7 @@ def test_merge_function2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2743,6 +2846,8 @@ def test_merge_function2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(
             run=True, debug=False, dry_run=True
@@ -2763,6 +2868,7 @@ def test_merge_function2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -2831,6 +2937,10 @@ def test_merge_function2(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=False, dry_run=True)
         pc = ta.parse(
@@ -2864,6 +2974,7 @@ def test_merge_function3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2904,6 +3015,8 @@ def test_merge_function3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(
             run=True, debug=False, dry_run=True
@@ -2924,6 +3037,7 @@ def test_merge_function3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -2992,6 +3106,10 @@ def test_merge_function3(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=False, dry_run=True)
         pc = ta.parse(
@@ -3025,6 +3143,7 @@ def test_shift1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3065,6 +3184,8 @@ def test_shift1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(
             run=True, debug=False, dry_run=True
@@ -3085,6 +3206,7 @@ def test_shift1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -3153,6 +3275,10 @@ def test_shift1(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=False, dry_run=True)
         pc = ta.parse(
@@ -3186,6 +3312,7 @@ def test_shift2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3226,6 +3353,8 @@ def test_shift2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(
             run=True, debug=False, dry_run=True
@@ -3246,6 +3375,7 @@ def test_shift2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -3314,6 +3444,10 @@ def test_shift2(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=False, dry_run=True)
         pc = ta.parse(
@@ -3347,6 +3481,7 @@ def test_buffer1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3387,6 +3522,8 @@ def test_buffer1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(
             run=True, debug=False, dry_run=True
@@ -3407,6 +3544,7 @@ def test_buffer1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -3475,6 +3613,10 @@ def test_buffer1(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=False, dry_run=True)
         pc = ta.parse(
@@ -3508,6 +3650,7 @@ def test_buff2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3548,6 +3691,8 @@ def test_buff2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         temporal_algebra_parser = tgis.TemporalAlgebraParser(
             run=True, debug=False, dry_run=True
@@ -3568,6 +3713,7 @@ def test_buff2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -3636,6 +3782,10 @@ def test_buff2(self):
 =======
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
         ta = tgis.TemporalAlgebraParser(run=True, debug=False, dry_run=True)
         pc = ta.parse(
diff --git a/python/grass/temporal/univar_statistics.py b/python/grass/temporal/univar_statistics.py
index 5a37ff24b32..e726c478932 100755
--- a/python/grass/temporal/univar_statistics.py
+++ b/python/grass/temporal/univar_statistics.py
@@ -48,6 +48,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -139,6 +140,11 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 from .core import SQLDatabaseInterfaceConnection, get_current_mapset
 from .factory import dataset_factory
@@ -160,6 +166,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 import grass.script as gs
 from grass.pygrass.modules import Module
 =======
@@ -204,6 +211,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 import grass.script as gs
 from grass.pygrass.modules import Module
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -221,6 +230,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -250,6 +260,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 import grass.script as gs
 from grass.pygrass.modules import Module
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -267,6 +279,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -309,6 +322,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 ###############################################################################
 
@@ -330,6 +345,7 @@ def compute_univar_stats(registered_map_info, stats_module, fs, rast_region=Fals
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     """Compute univariate statistics for a map of a space time raster or raster3d dataset
 
@@ -344,6 +360,8 @@ def compute_univar_stats(registered_map_info, stats_module, fs, rast_region=Fals
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     """Compute univariate statistics for a map of a space time raster or raster3d
     dataset
@@ -365,6 +383,9 @@ def compute_univar_stats(registered_map_info, stats_module, fs, rast_region=Fals
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -612,6 +633,7 @@ def print_gridded_dataset_univar_statistics(
         string += f'{fs}{stats["n"]}'
         if "median" in stats:
             string += f'{fs}{stats["first_quartile"]}{fs}{stats["median"]}'
+<<<<<<< HEAD
 <<<<<<< HEAD
             string += f'{fs}{stats["third_quartile"]}{fs}{stats["percentile_90"]}'
         string += eol
@@ -2439,13 +2461,15 @@ def print_gridded_dataset_univar_statistics(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             string += f'{fs}{stats["third_quartile"]}'
             if stats_module.inputs.percentile:
                 for perc in stats_module.inputs.percentile:
                     perc_value = stats[
                         "percentile_"
-                        f"{str(perc).rstrip('0').rstrip('.').replace('.','_')}"
+                        f"{str(perc).rstrip('0').rstrip('.').replace('.', '_')}"
                     ]
                     string += f"{fs}{perc_value}"
         string += eol
@@ -2506,6 +2530,7 @@ def print_gridded_dataset_univar_statistics(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2574,6 +2599,10 @@ def print_gridded_dataset_univar_statistics(
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     # We need a database interface
     dbif = SQLDatabaseInterfaceConnection()
@@ -2600,6 +2629,7 @@ def print_gridded_dataset_univar_statistics(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     strds_cols = (
         "id,start_time,end_time,semantic_label"
@@ -2648,6 +2678,8 @@ def print_gridded_dataset_univar_statistics(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     spatial_extent = None
     if region_relation:
@@ -2699,6 +2731,7 @@ def print_gridded_dataset_univar_statistics(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2727,6 +2760,8 @@ def print_gridded_dataset_univar_statistics(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     strds_cols = (
         "id,start_time,end_time,semantic_label"
@@ -2750,6 +2785,7 @@ def print_gridded_dataset_univar_statistics(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2791,6 +2827,8 @@ def print_gridded_dataset_univar_statistics(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if not rows and rows != [""]:
         dbif.close()
@@ -2846,6 +2884,7 @@ def print_gridded_dataset_univar_statistics(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             cols.extend(["first_quartile", "median", "third_quartile", "percentile_90"])
 =======
@@ -2888,13 +2927,15 @@ def print_gridded_dataset_univar_statistics(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             cols.extend(["first_quartile", "median", "third_quartile"])
             if percentile:
                 cols.extend(
                     [
                         "percentile_"
-                        f"{str(perc).rstrip('0').rstrip('.').replace('.','_')}"
+                        f"{str(perc).rstrip('0').rstrip('.').replace('.', '_')}"
                         for perc in percentile
                     ]
                 )
@@ -2915,6 +2956,7 @@ def print_gridded_dataset_univar_statistics(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             cols.extend(["first_quartile", "median", "third_quartile", "percentile_90"])
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2997,6 +3039,11 @@ def print_gridded_dataset_univar_statistics(
 =======
             cols.extend(["first_quartile", "median", "third_quartile", "percentile_90"])
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            cols.extend(["first_quartile", "median", "third_quartile", "percentile_90"])
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         string = fs.join(cols)
 
@@ -3034,6 +3081,7 @@ def print_gridded_dataset_univar_statistics(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3068,6 +3116,8 @@ def print_gridded_dataset_univar_statistics(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         percentile=percentile,
 =======
@@ -3088,6 +3138,7 @@ def print_gridded_dataset_univar_statistics(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3138,6 +3189,8 @@ def print_gridded_dataset_univar_statistics(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         stdout_=PIPE,
         run_=False,
diff --git a/python/grass/utils/download.py b/python/grass/utils/download.py
index f9bf5171f8a..4dd45809a42 100644
--- a/python/grass/utils/download.py
+++ b/python/grass/utils/download.py
@@ -46,6 +46,7 @@ def debug(*args, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     # Lazy import to avoding potential circular dependency.
 =======
@@ -88,6 +89,8 @@ def debug(*args, **kwargs):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # Lazy import to avoiding potential circular dependency.
 =======
@@ -107,6 +110,7 @@ def debug(*args, **kwargs):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     # Lazy import to avoding potential circular dependency.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -189,6 +193,11 @@ def debug(*args, **kwargs):
 =======
     # Lazy import to avoding potential circular dependency.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    # Lazy import to avoding potential circular dependency.
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     import grass.script as gs  # pylint: disable=import-outside-toplevel
 
@@ -227,6 +236,7 @@ def extract_tar(name, directory, tmpdir):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         tar.extractall(path=extract_dir)
 =======
@@ -269,6 +279,8 @@ def extract_tar(name, directory, tmpdir):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         # Extraction filters were added in Python 3.12,
@@ -302,6 +314,7 @@ def extract_tar(name, directory, tmpdir):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         tar.extractall(path=extract_dir)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -384,6 +397,11 @@ def extract_tar(name, directory, tmpdir):
 =======
         tar.extractall(path=extract_dir)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        tar.extractall(path=extract_dir)
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         files = os.listdir(extract_dir)
         _move_extracted_files(
diff --git a/python/libgrass_interface_generator/Makefile b/python/libgrass_interface_generator/Makefile
index a767049884e..de05c922427 100644
--- a/python/libgrass_interface_generator/Makefile
+++ b/python/libgrass_interface_generator/Makefile
@@ -61,6 +61,7 @@ imagery_HDRS    = imagery.h defs/imagery.h
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -136,6 +137,10 @@ vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h v
 vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h vect/dig_externs.h
 =======
 >>>>>>> osgeo-main
+=======
+vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h vect/dig_externs.h
+=======
+>>>>>>> osgeo-main
 vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h vect/dig_externs.h 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -158,6 +163,7 @@ vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h v
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -187,6 +193,8 @@ vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h v
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h vect/dig_externs.h 
 =======
 vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h vect/dig_externs.h
@@ -206,6 +214,7 @@ vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h v
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -290,6 +299,8 @@ vector_HDRS     = vector.h defs/vector.h vect/dig_structs.h vect/dig_defines.h v
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 rtree_HDRS	= rtree.h
 display_HDRS    = display.h defs/display.h
 stats_HDRS      = stats.h defs/stats.h
diff --git a/python/libgrass_interface_generator/README.md b/python/libgrass_interface_generator/README.md
index 28d1d8e9195..df98534355c 100644
--- a/python/libgrass_interface_generator/README.md
+++ b/python/libgrass_interface_generator/README.md
@@ -30,6 +30,7 @@ Currently installed version:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -93,6 +94,8 @@ Currently installed version:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 ### How to update ctypesgen version
 
 1. Replace the GRASS directory `python/libgrass_interface_generator/ctypesgen`
@@ -112,6 +115,7 @@ Currently installed version:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -144,6 +148,8 @@ Currently installed version:
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -160,6 +166,7 @@ Currently installed version:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -209,6 +216,8 @@ Currently installed version:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 ### How to update ctypesgen version
 
@@ -234,6 +243,7 @@ Currently installed version:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -264,6 +274,8 @@ Currently installed version:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -282,6 +294,7 @@ Currently installed version:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
 =======
@@ -344,6 +357,10 @@ Currently installed version:
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> osgeo-main
 ### How to update ctypesgen version
 
 1. Replace the GRASS directory `python/libgrass_interface_generator/ctypesgen`
@@ -363,6 +380,7 @@ Currently installed version:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -391,6 +409,8 @@ Currently installed version:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -409,6 +429,7 @@ Currently installed version:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -478,6 +499,8 @@ Currently installed version:
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 2. Replace `python/grass/ctypes/run.py` with `run.py` from ctypesgen source directory.
 3. Apply the patches below.
 4. Update this document with info on installed ctypesgen version.
@@ -509,6 +532,7 @@ Currently installed version:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -598,6 +622,11 @@ It is highly encouraged to report [upstreams](https://github.com/ctypesgen/ctype
 necessary patches for GRASS.
 =======
 >>>>>>> osgeo-main
+=======
+It is highly encouraged to report [upstreams](https://github.com/ctypesgen/ctypesgen)
+necessary patches for GRASS.
+=======
+>>>>>>> osgeo-main
 It is highly encouraged to report [upstreams](https://github.com/ctypesgen/ctypesgen) necessary patches for GRASS.
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -621,6 +650,7 @@ necessary patches for GRASS.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -650,6 +680,8 @@ necessary patches for GRASS.
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 It is highly encouraged to report [upstreams](https://github.com/ctypesgen/ctypesgen) necessary patches for GRASS.
 =======
 It is highly encouraged to report [upstreams](https://github.com/ctypesgen/ctypesgen)
@@ -670,6 +702,7 @@ necessary patches for GRASS.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -757,6 +790,8 @@ It is highly encouraged to report [upstreams](https://github.com/ctypesgen/ctype
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #### Ctypes "unnamed structure member with 0 bit size"-patch
 
@@ -814,6 +849,7 @@ generated files.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -883,6 +919,10 @@ generated files.
 
 =======
 >>>>>>> osgeo-main
+=======
+
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -908,6 +948,7 @@ generated files.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1004,6 +1045,8 @@ generated files.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 ```diff
 --- ctypesgen/printer_python/printer.py.orig
 +++ ctypesgen/printer_python/printer.py
@@ -1153,6 +1196,7 @@ generated files.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1222,6 +1266,10 @@ generated files.
 
 =======
 >>>>>>> osgeo-main
+=======
+
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1247,6 +1295,7 @@ generated files.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1343,6 +1392,8 @@ generated files.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #### Windows specific patches
 
diff --git a/python/libgrass_interface_generator/ctypesgen/ctypedescs.py b/python/libgrass_interface_generator/ctypesgen/ctypedescs.py
index 0a019f9e897..6417439358b 100755
--- a/python/libgrass_interface_generator/ctypesgen/ctypedescs.py
+++ b/python/libgrass_interface_generator/ctypesgen/ctypedescs.py
@@ -140,6 +140,7 @@ def visit_identifier(self, identifier):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 # Remove one level of indirection from funtion pointer; needed for typedefs
 =======
 <<<<<<< HEAD
@@ -182,6 +183,8 @@ def visit_identifier(self, identifier):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # Remove one level of indirection from function pointer; needed for typedefs
 =======
 # Remove one level of indirection from funtion pointer; needed for typedefs
@@ -200,6 +203,7 @@ def visit_identifier(self, identifier):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # Remove one level of indirection from funtion pointer; needed for typedefs
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -283,6 +287,11 @@ def visit_identifier(self, identifier):
 # Remove one level of indirection from funtion pointer; needed for typedefs
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+# Remove one level of indirection from funtion pointer; needed for typedefs
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 # and function parameters.
 def remove_function_pointer(t):
     if type(t) == CtypesPointer and type(t.destination) == CtypesFunction:
diff --git a/python/libgrass_interface_generator/ctypesgen/main.py b/python/libgrass_interface_generator/ctypesgen/main.py
index 98f7cb31d12..a431fae2e3a 100644
--- a/python/libgrass_interface_generator/ctypesgen/main.py
+++ b/python/libgrass_interface_generator/ctypesgen/main.py
@@ -51,6 +51,7 @@ def option_callback_W(option, opt, value, parser):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         raise optparse.BadOptionError("-Wl option must be -L, -R" " or --rpath, not " + value[2:])
 =======
@@ -93,6 +94,8 @@ def option_callback_W(option, opt, value, parser):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         raise optparse.BadOptionError(
             "-Wl option must be -L, -R or --rpath, not " + value[2:]
@@ -114,6 +117,7 @@ def option_callback_W(option, opt, value, parser):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         raise optparse.BadOptionError("-Wl option must be -L, -R" " or --rpath, not " + value[2:])
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -196,6 +200,11 @@ def option_callback_W(option, opt, value, parser):
 =======
         raise optparse.BadOptionError("-Wl option must be -L, -R" " or --rpath, not " + value[2:])
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        raise optparse.BadOptionError("-Wl option must be -L, -R" " or --rpath, not " + value[2:])
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     # Push the linker option onto the list for further parsing.
     parser.rargs.insert(0, value)
@@ -491,6 +500,7 @@ def main(givenargs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -525,6 +535,8 @@ def main(givenargs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         choices=("py", "json"),
         help="Choose output language (`py'[default], or `json').",
@@ -545,6 +557,7 @@ def main(givenargs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -595,6 +608,8 @@ def main(givenargs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         choices=("py", "py32", "py27", "py25", "json"),
         help="Choose output language (`py'[default], `py32', `py27', `py25', or "
@@ -620,6 +635,7 @@ def main(givenargs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -710,6 +726,11 @@ def main(givenargs=None):
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     )
     op.add_option(
@@ -797,6 +818,7 @@ def main(givenargs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         msgs.error_message("No such output language `" + options.output_language + "'", cls="usage")
 =======
@@ -839,6 +861,8 @@ def main(givenargs=None):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         msgs.error_message(
             "No such output language `" + options.output_language + "'", cls="usage"
@@ -860,6 +884,7 @@ def main(givenargs=None):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         msgs.error_message("No such output language `" + options.output_language + "'", cls="usage")
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -942,6 +967,11 @@ def main(givenargs=None):
 =======
         msgs.error_message("No such output language `" + options.output_language + "'", cls="usage")
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        msgs.error_message("No such output language `" + options.output_language + "'", cls="usage")
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         sys.exit(1)
 
diff --git a/python/libgrass_interface_generator/ctypesgen/parser/cdeclarations.py b/python/libgrass_interface_generator/ctypesgen/parser/cdeclarations.py
index 6868fb96a11..1b4fa83fb57 100644
--- a/python/libgrass_interface_generator/ctypesgen/parser/cdeclarations.py
+++ b/python/libgrass_interface_generator/ctypesgen/parser/cdeclarations.py
@@ -276,6 +276,7 @@ def _unalias(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         an attribute can also be preceeded/followed by a double underscore
 =======
@@ -318,6 +319,8 @@ def _unalias(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         an attribute can also be preceded/followed by a double underscore
 =======
@@ -337,6 +340,7 @@ def _unalias(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         an attribute can also be preceeded/followed by a double underscore
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -419,6 +423,11 @@ def _unalias(self):
 =======
         an attribute can also be preceeded/followed by a double underscore
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        an attribute can also be preceeded/followed by a double underscore
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         ('__').
         """
diff --git a/python/libgrass_interface_generator/ctypesgen/parser/cgrammar.py b/python/libgrass_interface_generator/ctypesgen/parser/cgrammar.py
index 8ca6ad7354e..95dbc46c0d2 100755
--- a/python/libgrass_interface_generator/ctypesgen/parser/cgrammar.py
+++ b/python/libgrass_interface_generator/ctypesgen/parser/cgrammar.py
@@ -124,6 +124,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     # Delimeters
 =======
@@ -166,6 +167,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     # Delimiters
 =======
@@ -185,6 +188,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     # Delimeters
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -267,6 +271,11 @@
 =======
     # Delimeters
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    # Delimeters
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     "PERIOD", "ELLIPSIS", "LPAREN", "RPAREN", "LBRACKET",
     "RBRACKET", "LBRACE", "RBRACE", "COMMA", "SEMI",
diff --git a/python/libgrass_interface_generator/ctypesgen/parser/cparser.py b/python/libgrass_interface_generator/ctypesgen/parser/cparser.py
index fa06355fe3d..394b0b95eff 100755
--- a/python/libgrass_interface_generator/ctypesgen/parser/cparser.py
+++ b/python/libgrass_interface_generator/ctypesgen/parser/cparser.py
@@ -142,6 +142,7 @@ def handle_error(self, message, filename, lineno):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         """A parse error occured.
 =======
@@ -184,6 +185,8 @@ def handle_error(self, message, filename, lineno):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         """A parse error occurred.
 =======
@@ -203,6 +206,7 @@ def handle_error(self, message, filename, lineno):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         """A parse error occured.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -285,6 +289,11 @@ def handle_error(self, message, filename, lineno):
 =======
         """A parse error occured.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        """A parse error occured.
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         The default implementation prints `lineno` and `message` to stderr.
diff --git a/python/libgrass_interface_generator/ctypesgen/parser/lex.py b/python/libgrass_interface_generator/ctypesgen/parser/lex.py
index 724098345bf..9ad6f07749a 100644
--- a/python/libgrass_interface_generator/ctypesgen/parser/lex.py
+++ b/python/libgrass_interface_generator/ctypesgen/parser/lex.py
@@ -59,6 +59,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -94,6 +95,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 StringTypes = (str, bytes)
 =======
 =======
@@ -112,6 +115,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -160,6 +164,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 try:
     # Python 2.6
     StringTypes = (types.StringType, types.UnicodeType)
@@ -183,6 +189,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -274,6 +281,11 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 # This regular expression is used to match valid token names
 _is_identifier = re.compile(r'^[a-zA-Z0-9_]+$')
diff --git a/python/libgrass_interface_generator/ctypesgen/parser/pplexer.py b/python/libgrass_interface_generator/ctypesgen/parser/pplexer.py
index 450922bcc4d..001b49ef48c 100755
--- a/python/libgrass_interface_generator/ctypesgen/parser/pplexer.py
+++ b/python/libgrass_interface_generator/ctypesgen/parser/pplexer.py
@@ -140,6 +140,7 @@ def __new__(cls, value):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 # Delimeters
 =======
 <<<<<<< HEAD
@@ -182,6 +183,8 @@ def __new__(cls, value):
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 # Delimiters
 =======
 # Delimeters
@@ -200,6 +203,7 @@ def __new__(cls, value):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 # Delimeters
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -283,6 +287,11 @@ def __new__(cls, value):
 # Delimeters
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+# Delimeters
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 t_ANY_PERIOD = r"\."
 t_ANY_LPAREN = r"\("
 t_ANY_RPAREN = r"\)"
diff --git a/python/libgrass_interface_generator/ctypesgen/parser/yacc.py b/python/libgrass_interface_generator/ctypesgen/parser/yacc.py
index 5010827f09e..663cc576624 100644
--- a/python/libgrass_interface_generator/ctypesgen/parser/yacc.py
+++ b/python/libgrass_interface_generator/ctypesgen/parser/yacc.py
@@ -1522,6 +1522,7 @@ def __init__(self, terminals):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         self.UsedPrecedence = set() # Precedence rules that were actually used by the grammer.
 =======
@@ -1564,6 +1565,8 @@ def __init__(self, terminals):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.UsedPrecedence = set() # Precedence rules that were actually used by the grammar.
 =======
@@ -1583,6 +1586,7 @@ def __init__(self, terminals):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         self.UsedPrecedence = set() # Precedence rules that were actually used by the grammer.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1665,6 +1669,11 @@ def __init__(self, terminals):
 =======
         self.UsedPrecedence = set() # Precedence rules that were actually used by the grammer.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        self.UsedPrecedence = set() # Precedence rules that were actually used by the grammer.
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                                     # This is only used to provide error checking and to generate
                                     # a warning about unused precedence rules.
diff --git a/raster/r.basins.fill/r.basins.fill.html b/raster/r.basins.fill/r.basins.fill.html
index f58f71df468..8100aabe7f9 100644
--- a/raster/r.basins.fill/r.basins.fill.html
+++ b/raster/r.basins.fill/r.basins.fill.html
@@ -71,6 +71,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -143,6 +144,10 @@ 
    AUTHORS
    
 Larry Band, Dept. of Geography, University of Toronto, Canada
 =======
 >>>>>>> osgeo-main
+=======
+Larry Band, Dept. of Geography, University of Toronto, Canada
+=======
+>>>>>>> osgeo-main
 Larry Band, Dept. of Geography, University of Toronto, Canada 
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -165,6 +170,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -194,6 +200,8 @@ 
    AUTHORS
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 Larry Band, Dept. of Geography, University of Toronto, Canada 
 =======
 Larry Band, Dept. of Geography, University of Toronto, Canada
@@ -213,6 +221,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -291,3 +300,5 @@ 
    AUTHORS
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/raster/r.basins.fill/testsuite/testrbf.py b/raster/r.basins.fill/testsuite/testrbf.py
index b9937b05689..4077a2113a4 100644
--- a/raster/r.basins.fill/testsuite/testrbf.py
+++ b/raster/r.basins.fill/testsuite/testrbf.py
@@ -5,8 +5,8 @@
 Author:     Sunveer Singh
 Copyright:  (C) 2017 by Sunveer Singh and the GRASS Development Team
 Licence:    This program is free software under the GNU General Public
-	    License (>=v2). Read the file COPYING that comes with GRASS
-	    for details.
+            License (>=v2). Read the file COPYING that comes with GRASS
+            for details.
 """
 
 import unittest
@@ -47,8 +47,8 @@ def setUpClass(cls):
     def tearDownClass(cls):
         cls.del_temp_region()
 
-    def tearDown(cls):
-        cls.runModule("g.remove", flags="f", type="raster", name=cls.output)
+    def tearDown(self):
+        self.runModule("g.remove", flags="f", type="raster", name=self.output)
 
     def test_no1(self):
         lakes = "lakes"
diff --git a/raster/r.buildvrt/link.c b/raster/r.buildvrt/link.c
index 775ae9b4b19..8fbd1e7c5ca 100644
--- a/raster/r.buildvrt/link.c
+++ b/raster/r.buildvrt/link.c
@@ -98,6 +98,7 @@ void create_map(const struct input *inputs, int num_inputs, const char *output,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 int have_stats, struct R_stats *ostats, const char *title)
 =======
@@ -140,6 +141,8 @@ void create_map(const struct input *inputs, int num_inputs, const char *output,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 int have_stats UNUSED, struct R_stats *ostats UNUSED,
                 const char *title)
@@ -160,6 +163,7 @@ void create_map(const struct input *inputs, int num_inputs, const char *output,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                 int have_stats, struct R_stats *ostats, const char *title)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -243,6 +247,11 @@ void create_map(const struct input *inputs, int num_inputs, const char *output,
                 int have_stats, struct R_stats *ostats, const char *title)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+                int have_stats, struct R_stats *ostats, const char *title)
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 {
     struct History history;
     struct Categories cats;
diff --git a/raster/r.carve/main.c b/raster/r.carve/main.c
index 45eaa0c761d..836e879b574 100644
--- a/raster/r.carve/main.c
+++ b/raster/r.carve/main.c
@@ -220,6 +220,7 @@ static int init_projection(struct Cell_head *window, int *wrap_ncols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         G_fatal_error(_("Lat/Long location is not supported by %s. Please "
 =======
@@ -262,6 +263,8 @@ static int init_projection(struct Cell_head *window, int *wrap_ncols)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_fatal_error(_("Lat/Long project is not supported by %s. Please "
 =======
@@ -281,6 +284,7 @@ static int init_projection(struct Cell_head *window, int *wrap_ncols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         G_fatal_error(_("Lat/Long location is not supported by %s. Please "
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -363,6 +367,11 @@ static int init_projection(struct Cell_head *window, int *wrap_ncols)
 =======
         G_fatal_error(_("Lat/Long location is not supported by %s. Please "
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        G_fatal_error(_("Lat/Long location is not supported by %s. Please "
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                         "reproject map first."),
                       G_program_name());
diff --git a/raster/r.carve/r.carve.html b/raster/r.carve/r.carve.html
index d0aec655cd5..0163726c722 100644
--- a/raster/r.carve/r.carve.html
+++ b/raster/r.carve/r.carve.html
@@ -154,6 +154,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -208,6 +209,8 @@ 
    AUTHORS
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
    AUTHORS
    
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -226,6 +229,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -249,6 +253,8 @@ 
    AUTHORS
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
 
    AUTHORS
    
@@ -270,6 +276,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -324,5 +331,7 @@ 
    AUTHORS
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 Bill Brown (GMSL)
    
 GRASS 6 update: Brad Douglas
diff --git a/raster/r.clump/minsize.c b/raster/r.clump/minsize.c
index f086be17e3e..4342d9fc0d0 100644
--- a/raster/r.clump/minsize.c
+++ b/raster/r.clump/minsize.c
@@ -289,6 +289,7 @@ static int find_best_neighbour(int bfd, int nin, DCELL *rng, int cfd, int csize,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -340,6 +341,8 @@ static int find_best_neighbour(int bfd, int nin, DCELL *rng, int cfd, int csize,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                     count++;
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -361,6 +364,7 @@ static int find_best_neighbour(int bfd, int nin, DCELL *rng, int cfd, int csize,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -384,6 +388,8 @@ static int find_best_neighbour(int bfd, int nin, DCELL *rng, int cfd, int csize,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
                     count++;
@@ -404,6 +410,7 @@ static int find_best_neighbour(int bfd, int nin, DCELL *rng, int cfd, int csize,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -472,6 +479,8 @@ static int find_best_neighbour(int bfd, int nin, DCELL *rng, int cfd, int csize,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     rclist_add(&rilist, rown, coln);
                     if (*rowmin > rown)
diff --git a/raster/r.coin/format.c b/raster/r.coin/format.c
index fdf3529d690..b84de6b8ef2 100644
--- a/raster/r.coin/format.c
+++ b/raster/r.coin/format.c
@@ -48,6 +48,7 @@ int format_double(double v, char *buf, int n)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -119,6 +120,10 @@ int format_double(double v, char *buf, int n)
 =======
     for (k = n; (ssize_t)strlen(buf) > n; k--) {
 =======
+>>>>>>> osgeo-main
+=======
+    for (k = n; (ssize_t)strlen(buf) > n; k--) {
+=======
 >>>>>>> osgeo-main
     for (k = n; strlen(buf) > n; k--) {
 <<<<<<< HEAD
@@ -142,6 +147,7 @@ int format_double(double v, char *buf, int n)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -170,6 +176,8 @@ int format_double(double v, char *buf, int n)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     for (k = n; strlen(buf) > n; k--) {
 =======
@@ -190,6 +198,7 @@ int format_double(double v, char *buf, int n)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -267,6 +276,8 @@ int format_double(double v, char *buf, int n)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         sprintf(fmt, "%%%d.%dg", n, k);
         sprintf(buf, fmt, v);
diff --git a/raster/r.compress/r.compress.html b/raster/r.compress/r.compress.html
index 3cc33e594d0..17802cfd4b2 100644
--- a/raster/r.compress/r.compress.html
+++ b/raster/r.compress/r.compress.html
@@ -149,6 +149,7 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -188,6 +189,8 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -205,6 +208,7 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -259,6 +263,8 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
    ZLIB's deflate is the default compression method for all raster
 maps, if ZSTD is not available. GRASS GIS 8 uses by default 1 as ZLIB
 compression level which is the best compromise between speed and
@@ -284,6 +290,7 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> dd6a87c0fa (r.horizon manual - fix typo (#2794))
 =======
@@ -347,6 +354,9 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 
    ZLIB's deflate is the default compression method for all raster 
 maps, if ZSTD is not available. GRASS GIS 8 uses by default 1 as ZLIB 
 compression level which is the best compromise between speed and 
@@ -368,6 +378,7 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -391,6 +402,8 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -408,6 +421,7 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -462,6 +476,8 @@ 
    COMPRESSION ALGORITHM DETAILS
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 environment variable GRASS_ZLIB_LEVEL.
    
 
    LZ4
    
 
    LZ4 is a very fast compression method, about as fast as no
diff --git a/raster/r.contour/r.contour.html b/raster/r.contour/r.contour.html
index 8e5624ae864..ef93d7d4580 100644
--- a/raster/r.contour/r.contour.html
+++ b/raster/r.contour/r.contour.html
@@ -44,6 +44,7 @@ 
    EXAMPLES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 In the Spearfish location, produce a vector contour map from input raster elevation.dem
 =======
 <<<<<<< HEAD
@@ -86,6 +87,8 @@ 
    EXAMPLES
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 In the Spearfish dataset, produce a vector contour map from input raster elevation.dem
 =======
 In the Spearfish location, produce a vector contour map from input raster elevation.dem
@@ -104,6 +107,7 @@ 
    EXAMPLES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 In the Spearfish location, produce a vector contour map from input raster elevation.dem
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -187,6 +191,11 @@ 
    EXAMPLES
    
 In the Spearfish location, produce a vector contour map from input raster elevation.dem
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+In the Spearfish location, produce a vector contour map from input raster elevation.dem
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 with contour levels from 1000m to 2000m, 100m contour step, and a minimum of 200 input raster
 points contributing to the contour line:
 
diff --git a/raster/r.contour/testsuite/testrc.py b/raster/r.contour/testsuite/testrc.py
index 014f570d776..3bb2135d4e3 100644
--- a/raster/r.contour/testsuite/testrc.py
+++ b/raster/r.contour/testsuite/testrc.py
@@ -15,6 +15,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
     
@@ -65,6 +66,9 @@
 >>>>>>> osgeo-main
 =======
 
+>>>>>>> osgeo-main
+=======
+
 >>>>>>> osgeo-main
 Author:     Sunveer Singh, Google Code-in 2018
 Copyright:  (C) 2018 by Sunveer Singh and the GRASS Development Team
diff --git a/raster/r.cost/flag.c b/raster/r.cost/flag.c
index 14bac9e98f1..2b640e72463 100644
--- a/raster/r.cost/flag.c
+++ b/raster/r.cost/flag.c
@@ -36,6 +36,7 @@ FLAG *flag_create(int nrows, int ncols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     temp = (unsigned char *)G_malloc(nrows * new_flag->leng *
 =======
@@ -78,6 +79,8 @@ FLAG *flag_create(int nrows, int ncols)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     temp = (unsigned char *)G_malloc((size_t)nrows * new_flag->leng *
 =======
@@ -97,6 +100,7 @@ FLAG *flag_create(int nrows, int ncols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     temp = (unsigned char *)G_malloc(nrows * new_flag->leng *
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -179,6 +183,11 @@ FLAG *flag_create(int nrows, int ncols)
 =======
     temp = (unsigned char *)G_malloc(nrows * new_flag->leng *
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    temp = (unsigned char *)G_malloc(nrows * new_flag->leng *
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                                      sizeof(unsigned char));
 
diff --git a/raster/r.cost/main.c b/raster/r.cost/main.c
index f3fedec91b1..7f954e00564 100644
--- a/raster/r.cost/main.c
+++ b/raster/r.cost/main.c
@@ -529,6 +529,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         total_cells = nrows * ncols;
 =======
@@ -571,6 +572,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         total_cells = (long)nrows * ncols;
 =======
@@ -590,6 +593,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         total_cells = nrows * ncols;
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -672,6 +676,11 @@ int main(int argc, char *argv[])
 =======
         total_cells = nrows * ncols;
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        total_cells = nrows * ncols;
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         skip_nulls = Rast_is_d_null_value(&null_cost);
diff --git a/raster/r.cost/r.cost.html b/raster/r.cost/r.cost.html
index 5498f30e904..c9a9c7b7acd 100644
--- a/raster/r.cost/r.cost.html
+++ b/raster/r.cost/r.cost.html
@@ -139,6 +139,7 @@ 
    OPTIONS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     
  • Use thise negative distances as solver for a second pass of
 =======
@@ -181,6 +182,8 @@ 
    OPTIONS
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     
  • Use these negative distances as solver for a second pass of
 =======
@@ -200,6 +203,7 @@ 
    OPTIONS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     
  • Use thise negative distances as solver for a second pass of
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -282,6 +286,11 @@ 
    OPTIONS
    
 =======
     
  • Use thise negative distances as solver for a second pass of
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+    
  • Use thise negative distances as solver for a second pass of
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
     r.cost
    • 
     
  • Extract paths again with r.path to get a geometrically
diff --git a/raster/r.cross/r.cross.html b/raster/r.cross/r.cross.html
index 946ae37c76d..aeb50cb6f9d 100644
--- a/raster/r.cross/r.cross.html
+++ b/raster/r.cross/r.cross.html
@@ -26,6 +26,7 @@ 
    OPTIONS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -67,6 +68,8 @@ 
    OPTIONS
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
    
 With the -z flag NULL values are not crossed.
 This means that if a NULL value occurs in any input data layer,
@@ -91,6 +94,7 @@ 
    OPTIONS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 <<<<<<< HEAD
@@ -160,6 +164,10 @@ 
    OPTIONS
    
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 The program will be run non-interactively if the user specifies
 the names of between 2-10 raster map layers be used as input,
 and the name of a raster map layer to hold program output.
@@ -190,6 +198,7 @@ 
    OPTIONS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -281,6 +290,11 @@ 
    OPTIONS
    
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 If the -z flag is not specified, then map layer combinations
 in which some values are NULL will be assigned
 a unique category value in the resulting output map.
diff --git a/raster/r.external/main.c b/raster/r.external/main.c
index 11703a651be..1df10b1946c 100644
--- a/raster/r.external/main.c
+++ b/raster/r.external/main.c
@@ -125,6 +125,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -215,6 +216,11 @@ int main(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     flag.j = G_define_flag();
diff --git a/raster/r.external/proj.c b/raster/r.external/proj.c
index 65ed2eab5db..f4f990606f5 100644
--- a/raster/r.external/proj.c
+++ b/raster/r.external/proj.c
@@ -146,6 +146,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             G_fatal_error(_("Unable to convert input map projection to GRASS "
                             "format; cannot create new location."));
@@ -189,6 +190,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             G_fatal_error(
                 _("Unable to convert input map coordinate reference "
@@ -211,6 +214,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -239,6 +243,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             G_fatal_error(_("Unable to convert input map projection to GRASS "
                             "format; cannot create new location."));
@@ -257,6 +263,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -298,6 +305,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         }
         else {
@@ -319,6 +328,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 G_fatal_error(_("Unable to create new location <%s>"), outloc);
             }
@@ -363,6 +373,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 G_fatal_error(_("Unable to create new project <%s>"), outloc);
             }
@@ -386,6 +398,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -414,6 +427,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                 G_fatal_error(_("Unable to create new location <%s>"), outloc);
             }
@@ -433,6 +448,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -474,6 +490,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             G_unset_window(); /* new location, projection, and window */
@@ -547,6 +565,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             strcpy(error_msg, _("Projection of dataset does not"
                                 " appear to match current location.\n\n"));
@@ -590,6 +609,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             strcpy(error_msg,
                    _("Coordinate reference system of dataset does not"
@@ -612,6 +633,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -640,6 +662,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             strcpy(error_msg, _("Projection of dataset does not"
                                 " appear to match current location.\n\n"));
@@ -658,6 +682,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -699,6 +724,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             /* TODO: output this info sorted by key: */
@@ -721,6 +748,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     strcat(error_msg, _("Location PROJ_INFO is:\n"));
 =======
@@ -763,6 +791,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     strcat(error_msg, _("Project PROJ_INFO is:\n"));
 =======
@@ -782,6 +812,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                     strcat(error_msg, _("Location PROJ_INFO is:\n"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -864,6 +895,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
                     strcat(error_msg, _("Location PROJ_INFO is:\n"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                    strcat(error_msg, _("Location PROJ_INFO is:\n"));
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     for (i_value = 0; i_value < loc_proj_info->nitems;
                          i_value++)
@@ -890,6 +926,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -930,6 +967,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     strcat(error_msg, _("Project PROJ_INFO is:\n"));
                     if (loc_wind.proj == PROJECTION_XY)
@@ -962,6 +1001,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1030,6 +1070,10 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     strcat(error_msg, _("Location PROJ_INFO is:\n"));
                     if (loc_wind.proj == PROJECTION_XY)
@@ -1064,6 +1108,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1154,6 +1199,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                                 loc_wind.proj, cellhd->zone);
                 }
@@ -1244,6 +1294,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     strcat(error_msg, "Location PROJ_UNITS is:\n");
 =======
@@ -1286,6 +1337,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     strcat(error_msg, "Project PROJ_UNITS is:\n");
 =======
@@ -1305,6 +1358,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                     strcat(error_msg, "Location PROJ_UNITS is:\n");
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1387,6 +1441,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
                     strcat(error_msg, "Location PROJ_UNITS is:\n");
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                    strcat(error_msg, "Location PROJ_UNITS is:\n");
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     for (i_value = 0; i_value < loc_proj_units->nitems;
                          i_value++)
@@ -1422,6 +1481,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1462,6 +1522,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 strcat(error_msg,
                        _("\nIn case of no significant differences "
@@ -1486,6 +1548,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1554,6 +1617,10 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 strcat(error_msg, _("\nIn case of no significant differences "
                                     "in the projection definitions,"
@@ -1579,6 +1646,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1669,6 +1737,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             }
 
@@ -1703,6 +1776,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             msg_fn(_("Projection of input dataset and current location "
                      "appear to match"));
@@ -1746,6 +1820,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             msg_fn(_("Coordinate reference system of input dataset and current "
                      "project appear to match"));
@@ -1767,6 +1843,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1795,6 +1872,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             msg_fn(_("Projection of input dataset and current location "
                      "appear to match"));
@@ -1813,6 +1892,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1854,6 +1934,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             if (check_only) {
                 GDALClose(hDS);
diff --git a/raster/r.external/testsuite/data/generate_data.sh b/raster/r.external/testsuite/data/generate_data.sh
index 3ea48eb14fa..75921cb3014 100755
--- a/raster/r.external/testsuite/data/generate_data.sh
+++ b/raster/r.external/testsuite/data/generate_data.sh
@@ -41,6 +41,7 @@ r3.out.netcdf input=elevation3d output=elevation3d.nc
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -93,6 +94,8 @@ r3.out.netcdf input=elevation3d output=elevation3d.nc
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -113,6 +116,7 @@ r3.out.netcdf input=elevation3d output=elevation3d.nc
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -136,6 +140,8 @@ r3.out.netcdf input=elevation3d output=elevation3d.nc
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 
@@ -156,6 +162,7 @@ r3.out.netcdf input=elevation3d output=elevation3d.nc
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -225,3 +232,5 @@ r3.out.netcdf input=elevation3d output=elevation3d.nc
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/raster/r.external/testsuite/test_r_external.py b/raster/r.external/testsuite/test_r_external.py
index 64f61b863a5..2ed12dd89c6 100644
--- a/raster/r.external/testsuite/test_r_external.py
+++ b/raster/r.external/testsuite/test_r_external.py
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -54,6 +55,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -73,6 +76,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -124,6 +128,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 from grass.gunittest.case import TestCase
 
 
@@ -161,6 +167,7 @@ def test_1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -198,6 +205,8 @@ def test_1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -217,6 +226,7 @@ def test_1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -267,6 +277,8 @@ def test_1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.assertModule(
             "r.external",
@@ -313,6 +325,7 @@ def test_2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -350,6 +363,8 @@ def test_2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -369,6 +384,7 @@ def test_2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -419,6 +435,8 @@ def test_2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.assertModule(
             "r.external",
@@ -465,6 +483,7 @@ def test_3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -502,6 +521,8 @@ def test_3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -521,6 +542,7 @@ def test_3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -571,6 +593,8 @@ def test_3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.assertModule(
             "r.external",
@@ -617,6 +641,7 @@ def test_4(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -654,6 +679,8 @@ def test_4(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -673,6 +700,7 @@ def test_4(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -723,6 +751,8 @@ def test_4(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.assertModule(
             "r.external",
@@ -769,6 +799,7 @@ def test_netCDF_3d_1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -806,6 +837,8 @@ def test_netCDF_3d_1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -825,6 +858,7 @@ def test_netCDF_3d_1(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -875,6 +909,8 @@ def test_netCDF_3d_1(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.assertModule(
             "r.external",
@@ -931,6 +967,7 @@ def test_netCDF_3d_2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -968,6 +1005,8 @@ def test_netCDF_3d_2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -987,6 +1026,7 @@ def test_netCDF_3d_2(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1037,6 +1077,8 @@ def test_netCDF_3d_2(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.assertModule(
             "r.external",
@@ -1093,6 +1135,7 @@ def test_netCDF_3d_3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -1130,6 +1173,8 @@ def test_netCDF_3d_3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1149,6 +1194,7 @@ def test_netCDF_3d_3(self):
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1199,6 +1245,8 @@ def test_netCDF_3d_3(self):
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         self.assertModule(
             "r.external",
diff --git a/raster/r.external/window.c b/raster/r.external/window.c
index 393c24eb094..49fc50801ee 100644
--- a/raster/r.external/window.c
+++ b/raster/r.external/window.c
@@ -107,6 +107,7 @@ void update_default_window(struct Cell_head *cellhd)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         G_message(_("Default region for this location updated"));
 =======
@@ -149,6 +150,8 @@ void update_default_window(struct Cell_head *cellhd)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_message(_("Default region for this project updated"));
 =======
@@ -168,6 +171,7 @@ void update_default_window(struct Cell_head *cellhd)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         G_message(_("Default region for this location updated"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -250,6 +254,11 @@ void update_default_window(struct Cell_head *cellhd)
 =======
         G_message(_("Default region for this location updated"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        G_message(_("Default region for this location updated"));
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     }
     G_put_window(&cur_wind);
diff --git a/raster/r.fill.dir/resolve.c b/raster/r.fill.dir/resolve.c
index 75462ec7431..9663c271a15 100644
--- a/raster/r.fill.dir/resolve.c
+++ b/raster/r.fill.dir/resolve.c
@@ -49,6 +49,7 @@ CELL select_dir(CELL i)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3,
            int *active, int *goagain)
 =======
@@ -92,6 +93,8 @@ void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void flink(int i UNUSED, int j, int nl UNUSED, int ns UNUSED, CELL *p1,
            CELL *p2, CELL *p3, int *active, int *goagain)
 =======
@@ -112,6 +115,7 @@ void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -141,6 +145,8 @@ void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3,
            int *active, int *goagain)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -158,6 +164,7 @@ void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -200,6 +207,8 @@ void flink(int i, int j, int nl, int ns, CELL *p1, CELL *p2, CELL *p3,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     CELL bitmask[8] = {1, 2, 4, 8, 16, 32, 64, 128};
     CELL outflow, cwork, c[8];
diff --git a/raster/r.fill.dir/tinf.c b/raster/r.fill.dir/tinf.c
index 8d4ff6c7e25..88d1a88ec4e 100644
--- a/raster/r.fill.dir/tinf.c
+++ b/raster/r.fill.dir/tinf.c
@@ -35,6 +35,7 @@ int (*is_null)(void *);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -98,6 +99,8 @@ int (*is_null)(void *);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 size_t (*bpe)(void);
 void *(*get_max)(void *, void *);
 void *(*get_min)(void *, void *);
@@ -118,6 +121,7 @@ void *(*get_buf)(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -150,6 +154,8 @@ void *(*get_buf)(void);
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -166,6 +172,7 @@ void *(*get_buf)(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -215,6 +222,8 @@ void *(*get_buf)(void);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 size_t (*bpe)();
 void *(*get_max)(void *, void *);
 void *(*get_min)(void *, void *);
@@ -240,6 +249,7 @@ void *(*get_buf)();
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -270,6 +280,8 @@ void *(*get_buf)();
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -288,6 +300,7 @@ void *(*get_buf)();
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
 =======
@@ -350,6 +363,10 @@ void *(*get_buf)();
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> osgeo-main
 size_t (*bpe)(void);
 void *(*get_max)(void *, void *);
 void *(*get_min)(void *, void *);
@@ -370,6 +387,7 @@ void *(*get_buf)(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -398,6 +416,8 @@ void *(*get_buf)(void);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -416,6 +436,7 @@ void *(*get_buf)(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -485,6 +506,8 @@ void *(*get_buf)(void);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void (*put_row)(int, void *);
 double (*slope)(void *, void *, double);
 void (*set_min)(void *);
diff --git a/raster/r.fill.dir/tinf.h b/raster/r.fill.dir/tinf.h
index 2819b84be4f..582bf47baa7 100644
--- a/raster/r.fill.dir/tinf.h
+++ b/raster/r.fill.dir/tinf.h
@@ -89,6 +89,7 @@ extern int (*is_null)(void *);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -152,6 +153,8 @@ extern int (*is_null)(void *);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 extern size_t (*bpe)(void);
 extern void *(*get_max)(void *, void *);
 extern void *(*get_min)(void *, void *);
@@ -172,6 +175,7 @@ extern void *(*get_buf)(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -204,6 +208,8 @@ extern void *(*get_buf)(void);
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -220,6 +226,7 @@ extern void *(*get_buf)(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -269,6 +276,8 @@ extern void *(*get_buf)(void);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 extern size_t (*bpe)();
 extern void *(*get_max)(void *, void *);
 extern void *(*get_min)(void *, void *);
@@ -294,6 +303,7 @@ extern void *(*get_buf)();
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -324,6 +334,8 @@ extern void *(*get_buf)();
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -342,6 +354,7 @@ extern void *(*get_buf)();
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
 =======
@@ -404,6 +417,10 @@ extern void *(*get_buf)();
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> osgeo-main
 extern size_t (*bpe)(void);
 extern void *(*get_max)(void *, void *);
 extern void *(*get_min)(void *, void *);
@@ -424,6 +441,7 @@ extern void *(*get_buf)(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -452,6 +470,8 @@ extern void *(*get_buf)(void);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -470,6 +490,7 @@ extern void *(*get_buf)(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -539,6 +560,8 @@ extern void *(*get_buf)(void);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 extern void (*put_row)(int, void *);
 extern double (*slope)(void *, void *, double);
 extern void (*set_min)(void *);
diff --git a/raster/r.fill.stats/main.c b/raster/r.fill.stats/main.c
index d49ff9d71a2..0cae5fe67c4 100644
--- a/raster/r.fill.stats/main.c
+++ b/raster/r.fill.stats/main.c
@@ -164,6 +164,7 @@ long int estimate_mem_needed(long int cols, char *mode)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -205,6 +206,8 @@ long int estimate_mem_needed(long int cols, char *mode)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #define WEIGHT_MATRIX_LINE_LENGTH 80
 
 =======
@@ -223,6 +226,7 @@ long int estimate_mem_needed(long int cols, char *mode)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -292,6 +296,10 @@ long int estimate_mem_needed(long int cols, char *mode)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /*
  * Prints the spatial weights matrix to the console.
  * This uses a fixed layout which may not be able to print very
@@ -321,6 +329,7 @@ void print_weights_matrix(long int rows, long int cols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
     size_t weight_matrix_line_length = 80;
@@ -371,6 +380,8 @@ void print_weights_matrix(long int rows, long int cols)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     char weight_matrix_line_buf[WEIGHT_MATRIX_LINE_LENGTH + 1];
     char weight_matrix_weight_buf[WEIGHT_MATRIX_LINE_LENGTH + 1];
@@ -391,6 +402,7 @@ void print_weights_matrix(long int rows, long int cols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -413,6 +425,8 @@ void print_weights_matrix(long int rows, long int cols)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     size_t weight_matrix_line_length = 80;
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -436,6 +450,7 @@ void print_weights_matrix(long int rows, long int cols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -492,6 +507,8 @@ void print_weights_matrix(long int rows, long int cols)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     char weight_matrix_line_buf[weight_matrix_line_length + 1];
     char weight_matrix_weight_buf[weight_matrix_line_length + 1];
@@ -527,6 +544,7 @@ void print_weights_matrix(long int rows, long int cols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 weight_matrix_line_length) {
 =======
@@ -569,6 +587,8 @@ void print_weights_matrix(long int rows, long int cols)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 WEIGHT_MATRIX_LINE_LENGTH) {
 =======
@@ -588,6 +608,7 @@ void print_weights_matrix(long int rows, long int cols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                 weight_matrix_line_length) {
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -670,6 +691,11 @@ void print_weights_matrix(long int rows, long int cols)
 =======
                 weight_matrix_line_length) {
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                weight_matrix_line_length) {
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 strncpy(weight_matrix_line_buf, "[line too long to print]",
                         WEIGHT_MATRIX_LINE_LENGTH);
@@ -711,6 +737,7 @@ void *get_input_row(unsigned long row_idx)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -801,6 +828,11 @@ void *get_input_row(unsigned long row_idx)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     my_cell = CELL_INPUT_HANDLES[row_idx];
@@ -825,6 +857,7 @@ void *get_input_row(unsigned long row_idx)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -859,6 +892,8 @@ void *get_input_row(unsigned long row_idx)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     return (void *)my_cell;
 =======
@@ -878,6 +913,7 @@ void *get_input_row(unsigned long row_idx)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -925,6 +961,8 @@ void *get_input_row(unsigned long row_idx)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     return (my_cell);
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -976,6 +1014,7 @@ void *get_input_row(unsigned long row_idx)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 void collect_values_unfiltered(double val1, double val2, double min, double max,
                                stats_struct *stats)
 =======
@@ -1019,6 +1058,8 @@ void collect_values_unfiltered(double val1, double val2, double min, double max,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void collect_values_unfiltered(double val1, double val2, double min UNUSED,
                                double max UNUSED, stats_struct *stats)
 =======
@@ -1039,6 +1080,7 @@ void collect_values_unfiltered(double val1, double val2, double min, double max,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1068,6 +1110,8 @@ void collect_values_unfiltered(double val1, double val2, double min, double max,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void collect_values_unfiltered(double val1, double val2, double min, double max,
                                stats_struct *stats)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1085,6 +1129,7 @@ void collect_values_unfiltered(double val1, double val2, double min, double max,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1127,6 +1172,8 @@ void collect_values_unfiltered(double val1, double val2, double min, double max,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     stats->values[stats->num_values] = val1;
     stats->certainty += val2;
@@ -1158,6 +1205,7 @@ void collect_values_filtered(double val1, double val2, double min, double max,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 void collect_values_and_weights_unfiltered(double val1, double val2, double min,
                                            double max, stats_struct *stats)
 =======
@@ -1201,6 +1249,8 @@ void collect_values_and_weights_unfiltered(double val1, double val2, double min,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void collect_values_and_weights_unfiltered(double val1, double val2,
                                            double min UNUSED, double max UNUSED,
                                            stats_struct *stats)
@@ -1222,6 +1272,7 @@ void collect_values_and_weights_unfiltered(double val1, double val2, double min,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1251,6 +1302,8 @@ void collect_values_and_weights_unfiltered(double val1, double val2, double min,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void collect_values_and_weights_unfiltered(double val1, double val2, double min,
                                            double max, stats_struct *stats)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1268,6 +1321,7 @@ void collect_values_and_weights_unfiltered(double val1, double val2, double min,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1310,6 +1364,8 @@ void collect_values_and_weights_unfiltered(double val1, double val2, double min,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     stats->values[stats->num_values] = val1;
     stats->weights[stats->num_values] = val2;
@@ -1348,6 +1404,7 @@ void collect_values_and_frequencies_unfiltered(double val1, double val2,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1438,6 +1495,11 @@ void collect_values_and_frequencies_unfiltered(double val1, double val2,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                                                stats_struct *stats)
 {
@@ -1702,6 +1764,7 @@ void advance_one_row(int file_desc, long current_row)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1792,6 +1855,11 @@ void advance_one_row(int file_desc, long current_row)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     static unsigned long replace_row =
         0; /* points to the row which will be replaced next */
diff --git a/raster/r.fill.stats/r.fill.stats.html b/raster/r.fill.stats/r.fill.stats.html
index 9e02fac0f73..17b784ec229 100644
--- a/raster/r.fill.stats/r.fill.stats.html
+++ b/raster/r.fill.stats/r.fill.stats.html
@@ -535,6 +535,7 @@ 
    AUTHOR
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -580,6 +581,8 @@ 
    AUTHOR
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -601,6 +604,7 @@ 
    AUTHOR
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -630,6 +634,8 @@ 
    AUTHOR
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -648,6 +654,7 @@ 
    AUTHOR
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -723,3 +730,5 @@ 
    AUTHOR
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/raster/r.flow/aspect.h b/raster/r.flow/aspect.h
index 95ee8b7485f..e208eb8ef8e 100644
--- a/raster/r.flow/aspect.h
+++ b/raster/r.flow/aspect.h
@@ -29,6 +29,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -104,6 +105,10 @@ DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */);
 DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */);
 =======
 >>>>>>> osgeo-main
+=======
+DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */);
+=======
+>>>>>>> osgeo-main
 DCELL aspect_fly(/* n, c, s, d */);
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -126,6 +131,7 @@ DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -155,6 +161,8 @@ DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */);
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 DCELL aspect_fly(/* n, c, s, d */);
 =======
 DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */);
@@ -174,6 +182,7 @@ DCELL aspect_fly(DCELL *, DCELL *, DCELL *, double /* n, c, s, d */);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -258,3 +267,5 @@ DCELL aspect_fly(/* n, c, s, d */);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/raster/r.flow/mem.h b/raster/r.flow/mem.h
index 936e29ad2f8..cf30efcfb4b 100644
--- a/raster/r.flow/mem.h
+++ b/raster/r.flow/mem.h
@@ -49,6 +49,7 @@ void deallocate_heap(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -124,6 +125,10 @@ void put_row_seg(layer, int /* l, row */);
 void put_row_seg(layer, int /* l, row */);
 =======
 >>>>>>> osgeo-main
+=======
+void put_row_seg(layer, int /* l, row */);
+=======
+>>>>>>> osgeo-main
 void put_row_seg(/* l, row */);
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -146,6 +151,7 @@ void put_row_seg(layer, int /* l, row */);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -175,6 +181,8 @@ void put_row_seg(layer, int /* l, row */);
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void put_row_seg(/* l, row */);
 =======
 void put_row_seg(layer, int /* l, row */);
@@ -194,6 +202,7 @@ void put_row_seg(layer, int /* l, row */);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -278,6 +287,8 @@ void put_row_seg(/* l, row */);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #define get_row(l, row)                                                 \
     ((parm.seg && (Segment_flush(l.seg) < 1 ||                          \
diff --git a/raster/r.geomorphon/geom.c b/raster/r.geomorphon/geom.c
index ae48209430e..0dcc299cccf 100644
--- a/raster/r.geomorphon/geom.c
+++ b/raster/r.geomorphon/geom.c
@@ -243,6 +243,7 @@ float variance(float *elevation, int pattern_size)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -318,6 +319,10 @@ void radial2cartesian(PATTERN *pattern)
 void radial2cartesian(PATTERN *pattern)
 =======
 >>>>>>> osgeo-main
+=======
+void radial2cartesian(PATTERN *pattern)
+=======
+>>>>>>> osgeo-main
 int radial2cartesian(PATTERN *pattern)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -340,6 +345,7 @@ void radial2cartesian(PATTERN *pattern)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -369,6 +375,8 @@ void radial2cartesian(PATTERN *pattern)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 int radial2cartesian(PATTERN *pattern)
 =======
 void radial2cartesian(PATTERN *pattern)
@@ -388,6 +396,7 @@ void radial2cartesian(PATTERN *pattern)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -472,6 +481,8 @@ int radial2cartesian(PATTERN *pattern)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     /* this function converts radial coordinates of geomorphon
      * (assuming center as 0,0) to cartezian coordinates
diff --git a/raster/r.geomorphon/local_proto.h b/raster/r.geomorphon/local_proto.h
index 03c39a7ab9a..c80a5f2b6ab 100644
--- a/raster/r.geomorphon/local_proto.h
+++ b/raster/r.geomorphon/local_proto.h
@@ -95,6 +95,7 @@ GLOBAL struct Cell_head window;
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -162,6 +163,10 @@ GLOBAL struct Cell_head window;
 >>>>>>> osgeo-main
 =======
 
+=======
+>>>>>>> osgeo-main
+=======
+
 =======
 >>>>>>> osgeo-main
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
@@ -187,6 +192,7 @@ GLOBAL struct Cell_head window;
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -283,6 +289,8 @@ GLOBAL struct Cell_head window;
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 /* Zenith/nadir comparison modes. */
 GLOBAL enum { ANGLEV1, ANGLEV2, ANGLEV2_DISTANCE } compmode;
 
diff --git a/raster/r.geomorphon/main.c b/raster/r.geomorphon/main.c
index 764c13eadc8..3dfa5739026 100644
--- a/raster/r.geomorphon/main.c
+++ b/raster/r.geomorphon/main.c
@@ -65,6 +65,7 @@ typedef enum {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -116,6 +117,8 @@ typedef enum {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 typedef struct
 {
     char name[100];
@@ -139,6 +142,7 @@ typedef struct
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -161,6 +165,8 @@ typedef struct
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 298e3c87b5 (Dockerfile_alpine: fix broken link creatio)
 =======
 >>>>>>> 5e2891edf8 (Dockerfile_alpine: fix broken link creatio)
@@ -180,6 +186,7 @@ typedef struct
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 <<<<<<< HEAD
@@ -273,6 +280,10 @@ typedef struct
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
+>>>>>>> osgeo-main
 int main(int argc, char **argv)
 {
     struct { /* struct is used both for interface and output */
@@ -335,6 +346,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -383,6 +395,8 @@ int main(int argc, char **argv)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     struct Option *opt_input, *opt_output[o_size], *par_search_radius,
         *par_skip_radius, *par_flat_threshold, *par_flat_distance,
@@ -405,6 +419,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -443,6 +458,8 @@ int main(int argc, char **argv)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     struct Option
         *opt_input,
@@ -471,6 +488,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -493,6 +511,8 @@ int main(int argc, char **argv)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 756514063b (Dockerfile: fix broken lib link (#1625))
 =======
 >>>>>>> c875f035a5 (Dockerfile: fix broken lib link (#1625))
@@ -515,6 +535,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -543,6 +564,8 @@ int main(int argc, char **argv)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     struct Option *opt_input, *opt_output[o_size], *par_search_radius,
         *par_skip_radius, *par_flat_threshold, *par_flat_distance,
@@ -562,6 +585,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -627,6 +651,8 @@ int main(int argc, char **argv)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     struct Flag *flag_units, *flag_extended;
 
@@ -892,6 +918,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -931,6 +958,8 @@ int main(int argc, char **argv)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -948,6 +977,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1001,6 +1031,8 @@ int main(int argc, char **argv)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 G_warning(
                     _("There may be a notable processing delay because the "
@@ -1027,6 +1059,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1079,6 +1112,9 @@ int main(int argc, char **argv)
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
                 G_warning(_("There may be a notable processing delay because the "
                            "computational region is %lu times larger than necessary"),
@@ -1103,6 +1139,7 @@ int main(int argc, char **argv)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1208,6 +1245,10 @@ int main(int argc, char **argv)
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         }
     }
diff --git a/raster/r.geomorphon/memory.c b/raster/r.geomorphon/memory.c
index f1edee57dce..e5819e9486c 100644
--- a/raster/r.geomorphon/memory.c
+++ b/raster/r.geomorphon/memory.c
@@ -21,6 +21,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -93,6 +94,10 @@ typedef struct {
 typedef struct {
 =======
 >>>>>>> osgeo-main
+=======
+typedef struct {
+=======
+>>>>>>> osgeo-main
 typedef struct
 {
 <<<<<<< HEAD
@@ -116,6 +121,7 @@ typedef struct {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 typedef struct {
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -237,6 +243,11 @@ typedef struct {
 =======
 typedef struct {
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+typedef struct {
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     const char *sname;
     int r;
@@ -290,6 +301,7 @@ static const CATCOLORS ccolors[CNT] = {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -364,6 +376,10 @@ static const CATCOLORS ccolors[CNT] = {
 =======
     [__] = {"ERROR", 255, 0, 255, "ERROR"}};
 =======
+>>>>>>> osgeo-main
+=======
+    [__] = {"ERROR", 255, 0, 255, "ERROR"}};
+=======
 >>>>>>> osgeo-main
     [__] = {"ERROR", 255, 0, 255, "ERROR"}
 };
@@ -389,6 +405,7 @@ static const CATCOLORS ccolors[CNT] = {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     [__] = {"ERROR", 255, 0, 255, "ERROR"}};
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -518,6 +535,11 @@ static const CATCOLORS ccolors[CNT] = {
     [__] = {"ERROR", 255, 0, 255, "ERROR"}};
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+    [__] = {"ERROR", 255, 0, 255, "ERROR"}};
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 static int get_cell(int, float *, void *, RASTER_MAP_TYPE);
 
@@ -557,6 +579,7 @@ int open_map(MAPS *rast)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             _("Region resolution shoudn't be lesser than map %s resolution. "
 =======
@@ -599,6 +622,8 @@ int open_map(MAPS *rast)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             _("Region resolution shouldn't be lesser than map %s resolution. "
 =======
@@ -618,6 +643,7 @@ int open_map(MAPS *rast)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             _("Region resolution shoudn't be lesser than map %s resolution. "
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -700,6 +726,11 @@ int open_map(MAPS *rast)
 =======
             _("Region resolution shoudn't be lesser than map %s resolution. "
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            _("Region resolution shoudn't be lesser than map %s resolution. "
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
               "Run g.region raster=%s to set proper resolution"),
             rast->elevname, rast->elevname);
@@ -817,6 +848,7 @@ int write_form_cat_colors(char *raster)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -873,6 +905,8 @@ int write_form_cat_colors(char *raster)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         Rast_add_color_rule(&i, ccolors[i].r, ccolors[i].g, ccolors[i].b, &i,
                             ccolors[i].r, ccolors[i].g, ccolors[i].b, &colors,
@@ -896,6 +930,7 @@ int write_form_cat_colors(char *raster)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -934,6 +969,8 @@ int write_form_cat_colors(char *raster)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         Rast_add_color_rule(&i, ccolors[i].r, ccolors[i].g, ccolors[i].b,
                             &i, ccolors[i].r, ccolors[i].g, ccolors[i].b,
@@ -953,6 +990,7 @@ int write_form_cat_colors(char *raster)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 44a37129bc (Dockerfile_alpine: fix broken link creatio)
 =======
@@ -981,6 +1019,8 @@ int write_form_cat_colors(char *raster)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         Rast_add_color_rule(&i, ccolors[i].r, ccolors[i].g, ccolors[i].b,
                             &i, ccolors[i].r, ccolors[i].g, ccolors[i].b,
@@ -1000,6 +1040,7 @@ int write_form_cat_colors(char *raster)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1028,6 +1069,8 @@ int write_form_cat_colors(char *raster)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         Rast_add_color_rule(&i, ccolors[i].r, ccolors[i].g, ccolors[i].b, &i,
                             ccolors[i].r, ccolors[i].g, ccolors[i].b, &colors,
@@ -1047,6 +1090,7 @@ int write_form_cat_colors(char *raster)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1075,6 +1119,8 @@ int write_form_cat_colors(char *raster)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         Rast_add_color_rule(&i, ccolors[i].r, ccolors[i].g, ccolors[i].b, &i,
                             ccolors[i].r, ccolors[i].g, ccolors[i].b, &colors,
@@ -1094,6 +1140,7 @@ int write_form_cat_colors(char *raster)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1147,6 +1194,8 @@ int write_form_cat_colors(char *raster)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     Rast_write_colors(raster, G_mapset(), &colors);
     Rast_free_colors(&colors);
diff --git a/raster/r.geomorphon/r.geomorphon.html b/raster/r.geomorphon/r.geomorphon.html
index fc52e0a32ec..f8652bf3e37 100644
--- a/raster/r.geomorphon/r.geomorphon.html
+++ b/raster/r.geomorphon/r.geomorphon.html
@@ -183,6 +183,7 @@ 
    Geomorphon calculation: extraction of terrestrial landforms
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -228,6 +229,8 @@ 
    Geomorphon calculation: extraction of terrestrial landforms
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 <<<<<<< HEAD
 >>>>>>> 298e3c87b5 (Dockerfile_alpine: fix broken link creatio)
@@ -249,6 +252,7 @@ 
    Geomorphon calculation: extraction of terrestrial landforms
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -350,6 +354,10 @@ 
    Geomorphon calculation: extraction of terrestrial landforms
    
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
    Extraction of peaks
    
 
 Using the resulting terrestrial landforms map, single landforms can
diff --git a/raster/r.grow.distance/r.grow.distance.html b/raster/r.grow.distance/r.grow.distance.html
index 35748355c4a..209966c1400 100644
--- a/raster/r.grow.distance/r.grow.distance.html
+++ b/raster/r.grow.distance/r.grow.distance.html
@@ -77,6 +77,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 be used only in latitude-longitude locations. It is recommended
 =======
 <<<<<<< HEAD
@@ -119,6 +120,8 @@ 
    NOTES
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 be used only in latitude-longitude coordinate reference system. It is recommended
 =======
 be used only in latitude-longitude locations. It is recommended
@@ -137,6 +140,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 be used only in latitude-longitude locations. It is recommended
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -220,6 +224,11 @@ 
    NOTES
    
 be used only in latitude-longitude locations. It is recommended
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+be used only in latitude-longitude locations. It is recommended
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 to use it along with the -m flag in order to output
 distances in meters instead of map units.
 
diff --git a/raster/r.gwflow/main.c b/raster/r.gwflow/main.c
index d3e9bf28074..925e49fec10 100644
--- a/raster/r.gwflow/main.c
+++ b/raster/r.gwflow/main.c
@@ -249,6 +249,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         G_fatal_error(_("Lat/Long location is not supported by %s. Please "
 =======
@@ -291,6 +292,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_fatal_error(_("Lat/Long project is not supported by %s. Please "
 =======
@@ -310,6 +313,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         G_fatal_error(_("Lat/Long location is not supported by %s. Please "
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -392,6 +396,11 @@ int main(int argc, char *argv[])
 =======
         G_fatal_error(_("Lat/Long location is not supported by %s. Please "
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        G_fatal_error(_("Lat/Long location is not supported by %s. Please "
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                         "reproject map first."),
                       G_program_name());
@@ -634,6 +643,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (buff)
             G_free(buff);
@@ -679,6 +689,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         if (buff)
             G_free(buff);
@@ -698,6 +710,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -726,6 +739,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         if (buff)
             G_free(buff);
@@ -745,6 +760,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -786,6 +802,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (xcomp)
             N_free_array_2d(xcomp);
diff --git a/raster/r.gwflow/r.gwflow.html b/raster/r.gwflow/r.gwflow.html
index dad648984da..ff79105e4b0 100644
--- a/raster/r.gwflow/r.gwflow.html
+++ b/raster/r.gwflow/r.gwflow.html
@@ -21,6 +21,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -56,6 +57,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 raster maps. The unit of the current project's coordinate reference system must be meters.
 =======
 =======
@@ -74,6 +77,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -122,6 +126,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 raster maps. The unit in the location must be meters.
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 
    This module is sensitive to mask settings. All cells which are outside the mask
diff --git a/raster/r.horizon/main.c b/raster/r.horizon/main.c
index 2b113c36a79..dc9655dcd0b 100644
--- a/raster/r.horizon/main.c
+++ b/raster/r.horizon/main.c
@@ -28,6 +28,7 @@ module by Jaro Hofierka
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -69,6 +70,8 @@ module by Jaro Hofierka
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 Program was refactored by Anna Petrasova to remove most global variables.
 =======
@@ -87,6 +90,7 @@ Program was refactored by Anna Petrasova to remove most global variables.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -156,6 +160,10 @@ Program was refactored by Anna Petrasova to remove most global variables.
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 *******************************************************************************/
 /*
@@ -205,6 +213,7 @@ Program was refactored by Anna Petrasova to remove most global variables.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -246,6 +255,8 @@ Program was refactored by Anna Petrasova to remove most global variables.
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #define WHOLE_RASTER   1
 #define SINGLE_POINT   0
 #define RAD            (180. / M_PI)
@@ -277,6 +288,7 @@ Program was refactored by Anna Petrasova to remove most global variables.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -346,6 +358,10 @@ Program was refactored by Anna Petrasova to remove most global variables.
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #define WHOLE_RASTER      1
 #define SINGLE_POINT      0
 #define RAD               (180. / M_PI)
@@ -405,6 +421,7 @@ double horizon_height(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -427,6 +444,8 @@ double horizon_height(void);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void calculate_shadow(void);
 double calculate_shadow_onedirection(double shadow_angle);
 
@@ -443,6 +462,7 @@ int test_low_res(void);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
@@ -507,6 +527,8 @@ int test_low_res(void);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 /*void where_is_point();
    void cube(int, int);
@@ -578,6 +600,7 @@ typedef struct {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /* why not use G_distance() here which switches to geodesic/great
    circle distance as needed? */
 =======
@@ -621,6 +644,8 @@ typedef struct {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 typedef struct {
     int n, m, m100, n100;
     double stepx, stepy, stepxy;
@@ -686,6 +711,7 @@ double distance(double x1, double x2, double y1, double y2, double coslatsq)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -715,6 +741,8 @@ double distance(double x1, double x2, double y1, double y2, double coslatsq)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 /* why not use G_distance() here which switches to geodesic/great
    circle distance as needed? */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -732,6 +760,7 @@ double distance(double x1, double x2, double y1, double y2, double coslatsq)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -774,6 +803,8 @@ double distance(double x1, double x2, double y1, double y2, double coslatsq)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 double distance(double x1, double x2, double y1, double y2)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 {
@@ -812,6 +843,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             *maxdistance, *output;
     } parm;
@@ -857,6 +889,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             *maxdistance, *format, *output, *nprocs;
 =======
@@ -867,6 +901,9 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -903,6 +940,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -931,6 +969,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             *maxdistance, *output;
     } parm;
@@ -952,6 +992,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -993,6 +1034,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     } flag;
 
@@ -1077,6 +1120,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1111,6 +1155,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.bufferzone->options = "0-";
 =======
@@ -1131,6 +1177,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1181,6 +1228,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.bufferzone->guisection = _("Raster mode");
 
@@ -1207,6 +1256,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1241,6 +1291,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.e_buff->options = "0-";
 =======
@@ -1261,6 +1313,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1311,6 +1364,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.e_buff->guisection = _("Raster mode");
 
@@ -1337,6 +1392,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1371,6 +1427,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.w_buff->options = "0-";
 =======
@@ -1391,6 +1449,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1441,6 +1500,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.w_buff->guisection = _("Raster mode");
 
@@ -1467,6 +1528,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1501,6 +1563,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.n_buff->options = "0-";
 =======
@@ -1521,6 +1585,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1571,6 +1636,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.n_buff->guisection = _("Raster mode");
 
@@ -1597,6 +1664,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1631,6 +1699,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.s_buff->options = "0-";
 =======
@@ -1651,6 +1721,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1701,6 +1772,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     parm.s_buff->guisection = _("Raster mode");
 
@@ -1734,6 +1807,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         _("Coordinate for which you want to calculate the horizon");
 =======
@@ -1776,6 +1850,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         _("Coordinate(s) for which you want to calculate the horizon");
     parm.coord->multiple = YES;
@@ -1796,6 +1872,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         _("Coordinate for which you want to calculate the horizon");
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1878,6 +1955,11 @@ int main(int argc, char *argv[])
 =======
         _("Coordinate for which you want to calculate the horizon");
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        _("Coordinate for which you want to calculate the horizon");
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     parm.coord->guisection = _("Point mode");
 
@@ -1957,6 +2039,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     n /*n_cols */ = cellhd.cols;
     m /*n_rows */ = cellhd.rows;
@@ -2000,6 +2083,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     geometry.n /*n_cols */ = cellhd.cols;
     geometry.m /*n_rows */ = cellhd.rows;
@@ -2021,6 +2106,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2049,6 +2135,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     n /*n_cols */ = cellhd.cols;
     m /*n_rows */ = cellhd.rows;
@@ -2067,6 +2155,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2108,6 +2197,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     geometry.n100 = ceil(geometry.n / 100.);
@@ -2142,6 +2233,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -2233,6 +2325,11 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     elevin = parm.elevin->answer;
@@ -2260,6 +2357,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         setMode(WHOLE_RASTER);
     }
@@ -2331,6 +2429,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         mode = WHOLE_RASTER;
     }
@@ -2389,6 +2489,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         setMode(WHOLE_RASTER);
 <<<<<<< HEAD
@@ -2447,6 +2548,10 @@ int main(int argc, char *argv[])
         setMode(WHOLE_RASTER);
 >>>>>>> osgeo-main
 =======
+=======
+        setMode(WHOLE_RASTER);
+>>>>>>> osgeo-main
+=======
 =======
         setMode(WHOLE_RASTER);
 >>>>>>> osgeo-main
@@ -2492,6 +2597,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2528,6 +2634,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
     else {
@@ -2579,6 +2687,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2619,6 +2728,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         sscanf(parm.direction->answer, "%lf", &settings.single_direction);
 
@@ -2647,6 +2758,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2715,6 +2827,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         sscanf(parm.direction->answer, "%lf", &single_direction);
 
@@ -2741,6 +2857,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2831,6 +2948,11 @@ int main(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         if (parm.horizon->answer == NULL) {
             G_fatal_error(
@@ -2853,6 +2975,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2893,6 +3016,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         settings.horizon_basename = parm.horizon->answer;
         if (parm.step->answer != NULL) {
@@ -2925,6 +3050,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2993,6 +3119,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         horizon = parm.horizon->answer;
         if (parm.step->answer != NULL) {
@@ -3027,6 +3157,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3117,6 +3248,11 @@ int main(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             G_fatal_error(_("End angle is not between 0 and 360. Aborting."));
         }
@@ -3150,6 +3286,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -3190,6 +3327,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         sscanf(parm.step->answer, "%lf", &settings.step);
     }
@@ -3211,6 +3350,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3279,6 +3419,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         sscanf(parm.step->answer, "%lf", &step);
     }
@@ -3302,6 +3446,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -3392,6 +3537,11 @@ int main(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     }
     double bufferZone = 0., ebufferZone = 0., wbufferZone = 0.,
@@ -3443,6 +3593,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (sscanf(parm.maxdistance->answer, "%lf", &fixedMaxLength) != 1)
             G_fatal_error(_("Could not read maximum distance. Aborting."));
@@ -3488,6 +3639,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (sscanf(parm.maxdistance->answer, "%lf", &settings.fixedMaxLength) !=
             1)
@@ -3515,6 +3668,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3550,6 +3704,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     /* TODO: fixing BIG, there is a bug with distant mountains not being seen:
@@ -3573,6 +3729,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3613,6 +3770,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     sscanf(parm.dist->answer, "%lf", &geometry.distxy);
     if (geometry.distxy < 0.5 || geometry.distxy > 1.5)
@@ -3646,6 +3805,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -3693,6 +3853,9 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
 
     sscanf(parm.dist->answer, "%lf", &dist);
@@ -3710,6 +3873,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3746,6 +3910,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_fatal_error(_("The distance value must be 0.5-1.5. Aborting."));
 
@@ -3780,6 +3946,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         new_cellhd.rows += (int)((nbufferZone + sbufferZone) / stepy);
         new_cellhd.cols += (int)((ebufferZone + wbufferZone) / stepx);
@@ -3842,6 +4009,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         /* adjust buffer to multiples of resolution */
         ebufferZone = (int)(ebufferZone / geometry.stepx) * geometry.stepx;
@@ -3906,6 +4075,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3934,6 +4104,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         new_cellhd.rows += (int)((nbufferZone + sbufferZone) / stepy);
         new_cellhd.cols += (int)((ebufferZone + wbufferZone) / stepx);
@@ -3971,6 +4143,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4012,6 +4185,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         Rast_set_window(&new_cellhd);
     }
@@ -4100,6 +4275,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4190,6 +4366,11 @@ int main(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     exit(EXIT_SUCCESS);
@@ -4214,6 +4395,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -4249,6 +4431,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int INPUT(Geometry *geometry, const char *elevin)
 =======
 =======
@@ -4267,6 +4451,7 @@ int INPUT(Geometry *geometry, const char *elevin)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4315,6 +4500,8 @@ int INPUT(Geometry *geometry, const char *elevin)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int INPUT(void)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 {
@@ -4355,6 +4542,7 @@ int INPUT(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4445,6 +4633,11 @@ int INPUT(void)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     }
     /*read Z raster */
@@ -4480,6 +4673,7 @@ int INPUT(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4570,6 +4764,11 @@ int INPUT(void)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
             if (!Rast_is_f_null_value(cell1 + j))
@@ -4597,6 +4796,7 @@ int INPUT(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     for (i = 0; i < m100; i++) {
         lmax = (i + 1) * 100;
@@ -4643,6 +4843,8 @@ int INPUT(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     for (int i = 0; i < geometry->m100; i++) {
         int lmax = (i + 1) * 100;
@@ -4680,6 +4882,7 @@ int INPUT(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4708,6 +4911,8 @@ int INPUT(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     for (i = 0; i < m100; i++) {
         lmax = (i + 1) * 100;
@@ -4729,6 +4934,7 @@ int INPUT(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4770,6 +4976,8 @@ int INPUT(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         for (j = 0; j < n100; j++) {
             zmax = SMALL;
@@ -4799,6 +5007,7 @@ int INPUT(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4889,6 +5098,11 @@ int INPUT(void)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             G_debug(3, "%d %d %lf\n", i, j, z100[i][j]);
         }
@@ -4920,6 +5134,7 @@ int INPUT(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5010,6 +5225,11 @@ int INPUT(void)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         }
     }
@@ -5034,6 +5254,7 @@ int INPUT(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -5069,6 +5290,8 @@ int INPUT(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int OUTGR(const Settings *settings, char *shad_filename,
           struct Cell_head *cellhd)
 =======
@@ -5088,6 +5311,7 @@ int OUTGR(const Settings *settings, char *shad_filename,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5139,6 +5363,8 @@ int OUTGR(const Settings *settings, char *shad_filename,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int OUTGR(int numrows, int numcols)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 {
@@ -5170,6 +5396,7 @@ int OUTGR(int numrows, int numcols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5260,6 +5487,11 @@ int OUTGR(int numrows, int numcols)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         cell1 = Rast_allocate_f_buf();
         fd1 = Rast_open_fp_new(shad_filename);
@@ -5302,6 +5534,7 @@ int OUTGR(int numrows, int numcols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5392,6 +5625,11 @@ int OUTGR(int numrows, int numcols)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 if (horizon_raster[i][j] == UNDEFZ)
                     Rast_set_f_null_value(cell1 + j, 1);
@@ -5423,6 +5661,7 @@ int OUTGR(int numrows, int numcols)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -5515,6 +5754,11 @@ int OUTGR(int numrows, int numcols)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 double amax1(arg1, arg2)
 double arg1;
 double arg2;
@@ -5592,6 +5836,7 @@ int arg2;
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5683,6 +5928,11 @@ int arg2;
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /**********************************************************/
 
 void com_par(const Geometry *geometry, OriginAngle *origin_angle, double angle,
@@ -5769,6 +6019,7 @@ void com_par(const Geometry *geometry, OriginAngle *origin_angle, double angle,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5859,6 +6110,11 @@ void com_par(const Geometry *geometry, OriginAngle *origin_angle, double angle,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     }
 
@@ -5916,6 +6172,7 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
     tanh0 = -INFINITY;
@@ -5974,6 +6231,8 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     origin_point.z_orig = z[yindex][xindex];
     G_debug(1, "yindex: %d, xindex %d, z_orig %.2f", yindex, xindex,
@@ -6002,6 +6261,7 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6031,6 +6291,8 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
     tanh0 = -1.0 / 0.0; /* -inf */
 =======
@@ -6050,6 +6312,7 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -6078,6 +6341,8 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     tanh0 = -1.0 / 0.0; /* -inf */
 =======
@@ -6098,6 +6363,7 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6148,6 +6414,8 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     length = 0;
 
@@ -6185,6 +6453,7 @@ double calculate_shadow_onedirection(double shadow_angle)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 void calculate_shadow(void)
@@ -6263,6 +6532,11 @@ void calculate_shadow(void)
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
+=======
+void calculate_shadow(void)
+=======
+<<<<<<< HEAD
+>>>>>>> osgeo-main
 void calculate_shadow()
 =======
 void calculate_shadow(void)
@@ -6282,6 +6556,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6336,6 +6611,8 @@ void calculate_shadow(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     double dfr_rad;
 
@@ -6373,6 +6650,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -6413,6 +6691,8 @@ void calculate_shadow(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 
     double angle = (settings->single_direction * deg2rad) + pihalf;
@@ -6433,6 +6713,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6468,6 +6749,8 @@ void calculate_shadow(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     origin_point.maxlength = settings->fixedMaxLength;
@@ -6515,6 +6798,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -6622,6 +6906,8 @@ void calculate_shadow(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (format == JSON) {
             value = json_value_init_object();
@@ -6637,6 +6923,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> cb0e431f06 (r.horizon: change JSON format (#3888))
 =======
 =======
@@ -6660,6 +6947,8 @@ void calculate_shadow(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 <<<<<<< HEAD
 >>>>>>> dad8f82179 (wxpyimgview: explicit conversion to int (#2704))
@@ -6670,6 +6959,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -6700,6 +6990,8 @@ void calculate_shadow(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (settings->compassOutput) {
             double tmpangle;
@@ -6837,6 +7129,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6865,6 +7158,8 @@ void calculate_shadow(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         ip = jp = 0;
 
@@ -6947,6 +7242,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6988,6 +7284,8 @@ void calculate_shadow(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (angle < 0.)
             angle += twopi;
@@ -7011,6 +7309,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7102,6 +7401,11 @@ void calculate_shadow(void)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 }
 
 /*////////////////////////////////////////////////////////////////////// */
@@ -7130,6 +7434,7 @@ void calculate_shadow(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 int new_point(void)
@@ -7189,6 +7494,8 @@ int new_point(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int new_point(const Geometry *geometry, const OriginPoint *origin_point,
               const OriginAngle *origin_angle, SearchPoint *search_point,
               HorizonProperties *horizon)
@@ -7207,6 +7514,7 @@ int new_point(const Geometry *geometry, const OriginPoint *origin_point,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7236,6 +7544,8 @@ int new_point(const Geometry *geometry, const OriginPoint *origin_point,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 int new_point()
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7256,6 +7566,7 @@ int new_point(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -7285,6 +7596,8 @@ int new_point(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 int new_point()
 =======
 int new_point(void)
@@ -7304,6 +7617,7 @@ int new_point(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7358,6 +7672,8 @@ int new_point()
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int iold = search_point->ip;
     int jold = search_point->jp;
@@ -7432,6 +7748,7 @@ int new_point()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7522,6 +7839,11 @@ int new_point()
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 return (1);
             }
@@ -7554,6 +7876,7 @@ int new_point()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 int test_low_res(void)
@@ -7613,6 +7936,8 @@ int test_low_res(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int test_low_res(const Geometry *geometry, const OriginPoint *origin_point,
                  const OriginAngle *origin_angle, SearchPoint *search_point,
                  const HorizonProperties *horizon)
@@ -7631,6 +7956,7 @@ int test_low_res(const Geometry *geometry, const OriginPoint *origin_point,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7660,6 +7986,8 @@ int test_low_res(const Geometry *geometry, const OriginPoint *origin_point,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 int test_low_res()
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7680,6 +8008,7 @@ int test_low_res(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -7709,6 +8038,8 @@ int test_low_res(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 int test_low_res()
 =======
 int test_low_res(void)
@@ -7728,6 +8059,7 @@ int test_low_res(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7782,6 +8114,8 @@ int test_low_res()
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int iold100 = search_point->ip100;
     int jold100 = search_point->jp100;
@@ -7830,6 +8164,7 @@ int test_low_res()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7920,6 +8255,11 @@ int test_low_res()
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         if (zp100 <= z2)
@@ -7941,6 +8281,7 @@ int test_low_res()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             delx = 32000;
             dely = 32000;
@@ -8012,6 +8353,8 @@ int test_low_res()
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             int delx = 32000;
             int dely = 32000;
@@ -8084,6 +8427,7 @@ int test_low_res()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8111,6 +8455,8 @@ int test_low_res()
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             mindel = min(delx, dely);
@@ -8127,6 +8473,7 @@ int test_low_res()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
 
 <<<<<<< HEAD
@@ -8196,6 +8543,9 @@ int test_low_res()
 >>>>>>> osgeo-main
 =======
 
+>>>>>>> osgeo-main
+=======
+
 >>>>>>> osgeo-main
 =======
             delx = 32000;
@@ -8243,6 +8593,7 @@ int test_low_res()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8278,6 +8629,8 @@ int test_low_res()
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             return (3);
         }
@@ -8315,6 +8668,7 @@ int test_low_res()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 double searching(void)
@@ -8374,6 +8728,8 @@ double searching(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 HorizonProperties horizon_height(const Geometry *geometry,
                                  const OriginPoint *origin_point,
                                  const OriginAngle *origin_angle)
@@ -8392,6 +8748,7 @@ HorizonProperties horizon_height(const Geometry *geometry,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -8421,6 +8778,8 @@ HorizonProperties horizon_height(const Geometry *geometry,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 double searching()
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -8441,6 +8800,7 @@ double searching(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -8470,6 +8830,8 @@ double searching(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 double searching()
 =======
 double searching(void)
@@ -8489,6 +8851,7 @@ double searching(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8543,6 +8906,8 @@ double searching()
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     SearchPoint search_point;
     HorizonProperties horizon;
@@ -8563,6 +8928,7 @@ double searching()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     if (zp == UNDEFZ)
         return 0;
@@ -8628,6 +8994,8 @@ double searching()
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     search_point.ip = 0;
     search_point.jp = 0;
@@ -8710,6 +9078,7 @@ double searching()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -8738,6 +9107,8 @@ double searching()
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     if (zp == UNDEFZ)
         return 0;
@@ -8778,6 +9149,7 @@ double searching()
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8819,6 +9191,8 @@ double searching()
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             break;
         }
@@ -8855,6 +9229,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -8946,6 +9321,11 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 {
     int hor_row_start = buffer_s;
     int hor_row_end = geometry->m - buffer_n;
@@ -8973,6 +9353,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         ll_correction = TRUE;
     }
@@ -9017,6 +9398,8 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ll_correction = true;
     }
@@ -9064,6 +9447,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -9092,6 +9476,8 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         ll_correction = TRUE;
     }
@@ -9111,6 +9497,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9152,6 +9539,8 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if (isMode() == SINGLE_POINT) {
         /* Calculate the horizon for one single point */
@@ -9195,6 +9584,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -9285,6 +9675,11 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     }
     else {
@@ -9311,6 +9706,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         /****************************************************************/
         /*  The loop over raster points starts here!                    */
@@ -9381,6 +9777,8 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     size_t decimals = G_get_num_decimals(settings->str_step);
 
@@ -9415,6 +9813,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         /****************************************************************/
         /*  The loop over raster points starts here!                    */
@@ -9659,6 +10058,11 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
         /*  The loop over raster points starts here!                    */
 >>>>>>> osgeo-main
 =======
+=======
+        /****************************************************************/
+        /*  The loop over raster points starts here!                    */
+>>>>>>> osgeo-main
+=======
 =======
         /****************************************************************/
         /*  The loop over raster points starts here!                    */
@@ -9825,6 +10229,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -9853,6 +10258,8 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         for (k = 0; k < arrayNumInt; k++) {
             struct History history;
@@ -9872,6 +10279,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9913,6 +10321,8 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             angle = (start + single_direction) * deg2rad + (dfr_rad * k);
             angle_deg = angle * rad2deg + 0.0001;
@@ -10086,6 +10496,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -10176,6 +10587,11 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     }
 
diff --git a/raster/r.horizon/r.horizon.html b/raster/r.horizon/r.horizon.html
index 85bb1bfa298..f38a562c9ae 100644
--- a/raster/r.horizon/r.horizon.html
+++ b/raster/r.horizon/r.horizon.html
@@ -22,6 +22,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -57,6 +58,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
  •  point: as a series of horizon
 heights in the specified directions from the given point(s). The results are
 =======
@@ -76,6 +79,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -127,6 +131,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
  •  single point: as a series of horizon
 heights in the specified directions from the given point. The results are
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -247,6 +253,7 @@ 
    Input parameters:
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 in the single point mode this option will be ignored.
 =======
 <<<<<<< HEAD
@@ -289,6 +296,8 @@ 
    Input parameters:
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 in the point mode this option will be ignored.
 =======
 in the single point mode this option will be ignored.
@@ -307,6 +316,7 @@ 
    Input parameters:
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 in the single point mode this option will be ignored.
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -390,6 +400,11 @@ 
    Input parameters:
    
 in the single point mode this option will be ignored.
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+in the single point mode this option will be ignored.
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 
 
    The file parameter allows saving the resulting horizon
 angles in a comma separated ASCII file with option format=plain
@@ -417,6 +432,7 @@ 
    Input parameters:
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -456,6 +472,8 @@ 
    Input parameters:
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -473,6 +491,7 @@ 
    Input parameters:
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -527,6 +546,8 @@ 
    Input parameters:
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
    At the moment the elevation and maximum distance must be measured in meters,
 even if you use geographical coordinates (longitude/latitude). If your
 projection is based on distance (easting and northing), these too must
@@ -548,6 +569,7 @@ 
    Input parameters:
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 raster coordinates (e.g., for latitude-longitude locations buffers are
 measured in degree unit).
 =======
@@ -591,6 +613,8 @@ 
    Input parameters:
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 raster coordinates (e.g., for latitude-longitude buffers are
 measured in degrees).
 =======
@@ -613,6 +637,7 @@ 
    Input parameters:
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -636,6 +661,8 @@ 
    Input parameters:
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -651,6 +678,7 @@ 
    Input parameters:
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -694,6 +722,8 @@ 
    Input parameters:
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 raster coordinates (e.g., for latitude-longitude locations buffers are
 measured in degree unit).
 <<<<<<< HEAD
@@ -712,6 +742,7 @@ 
    Input parameters:
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -772,6 +803,8 @@ 
    Input parameters:
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
    NOTES
    
 
@@ -958,6 +991,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1028,6 +1062,10 @@ 
    AUTHORS
    
 =======
 >>>>>>> osgeo-main
 =======
+the European Commission, Ispra, Italy
+=======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 the European Commission, Ispra, Italy 
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1054,6 +1092,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1144,6 +1183,8 @@ 
    AUTHORS
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
    
 
    Tomas Cebecauer, Joint Research Centre
 of the European Commission, Ispra, Italy
@@ -1177,6 +1218,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1249,6 +1291,10 @@ 
    AUTHORS
    
 Marcel.Suri@jrc.it
 =======
 >>>>>>> osgeo-main
+=======
+Marcel.Suri@jrc.it
+=======
+>>>>>>> osgeo-main
 Marcel.Suri@jrc.it 
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1271,6 +1317,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1300,6 +1347,8 @@ 
    AUTHORS
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 Marcel.Suri@jrc.it 
 =======
 Marcel.Suri@jrc.it
@@ -1319,6 +1368,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1397,3 +1447,5 @@ 
    AUTHORS
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/raster/r.in.ascii/gethead.c b/raster/r.in.ascii/gethead.c
index 4e5f46d0b8c..004fc0a23df 100644
--- a/raster/r.in.ascii/gethead.c
+++ b/raster/r.in.ascii/gethead.c
@@ -88,6 +88,7 @@ int getgrdhead(FILE *fd, struct Cell_head *cellhd)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
        raster specifies an area covered by rectangular cells centerd at gridded
 =======
@@ -130,6 +131,8 @@ int getgrdhead(FILE *fd, struct Cell_head *cellhd)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
        raster specifies an area covered by rectangular cells centered at gridded
 =======
@@ -149,6 +152,7 @@ int getgrdhead(FILE *fd, struct Cell_head *cellhd)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
        raster specifies an area covered by rectangular cells centerd at gridded
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -231,6 +235,11 @@ int getgrdhead(FILE *fd, struct Cell_head *cellhd)
 =======
        raster specifies an area covered by rectangular cells centerd at gridded
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+       raster specifies an area covered by rectangular cells centerd at gridded
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
        points. That difference requires an adjustment */
     cellhd->north = ymax + cellhd->ns_res / 2.;
@@ -404,6 +413,7 @@ int gethead(FILE *fd, struct Cell_head *cellhd, RASTER_MAP_TYPE *d_type,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 static int scan_int(const char *s, double *i, int proj)
 =======
 <<<<<<< HEAD
@@ -446,6 +456,8 @@ static int scan_int(const char *s, double *i, int proj)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 static int scan_int(const char *s, double *i, int proj UNUSED)
 =======
 static int scan_int(const char *s, double *i, int proj)
@@ -464,6 +476,7 @@ static int scan_int(const char *s, double *i, int proj)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 static int scan_int(const char *s, double *i, int proj)
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -547,6 +560,11 @@ static int scan_int(const char *s, double *i, int proj)
 static int scan_int(const char *s, double *i, int proj)
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+static int scan_int(const char *s, double *i, int proj)
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 {
     char dummy[3];
     int *i_loc = (int *)i;
@@ -577,6 +595,7 @@ static int scan_int(const char *s, double *i, int proj)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -639,6 +658,8 @@ static int scan_int(const char *s, double *i, int proj)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if (sscanf(s, "%d%1s", i_loc, dummy) != 1)
         return 0;
@@ -660,6 +681,7 @@ static int scan_int(const char *s, double *i, int proj)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -747,6 +769,8 @@ static int scan_int(const char *s, double *i, int proj)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
     if (sscanf(s, "%d%1s", i, dummy) != 1)
@@ -762,6 +786,7 @@ static int scan_int(const char *s, double *i, int proj)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
 <<<<<<< HEAD
@@ -876,6 +901,9 @@ static int scan_int(const char *s, double *i, int proj)
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 =======
     if (sscanf(s, "%d%1s", i, dummy) != 1)
         return 0;
@@ -892,6 +920,7 @@ static int scan_int(const char *s, double *i, int proj)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
@@ -932,6 +961,8 @@ static int scan_int(const char *s, double *i, int proj)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
     if (sscanf(s, "%d%1s", i_loc, dummy) != 1)
@@ -948,6 +979,7 @@ static int scan_int(const char *s, double *i, int proj)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727))
 =======
 =======
@@ -988,6 +1020,11 @@ static int scan_int(const char *s, double *i, int proj)
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
         return 0;
     return 1;
@@ -1018,6 +1055,7 @@ static int extract(int count, char *label, char *value, void *data, int proj,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1092,6 +1130,10 @@ static int extract(int count, char *label, char *value, void *data, int proj,
 =======
                    int (*scanner)(const char *, double *, int))
 =======
+>>>>>>> osgeo-main
+=======
+                   int (*scanner)(const char *, double *, int))
+=======
 >>>>>>> osgeo-main
                    int (*scanner)())
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1115,6 +1157,7 @@ static int extract(int count, char *label, char *value, void *data, int proj,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1143,6 +1186,8 @@ static int extract(int count, char *label, char *value, void *data, int proj,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                    int (*scanner)())
 =======
@@ -1163,6 +1208,7 @@ static int extract(int count, char *label, char *value, void *data, int proj,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1247,6 +1293,8 @@ static int extract(int count, char *label, char *value, void *data, int proj,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     if (count) {
         G_warning(_("Duplicate \"%s\" field in header"), label);
diff --git a/raster/r.in.ascii/main.c b/raster/r.in.ascii/main.c
index b24ef9bfc06..65a5132ee63 100644
--- a/raster/r.in.ascii/main.c
+++ b/raster/r.in.ascii/main.c
@@ -256,6 +256,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -330,6 +331,10 @@ int main(int argc, char *argv[])
 =======
         if (fread(rast, Rast_cell_size(data_type), ncols, ft) != (size_t)ncols)
 =======
+>>>>>>> osgeo-main
+=======
+        if (fread(rast, Rast_cell_size(data_type), ncols, ft) != (size_t)ncols)
+=======
 >>>>>>> osgeo-main
         if (fread(rast, Rast_cell_size(data_type), ncols, ft) != ncols)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -353,6 +358,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -381,6 +387,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         if (fread(rast, Rast_cell_size(data_type), ncols, ft) != ncols)
 =======
@@ -401,6 +409,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -484,6 +493,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             G_fatal_error(_("Read from file error: %s"), strerror(errno));
         Rast_put_row(cf, rast, data_type);
diff --git a/raster/r.in.ascii/testsuite/test_r_in_ascii.py b/raster/r.in.ascii/testsuite/test_r_in_ascii.py
index cff31b7b3e2..baa892d83a8 100644
--- a/raster/r.in.ascii/testsuite/test_r_in_ascii.py
+++ b/raster/r.in.ascii/testsuite/test_r_in_ascii.py
@@ -5,8 +5,8 @@
 Author:     Sunveer Singh, Google Code-in 2017
 Copyright:  (C) 2017 by Sunveer Singh and the GRASS Development Team
 Licence:    This program is free software under the GNU General Public
-	            License (>=v2). Read the file COPYING that comes with GRASS
-	            for details.
+            License (>=v2). Read the file COPYING that comes with GRASS
+            for details.
 """
 
 from grass.gunittest.case import TestCase
diff --git a/raster/r.in.bin/main.c b/raster/r.in.bin/main.c
index f576ca3bde0..6ff155a61ea 100644
--- a/raster/r.in.bin/main.c
+++ b/raster/r.in.bin/main.c
@@ -279,6 +279,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -353,6 +354,10 @@ int main(int argc, char *argv[])
 =======
     double null_val = NAN;
 =======
+>>>>>>> osgeo-main
+=======
+    double null_val = NAN;
+=======
 >>>>>>> osgeo-main
     double null_val = 0.0 / 0.0;
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -376,6 +381,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -404,6 +410,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     double null_val = 0.0 / 0.0;
 =======
@@ -424,6 +432,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -507,6 +516,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int is_fp;
     int is_signed;
@@ -871,6 +882,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         G_warning(_("File Size %" PRI_OFF_T " ... Total Bytes %" PRI_OFF_T),
 =======
@@ -913,6 +925,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_warning(_("File Size %" PRId64 " ... Total Bytes %" PRId64),
 =======
@@ -932,6 +946,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         G_warning(_("File Size %" PRI_OFF_T " ... Total Bytes %" PRI_OFF_T),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1014,6 +1029,11 @@ int main(int argc, char *argv[])
 =======
         G_warning(_("File Size %" PRI_OFF_T " ... Total Bytes %" PRI_OFF_T),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        G_warning(_("File Size %" PRI_OFF_T " ... Total Bytes %" PRI_OFF_T),
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                   file_size, expected);
         G_fatal_error(_("Bytes do not match file size"));
@@ -1078,6 +1098,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1152,6 +1173,10 @@ int main(int argc, char *argv[])
 =======
             if (fread(in_buf, bytes, ncols, fp) != (size_t)ncols)
 =======
+>>>>>>> osgeo-main
+=======
+            if (fread(in_buf, bytes, ncols, fp) != (size_t)ncols)
+=======
 >>>>>>> osgeo-main
             if (fread(in_buf, bytes, ncols, fp) != ncols)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1175,6 +1200,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1203,6 +1229,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             if (fread(in_buf, bytes, ncols, fp) != ncols)
 =======
@@ -1223,6 +1251,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1306,6 +1335,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 G_fatal_error(_("Error reading data"));
 
diff --git a/raster/r.in.gdal/main.c b/raster/r.in.gdal/main.c
index bb7e10a7169..8653d4eee80 100644
--- a/raster/r.in.gdal/main.c
+++ b/raster/r.in.gdal/main.c
@@ -173,6 +173,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -263,6 +264,11 @@ int main(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     parm.target->key_desc = "name";
     parm.target->guisection = _("Projection");
@@ -361,6 +367,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -451,6 +458,11 @@ int main(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     flag_o->guisection = _("Projection");
 
@@ -509,6 +521,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     flag_c->description = _(
         "Create the location specified by the \"location\" parameter and exit."
@@ -553,6 +566,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     flag_c->description =
         _("Create the project specified by the \"project\" parameter and exit."
@@ -576,6 +591,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -604,6 +620,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     flag_c->description = _(
         "Create the location specified by the \"location\" parameter and exit."
@@ -623,6 +641,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -664,6 +683,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     flag_r = G_define_flag();
@@ -763,6 +784,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         G_fatal_error(_("You have to specify a target location different from "
                         "output location"));
@@ -814,6 +836,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_fatal_error(_("You have to specify a target project different from "
                         "output project"));
@@ -851,6 +875,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -879,6 +904,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         G_fatal_error(_("You have to specify a target location different from "
                         "output location"));
@@ -905,6 +932,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -946,6 +974,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     if (num_digits < 0)
@@ -979,6 +1009,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         G_warning(_("Disabling '-r' flag for new location"));
 =======
@@ -1021,6 +1052,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_warning(_("Disabling '-r' flag for new project"));
 =======
@@ -1040,6 +1073,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         G_warning(_("Disabling '-r' flag for new location"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1122,6 +1156,11 @@ int main(int argc, char *argv[])
 =======
         G_warning(_("Disabling '-r' flag for new location"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        G_warning(_("Disabling '-r' flag for new location"));
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         croptoregion = 0;
     }
@@ -1746,6 +1785,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     G_warning(
                         _("Unable to convert input map projection to GRASS "
@@ -1790,6 +1830,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     G_warning(_("Unable to convert input map CRS to GRASS "
                                 "format; cannot create new project."));
@@ -1812,6 +1854,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1840,6 +1883,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                     G_warning(
                         _("Unable to convert input map projection to GRASS "
@@ -1859,6 +1904,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1900,6 +1946,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 }
                 else {
@@ -1971,6 +2019,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                         G_fatal_error(_("Unable to create new location <%s>"),
 =======
@@ -2013,6 +2062,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                         G_fatal_error(_("Unable to create new project <%s>"),
 =======
@@ -2032,6 +2083,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                         G_fatal_error(_("Unable to create new location <%s>"),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2114,6 +2166,11 @@ int main(int argc, char *argv[])
 =======
                         G_fatal_error(_("Unable to create new location <%s>"),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                        G_fatal_error(_("Unable to create new location <%s>"),
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                                       parm.target->answer);
                     }
@@ -2136,6 +2193,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     G_message(_("Location <%s> created"), parm.target->answer);
 =======
@@ -2178,6 +2236,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     G_message(_("Project <%s> created"), parm.target->answer);
 =======
@@ -2197,6 +2257,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                     G_message(_("Location <%s> created"), parm.target->answer);
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2279,6 +2340,11 @@ int main(int argc, char *argv[])
 =======
                     G_message(_("Location <%s> created"), parm.target->answer);
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                    G_message(_("Location <%s> created"), parm.target->answer);
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     /* set the group's target */
                     I_put_target(output, parm.target->answer, "PERMANENT");
@@ -2300,6 +2366,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                                 "location <%s>, mapset ."),
 =======
@@ -2342,6 +2409,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                                 "project <%s>, mapset ."),
 =======
@@ -2361,6 +2430,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                                 "location <%s>, mapset ."),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2443,6 +2513,11 @@ int main(int argc, char *argv[])
 =======
                                 "location <%s>, mapset ."),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                                "location <%s>, mapset ."),
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                               output, parm.target->answer);
                 }
@@ -2498,6 +2573,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             G_message(_("Default region for this location updated"));
 =======
@@ -2540,6 +2616,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             G_message(_("Default region for this project updated"));
 =======
@@ -2559,6 +2637,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             G_message(_("Default region for this location updated"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2641,6 +2720,11 @@ int main(int argc, char *argv[])
 =======
             G_message(_("Default region for this location updated"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            G_message(_("Default region for this location updated"));
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         }
         G_put_window(&cur_wind);
@@ -2707,6 +2791,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2747,6 +2832,8 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             G_fatal_error(_("Unable to get CRS info of target project"));
         if ((out_unit_info = G_get_projunits()) == NULL)
@@ -2768,6 +2855,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2836,6 +2924,10 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             G_fatal_error(
                 _("Unable to get projection info of target location"));
@@ -2862,6 +2954,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2952,6 +3045,11 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         tproj->def = NULL;
         if (GPJ_init_transform(iproj, oproj, tproj) < 0)
@@ -2975,6 +3073,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         sprintf(errbuf, _("Mapset <%s> in target location <%s> - "),
 =======
@@ -3017,6 +3116,8 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         sprintf(errbuf, _("Mapset <%s> in target project <%s> - "),
 =======
@@ -3036,6 +3137,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         sprintf(errbuf, _("Mapset <%s> in target location <%s> - "),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3118,6 +3220,11 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 =======
         sprintf(errbuf, _("Mapset <%s> in target location <%s> - "),
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        sprintf(errbuf, _("Mapset <%s> in target location <%s> - "),
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 target_mapset, pszDstLoc);
         strcat(errbuf,
diff --git a/raster/r.in.gdal/proj.c b/raster/r.in.gdal/proj.c
index 53d699f3705..331ad2751eb 100644
--- a/raster/r.in.gdal/proj.c
+++ b/raster/r.in.gdal/proj.c
@@ -147,6 +147,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                             "format; cannot create new location."));
 =======
@@ -189,6 +190,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                             "format; cannot create new project."));
 =======
@@ -208,6 +211,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                             "format; cannot create new location."));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -290,6 +294,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
                             "format; cannot create new location."));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                            "format; cannot create new location."));
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         }
         else {
@@ -311,6 +320,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                 G_fatal_error(_("Unable to create new location <%s>"), outloc);
             }
@@ -355,6 +365,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 G_fatal_error(_("Unable to create new project <%s>"), outloc);
             }
@@ -378,6 +390,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -406,6 +419,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                 G_fatal_error(_("Unable to create new location <%s>"), outloc);
             }
@@ -425,6 +440,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -466,6 +482,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             G_unset_window(); /* new location, projection, and window */
@@ -540,6 +558,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             strcpy(error_msg, _("Projection of dataset does not"
                                 " appear to match current location.\n\n"));
@@ -583,6 +602,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             strcpy(error_msg,
                    _("Coordinate reference system of dataset does not"
@@ -605,6 +626,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -633,6 +655,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             strcpy(error_msg, _("Projection of dataset does not"
                                 " appear to match current location.\n\n"));
@@ -651,6 +675,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -692,6 +717,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             /* TODO: output this info sorted by key: */
@@ -714,6 +741,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     strcat(error_msg, _("Location PROJ_INFO is:\n"));
 =======
@@ -756,6 +784,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     strcat(error_msg, _("Project PROJ_INFO is:\n"));
 =======
@@ -775,6 +805,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                     strcat(error_msg, _("Location PROJ_INFO is:\n"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -857,6 +888,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
                     strcat(error_msg, _("Location PROJ_INFO is:\n"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                    strcat(error_msg, _("Location PROJ_INFO is:\n"));
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     for (i_value = 0; i_value < loc_proj_info->nitems;
                          i_value++)
@@ -883,6 +919,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -923,6 +960,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     strcat(error_msg, _("Project PROJ_INFO is:\n"));
                     if (loc_wind.proj == PROJECTION_XY)
@@ -955,6 +994,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1023,6 +1063,10 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     strcat(error_msg, _("Location PROJ_INFO is:\n"));
                     if (loc_wind.proj == PROJECTION_XY)
@@ -1057,6 +1101,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1147,6 +1192,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                                 loc_wind.proj, cellhd->zone);
                 }
@@ -1237,6 +1287,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     strcat(error_msg, "Location PROJ_UNITS is:\n");
 =======
@@ -1279,6 +1330,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     strcat(error_msg, "Project PROJ_UNITS is:\n");
 =======
@@ -1298,6 +1351,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
                     strcat(error_msg, "Location PROJ_UNITS is:\n");
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1380,6 +1434,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
                     strcat(error_msg, "Location PROJ_UNITS is:\n");
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+                    strcat(error_msg, "Location PROJ_UNITS is:\n");
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     for (i_value = 0; i_value < loc_proj_units->nitems;
                          i_value++)
@@ -1416,6 +1475,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1456,6 +1516,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                                     "in the CRS definitions,"
                                     " use the -o flag to ignore them and use"
@@ -1478,6 +1540,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1546,6 +1609,10 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                                     "in the projection definitions,"
                                     " use the -o flag to ignore them and use"
@@ -1570,6 +1637,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1660,6 +1728,11 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             }
 
@@ -1694,6 +1767,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             msg_fn(_("Projection of input dataset and current location "
                      "appear to match"));
@@ -1737,6 +1811,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             msg_fn(_("Coordinate reference system of input dataset and current "
                      "project appear to match"));
@@ -1758,6 +1834,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1786,6 +1863,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             msg_fn(_("Projection of input dataset and current location "
                      "appear to match"));
@@ -1804,6 +1883,7 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1845,6 +1925,8 @@ void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS, char *outloc,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             if (check_only) {
                 GDALClose(hDS);
diff --git a/raster/r.in.gdal/r.in.gdal.html b/raster/r.in.gdal/r.in.gdal.html
index f0d11300098..4631264e94a 100644
--- a/raster/r.in.gdal/r.in.gdal.html
+++ b/raster/r.in.gdal/r.in.gdal.html
@@ -19,6 +19,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -54,6 +55,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 title. The imported file may also be used to create a new project
 (previously called location).
 =======
@@ -73,6 +76,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -124,6 +128,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 title. The imported file may also be optionally used to create a new location.
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 
@@ -286,6 +292,7 @@ 
    Project Creation
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 system of the source data and the current location, they may pass the
 -o flag to override the projection check.
 =======
@@ -329,6 +336,8 @@ 
    Project Creation
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 system of the source data and the current project, they may pass the
 -o flag to override the CRS check.
 =======
@@ -349,6 +358,7 @@ 
    Project Creation
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -378,6 +388,8 @@ 
    Project Creation
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 system of the source data and the current location, they may pass the
 -o flag to override the projection check.
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -395,6 +407,7 @@ 
    Project Creation
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -437,6 +450,8 @@ 
    Project Creation
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
    
 If the user wishes to import the data with the full CRS definition,
@@ -473,6 +488,7 @@ 
    Support for Ground Control Points
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 If the target location does not exist, a new location will be
 created matching the projection definition of the GCPs. The target of
 the output group will be set to the new location, and
@@ -517,6 +533,8 @@ 
    Support for Ground Control Points
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 If the target project does not exist, a new project will be
 created matching the CRS definition of the GCPs. The target of
 the output group will be set to the new project, and
@@ -539,6 +557,7 @@ 
    Support for Ground Control Points
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -568,6 +587,8 @@ 
    Support for Ground Control Points
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 If the target location does not exist, a new location will be
 created matching the projection definition of the GCPs. The target of
 the output group will be set to the new location, and
@@ -586,6 +607,7 @@ 
    Support for Ground Control Points
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -628,6 +650,8 @@ 
    Support for Ground Control Points
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 i.rectify can now be used without any further
 preparation.
 
    
@@ -703,6 +727,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
@@ -794,6 +819,11 @@ 
    NOTES
    
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 OpenGIS Well Known Text format.  A large subset of the total set of GRASS
 CRSs are supported.
    
 
@@ -827,6 +857,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 but not preserved.  It is up to the user to ensure that the location
 =======
 <<<<<<< HEAD
@@ -869,6 +900,8 @@ 
    NOTES
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 but not preserved.  It is up to the user to ensure that the project
 =======
 but not preserved.  It is up to the user to ensure that the location
@@ -887,6 +920,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 but not preserved.  It is up to the user to ensure that the location
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -970,6 +1004,11 @@ 
    NOTES
    
 but not preserved.  It is up to the user to ensure that the location
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+but not preserved.  It is up to the user to ensure that the location
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 established with i.target has a compatible coordinate system before using
 the points with i.rectify.
    
 
diff --git a/raster/r.in.lidar/main.c b/raster/r.in.lidar/main.c
index e2ff229072f..8909eebcdd9 100644
--- a/raster/r.in.lidar/main.c
+++ b/raster/r.in.lidar/main.c
@@ -316,6 +316,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         _("Override projection check (use current location's projection)");
     over_flag->description = _(
@@ -360,6 +361,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         _("Override projection check (use current project's CRS)");
     over_flag->description =
@@ -384,6 +387,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -412,6 +416,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         _("Override projection check (use current location's projection)");
     over_flag->description = _(
@@ -431,6 +437,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -472,6 +479,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     scan_flag = G_define_flag();
diff --git a/raster/r.in.lidar/projection.c b/raster/r.in.lidar/projection.c
index 672f72367ee..27a7a93ebb5 100644
--- a/raster/r.in.lidar/projection.c
+++ b/raster/r.in.lidar/projection.c
@@ -45,6 +45,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     strcpy(error_msg, _("Projection of dataset does not"
                         " appear to match current location.\n\n"));
@@ -88,6 +89,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     strcpy(error_msg, _("Coordinate reference system of dataset does not"
                         " appear to match current project.\n\n"));
@@ -109,6 +112,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -137,6 +141,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     strcpy(error_msg, _("Projection of dataset does not"
                         " appear to match current location.\n\n"));
@@ -155,6 +161,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -196,6 +203,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     /* TODO: output this info sorted by key: */
@@ -269,6 +278,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -309,6 +319,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             _("\nIn case of no significant differences"
               " in the coordinate reference system definitions,"
@@ -329,6 +341,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -397,6 +410,10 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             _("\nIn case of no significant differences in the projection "
               "definitions,"
@@ -419,6 +436,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -509,6 +527,11 @@ void projection_mismatch_report(struct Cell_head cellhd,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     strcat(error_msg,
            _("Consider generating a new project with 'project' parameter"
diff --git a/raster/r.in.lidar/r.in.lidar.html b/raster/r.in.lidar/r.in.lidar.html
index d7da7ff3164..fb77d1cff80 100644
--- a/raster/r.in.lidar/r.in.lidar.html
+++ b/raster/r.in.lidar/r.in.lidar.html
@@ -518,6 +518,7 @@ 
    Multiple file input
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 The file option requres a file that contains a list of file names with the full
 =======
 <<<<<<< HEAD
@@ -560,6 +561,8 @@ 
    Multiple file input
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 The file option requires a file that contains a list of file names with the full
 =======
 The file option requres a file that contains a list of file names with the full
@@ -578,6 +581,7 @@ 
    Multiple file input
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 The file option requres a file that contains a list of file names with the full
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -661,6 +665,11 @@ 
    Multiple file input
    
 The file option requres a file that contains a list of file names with the full
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+The file option requres a file that contains a list of file names with the full
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 path. For example, a list of files in the directory /home/user/data:
 
     points1.laz
diff --git a/raster/r.in.mat/main.c b/raster/r.in.mat/main.c
index 2d3ddd4d080..f05c98f166a 100644
--- a/raster/r.in.mat/main.c
+++ b/raster/r.in.mat/main.c
@@ -236,6 +236,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -298,6 +299,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 if (fread(&map_name, sizeof(char), ncols, fp1) != (size_t)ncols)
                     G_fatal_error(_("Error reading data"));
@@ -320,6 +323,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -352,6 +356,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -368,6 +374,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -416,6 +423,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 if (fread(&map_name, sizeof(char), ncols, fp1) != ncols)
                     G_fatal_error(_("Error reading data"));
@@ -442,6 +451,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -472,6 +482,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -490,6 +502,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
 =======
@@ -551,6 +564,10 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 =======
+>>>>>>> osgeo-main
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+=======
 >>>>>>> osgeo-main
                 if (fread(&map_name, sizeof(char), ncols, fp1) != (size_t)ncols)
                     G_fatal_error(_("Error reading data"));
@@ -573,6 +590,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -601,6 +619,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -619,6 +639,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -687,6 +708,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     G_fatal_error(_("Error reading data"));
                 for (i = 0; i < ncols; i++)
@@ -766,6 +789,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -854,6 +878,11 @@ int main(int argc, char *argv[])
                 if (fread(&map_title, sizeof(char), ncols, fp1) !=
                     (size_t)ncols)
 =======
+>>>>>>> osgeo-main
+=======
+                if (fread(&map_title, sizeof(char), ncols, fp1) !=
+                    (size_t)ncols)
+=======
 >>>>>>> osgeo-main
                 if (fread(&map_title, sizeof(char), ncols, fp1) != ncols)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -878,6 +907,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -906,6 +936,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                 if (fread(&map_title, sizeof(char), ncols, fp1) != ncols)
 =======
@@ -927,6 +959,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1013,6 +1046,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     G_fatal_error(_("Error reading data"));
             }
@@ -1042,6 +1077,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1116,6 +1152,10 @@ int main(int argc, char *argv[])
 =======
                     (size_t)ncols) /* note reusing variable */
 =======
+>>>>>>> osgeo-main
+=======
+                    (size_t)ncols) /* note reusing variable */
+=======
 >>>>>>> osgeo-main
                     ncols) /* note reusing variable */
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1139,6 +1179,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1167,6 +1208,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                     ncols) /* note reusing variable */
 =======
@@ -1187,6 +1230,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1270,6 +1314,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     G_fatal_error(_("Error reading data"));
                 for (i = 0; i < ncols; i++)
@@ -1324,6 +1370,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1398,6 +1445,10 @@ int main(int argc, char *argv[])
 =======
                           fp1) != (size_t)(mrows * ncols))
 =======
+>>>>>>> osgeo-main
+=======
+                          fp1) != (size_t)(mrows * ncols))
+=======
 >>>>>>> osgeo-main
                           fp1) != (mrows * ncols))
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1421,6 +1472,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1449,6 +1501,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                           fp1) != (mrows * ncols))
 =======
@@ -1469,6 +1523,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1552,6 +1607,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     G_fatal_error(_("Error reading data"));
                 break;
@@ -1585,6 +1642,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1659,6 +1717,10 @@ int main(int argc, char *argv[])
 =======
                           fp1) != (size_t)(mrows * ncols))
 =======
+>>>>>>> osgeo-main
+=======
+                          fp1) != (size_t)(mrows * ncols))
+=======
 >>>>>>> osgeo-main
                           fp1) != (mrows * ncols))
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1682,6 +1744,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1710,6 +1773,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                           fp1) != (mrows * ncols))
 =======
@@ -1730,6 +1795,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1813,6 +1879,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     G_fatal_error(_("Error reading data"));
                 break;
@@ -1846,6 +1914,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1920,6 +1989,10 @@ int main(int argc, char *argv[])
 =======
                           fp1) != (size_t)(mrows * ncols))
 =======
+>>>>>>> osgeo-main
+=======
+                          fp1) != (size_t)(mrows * ncols))
+=======
 >>>>>>> osgeo-main
                           fp1) != (mrows * ncols))
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1943,6 +2016,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1971,6 +2045,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                           fp1) != (mrows * ncols))
 =======
@@ -1991,6 +2067,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2074,6 +2151,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                     G_fatal_error(_("Error reading data"));
                 break;
diff --git a/raster/r.in.mat/r.in.mat.html b/raster/r.in.mat/r.in.mat.html
index 286f8196251..d6ca8de1a52 100644
--- a/raster/r.in.mat/r.in.mat.html
+++ b/raster/r.in.mat/r.in.mat.html
@@ -47,6 +47,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -82,6 +83,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 user is importing to a "XY" non-georeferenced project
 =======
 =======
@@ -100,6 +103,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -148,6 +152,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 user is importing to a "XY" non-georeferenced location
 >>>>>>> 7f32ec0a8d (r.horizon manual - fix typo (#2794))
 (e.g. imagery data). Latitude and longitude values should be in decimal form.
diff --git a/raster/r.in.pdal/Makefile b/raster/r.in.pdal/Makefile
index 5f93bfbe5e9..63789bfc585 100644
--- a/raster/r.in.pdal/Makefile
+++ b/raster/r.in.pdal/Makefile
@@ -34,6 +34,7 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -66,6 +67,8 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -99,6 +102,7 @@ $(OBJDIR)/grasslidarfilter.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -243,6 +247,8 @@ $(OBJDIR)/grasslidarfilter.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 LINK = $(CXX)
 
 ifneq ($(strip $(CXX)),)
diff --git a/raster/r.in.pdal/bin_update.c b/raster/r.in.pdal/bin_update.c
index 775db65521a..9e9a63edb2d 100644
--- a/raster/r.in.pdal/bin_update.c
+++ b/raster/r.in.pdal/bin_update.c
@@ -33,6 +33,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 #include 
@@ -93,6 +94,10 @@
 #include 
 =======
 >>>>>>> osgeo-main
+=======
+#include 
+=======
+>>>>>>> osgeo-main
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
 #include 
@@ -112,6 +117,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -202,6 +208,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #include 
 #include 
@@ -230,6 +238,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -275,6 +284,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -293,6 +304,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -376,6 +388,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 static int new_node(struct BinIndex *bin_index, size_t size)
 {
     int n = bin_index->num_nodes++;
@@ -403,6 +419,7 @@ static int new_node(struct BinIndex *bin_index, size_t size)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -482,6 +499,11 @@ static int new_node(struct BinIndex *bin_index, size_t size)
         bin_index->nodes =
             G_realloc(bin_index->nodes, (size_t)bin_index->max_nodes * size);
 =======
+>>>>>>> osgeo-main
+=======
+        bin_index->nodes =
+            G_realloc(bin_index->nodes, (size_t)bin_index->max_nodes * size);
+=======
 >>>>>>> osgeo-main
         bin_index->nodes = G_realloc(bin_index->nodes,
                                      (size_t)bin_index->max_nodes * size);
@@ -508,6 +530,7 @@ static int new_node(struct BinIndex *bin_index, size_t size)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -592,6 +615,8 @@ static int new_node(struct BinIndex *bin_index, size_t size)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
 
@@ -619,6 +644,7 @@ static int new_node(struct BinIndex *bin_index, size_t size)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -664,6 +690,8 @@ static int new_node(struct BinIndex *bin_index, size_t size)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -682,6 +710,7 @@ static int new_node(struct BinIndex *bin_index, size_t size)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -765,6 +794,10 @@ static int new_node(struct BinIndex *bin_index, size_t size)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void update_val(void *array, int cols, int row, int col,
                 RASTER_MAP_TYPE map_type, double value)
 {
@@ -795,6 +828,7 @@ void update_val(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -840,6 +874,8 @@ void update_val(void *array, int cols, int row, int col,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -858,6 +894,7 @@ void update_val(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -941,6 +978,10 @@ void update_val(void *array, int cols, int row, int col,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void update_n(void *array, int cols, int row, int col)
 {
     void *ptr = get_cell_ptr(array, cols, row, col, CELL_TYPE);
@@ -973,6 +1014,7 @@ void update_n(void *array, int cols, int row, int col)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1018,6 +1060,8 @@ void update_n(void *array, int cols, int row, int col)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -1036,6 +1080,7 @@ void update_n(void *array, int cols, int row, int col)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1119,6 +1164,10 @@ void update_n(void *array, int cols, int row, int col)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void update_min(void *array, int cols, int row, int col,
                 RASTER_MAP_TYPE map_type, double value)
 {
@@ -1147,6 +1196,7 @@ void update_min(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1231,6 +1281,10 @@ void update_min(void *array, int cols, int row, int col,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         Rast_set_d_value(ptr, (DCELL)value, map_type);
     else {
@@ -1253,6 +1307,7 @@ void update_min(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1309,6 +1364,9 @@ void update_min(void *array, int cols, int row, int col,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         Rast_set_d_value(ptr, (DCELL) value, map_type);
     else {
@@ -1330,6 +1388,7 @@ void update_min(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1358,6 +1417,8 @@ void update_min(void *array, int cols, int row, int col,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         Rast_set_d_value(ptr, (DCELL)value, map_type);
     else {
@@ -1379,6 +1440,7 @@ void update_min(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1453,6 +1515,10 @@ void update_min(void *array, int cols, int row, int col,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     }
     return;
@@ -1479,6 +1545,7 @@ void update_min(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1524,6 +1591,8 @@ void update_min(void *array, int cols, int row, int col,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -1542,6 +1611,7 @@ void update_min(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1625,6 +1695,10 @@ void update_min(void *array, int cols, int row, int col,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void update_max(void *array, int cols, int row, int col,
                 RASTER_MAP_TYPE map_type, double value)
 {
@@ -1653,6 +1727,7 @@ void update_max(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1737,6 +1812,10 @@ void update_max(void *array, int cols, int row, int col,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         Rast_set_d_value(ptr, (DCELL)value, map_type);
     else {
@@ -1759,6 +1838,7 @@ void update_max(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1815,6 +1895,9 @@ void update_max(void *array, int cols, int row, int col,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         Rast_set_d_value(ptr, (DCELL) value, map_type);
     else {
@@ -1836,6 +1919,7 @@ void update_max(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1864,6 +1948,8 @@ void update_max(void *array, int cols, int row, int col,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         Rast_set_d_value(ptr, (DCELL)value, map_type);
     else {
@@ -1885,6 +1971,7 @@ void update_max(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1959,6 +2046,10 @@ void update_max(void *array, int cols, int row, int col,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     }
 
@@ -1998,6 +2089,7 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2063,6 +2155,10 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col,
 =======
     if (fabs(old_sum) >= fabs(value))
 =======
+>>>>>>> osgeo-main
+=======
+    if (fabs(old_sum) >= fabs(value))
+=======
 >>>>>>> osgeo-main
     if (abs(old_sum) >= abs(value))
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -2086,6 +2182,7 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2163,6 +2260,8 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         Rast_set_d_value(c_ptr, old_c + (old_sum - tmp) + value, map_type);
     else
@@ -2194,6 +2293,7 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2239,6 +2339,8 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -2257,6 +2359,7 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2340,6 +2443,10 @@ void update_sum(void *sum_array, void *c_array, int cols, int row, int col,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /* Implements Welford algorithm */
 void update_m2(void *n_array, void *mean_array, void *m2_array, int cols,
                int row, int col, RASTER_MAP_TYPE map_type, double value)
@@ -2394,6 +2501,7 @@ void update_m2(void *n_array, void *mean_array, void *m2_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2439,6 +2547,8 @@ void update_m2(void *n_array, void *mean_array, void *m2_array, int cols,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -2457,6 +2567,7 @@ void update_m2(void *n_array, void *mean_array, void *m2_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2540,6 +2651,10 @@ void update_m2(void *n_array, void *mean_array, void *m2_array, int cols,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void update_moving_mean(void *array, int cols, int row, int col,
                         RASTER_MAP_TYPE rtype, double value, int n)
 {
@@ -2576,6 +2691,7 @@ void update_moving_mean(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2621,6 +2737,8 @@ void update_moving_mean(void *array, int cols, int row, int col,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -2639,6 +2757,7 @@ void update_moving_mean(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2722,6 +2841,10 @@ void update_moving_mean(void *array, int cols, int row, int col,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /* add node to sorted, single linked list
  * returns id if head has to be saved to index array, otherwise -1 */
 int add_z_node(struct BinIndex *bin_index, int head, double z)
@@ -2767,6 +2890,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2832,6 +2956,10 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 =======
     else if (node_id == head_id) { /* pole position, insert as head */
 =======
+>>>>>>> osgeo-main
+=======
+    else if (node_id == head_id) { /* pole position, insert as head */
+=======
 >>>>>>> osgeo-main
     else if (node_id == head_id) {      /* pole position, insert as head */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -2855,6 +2983,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2932,6 +3061,8 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         newnode_id = new_node(bin_index, sizeof(struct z_node));
         ((struct z_node *)bin_index->nodes)[newnode_id].next = head_id;
@@ -2960,6 +3091,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3025,6 +3157,10 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 =======
     else { /* somewhere in the middle, insert */
 =======
+>>>>>>> osgeo-main
+=======
+    else { /* somewhere in the middle, insert */
+=======
 >>>>>>> osgeo-main
     else {                      /* somewhere in the middle, insert */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -3048,6 +3184,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3125,6 +3262,8 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         newnode_id = new_node(bin_index, sizeof(struct z_node));
         ((struct z_node *)bin_index->nodes)[newnode_id].z = z;
@@ -3155,6 +3294,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3200,6 +3340,8 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -3218,6 +3360,7 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3301,6 +3444,10 @@ int add_z_node(struct BinIndex *bin_index, int head, double z)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void add_cnt_node(struct BinIndex *bin_index, int head, int value)
 {
     int node_id, newnode_id, head_id, next;
@@ -3347,6 +3494,7 @@ void add_cnt_node(struct BinIndex *bin_index, int head, int value)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3432,6 +3580,10 @@ void add_cnt_node(struct BinIndex *bin_index, int head, int value)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /* Unlike the other functions, this one is not using map_type (RASTER_MAP_TYPE)
  * because the values (z) are always doubles and the index is integer. */
 void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
@@ -3452,6 +3604,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3509,6 +3662,9 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 
 /* Unlike the other functions, this one is not using map_type (RASTER_MAP_TYPE)
  * because the values (z) are always doubles and the index is integer. */
@@ -3529,6 +3685,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3558,6 +3715,8 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 /* Unlike the other functions, this one is not using map_type (RASTER_MAP_TYPE)
  * because the values (z) are always doubles and the index is integer. */
 void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
@@ -3577,6 +3736,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3652,6 +3812,10 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 {
     int head_id;
     void *ptr = index_array;
@@ -3677,6 +3841,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3776,6 +3941,11 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
 =======
+>>>>>>> osgeo-main
+=======
+    ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
+                                   Rast_cell_size(CELL_TYPE));
+=======
 >>>>>>> osgeo-main
     ptr =
         G_incr_void_ptr(ptr,
@@ -3796,6 +3966,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3824,6 +3995,8 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
@@ -3842,6 +4015,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3870,6 +4044,8 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
@@ -3888,6 +4064,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3935,6 +4112,8 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     /* first node */
@@ -3980,6 +4159,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4025,6 +4205,8 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -4043,6 +4225,7 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4126,6 +4309,10 @@ void update_bin_z_index(struct BinIndex *bin_index, void *index_array, int cols,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
                           int cols, int row, int col, int value)
 {
@@ -4153,6 +4340,7 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4252,6 +4440,11 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
 =======
+>>>>>>> osgeo-main
+=======
+    ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
+                                   Rast_cell_size(CELL_TYPE));
+=======
 >>>>>>> osgeo-main
     ptr =
         G_incr_void_ptr(ptr,
@@ -4272,6 +4465,7 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4300,6 +4494,8 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
@@ -4318,6 +4514,7 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4346,6 +4543,8 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
@@ -4364,6 +4563,7 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4411,6 +4611,8 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     /* first node */
@@ -4452,6 +4654,7 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4497,6 +4700,8 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -4515,6 +4720,7 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4598,6 +4804,10 @@ void update_bin_cnt_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /* Co-moment value update */
 void update_com_node(struct com_node *cn, int item, double x, double y)
 {
@@ -4630,6 +4840,7 @@ void update_com_node(struct com_node *cn, int item, double x, double y)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4679,6 +4890,8 @@ void update_com_node(struct com_node *cn, int item, double x, double y)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
                           int cols, int row, int col, double x, double y,
                           double z)
@@ -4700,6 +4913,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4739,6 +4953,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
                           int cols, int row, int col,
@@ -4758,6 +4974,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4787,6 +5004,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
                           int cols, int row, int col, double x, double y,
                           double z)
@@ -4805,6 +5024,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4834,6 +5054,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
                           int cols, int row, int col, double x, double y,
                           double z)
@@ -4852,6 +5074,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4900,6 +5123,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int node_id;
     void *ptr = index_array;
@@ -4925,6 +5150,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5024,6 +5250,11 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
 =======
+>>>>>>> osgeo-main
+=======
+    ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
+                                   Rast_cell_size(CELL_TYPE));
+=======
 >>>>>>> osgeo-main
     ptr =
         G_incr_void_ptr(ptr,
@@ -5044,6 +5275,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5072,6 +5304,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
@@ -5090,6 +5324,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5118,6 +5353,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     ptr = G_incr_void_ptr(ptr, (((size_t)row * cols) + col) *
                                    Rast_cell_size(CELL_TYPE));
@@ -5136,6 +5373,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5183,6 +5421,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     if (Rast_is_null_value(ptr, CELL_TYPE)) {
@@ -5227,6 +5467,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5266,6 +5507,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -5283,6 +5526,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5336,6 +5580,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     update_com_node(&(((struct com_node *)bin_index->nodes)[node_id]), 0, x, x);
     update_com_node(&(((struct com_node *)bin_index->nodes)[node_id]), 1, x, y);
@@ -5363,6 +5609,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5425,6 +5672,9 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     update_com_node(&(((struct com_node *)bin_index->nodes)[node_id]),
                     0, x, x);
@@ -5454,6 +5704,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -5477,6 +5728,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -5494,6 +5747,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5547,6 +5801,8 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     return;
@@ -5573,6 +5829,7 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5658,6 +5915,10 @@ void update_bin_com_index(struct BinIndex *bin_index, void *index_array,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /* 0 on NULL, 1 on success */
 int row_array_get_value_row_col(void *array, int arr_row, int arr_col, int cols,
                                 RASTER_MAP_TYPE rtype, double *value)
@@ -5690,6 +5951,7 @@ int row_array_get_value_row_col(void *array, int arr_row, int arr_col, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5737,6 +5999,9 @@ int row_array_get_value_row_col(void *array, int arr_row, int arr_col, int cols,
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -5777,6 +6042,7 @@ int row_array_get_value_row_col(void *array, int arr_row, int arr_col, int cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5902,6 +6168,8 @@ int row_array_get_value_row_col(void *array, int arr_row, int arr_col, int cols,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     return 1;
 }
diff --git a/raster/r.in.pdal/bin_update.h b/raster/r.in.pdal/bin_update.h
index c2e1deca634..73f6696d265 100644
--- a/raster/r.in.pdal/bin_update.h
+++ b/raster/r.in.pdal/bin_update.h
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -84,6 +85,10 @@
 =======
 /****************************************************************************
 =======
+>>>>>>> osgeo-main
+=======
+/****************************************************************************
+=======
 >>>>>>> osgeo-main
 
  /****************************************************************************
@@ -108,6 +113,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -188,6 +194,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  *
  * MODULE:    r.in.pdal
@@ -244,6 +252,7 @@ void update_sum(void *, void *, int, int, int, RASTER_MAP_TYPE, double);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -310,6 +319,10 @@ void update_m2(void *, void *, void *, int, int, int, RASTER_MAP_TYPE, double);
 void update_m2(void *, void *, void *, int, int, int, RASTER_MAP_TYPE, double);
 =======
 >>>>>>> osgeo-main
+=======
+void update_m2(void *, void *, void *, int, int, int, RASTER_MAP_TYPE, double);
+=======
+>>>>>>> osgeo-main
 void update_m2(void *, void *, void *, int, int, int, RASTER_MAP_TYPE,
                double);
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -333,6 +346,7 @@ void update_m2(void *, void *, void *, int, int, int, RASTER_MAP_TYPE, double);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -414,6 +428,8 @@ void update_m2(void *, void *, void *, int, int, int, RASTER_MAP_TYPE, double);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void update_moving_mean(void *, int, int, int, RASTER_MAP_TYPE, double, int);
 
 int add_z_node(struct BinIndex *, int, double);
@@ -443,6 +459,7 @@ void update_com_node(struct com_node *, int, double, double);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -528,6 +545,10 @@ void update_com_node(struct com_node *, int, double, double);
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void update_bin_com_index(struct BinIndex *, void *, int, int, int, double,
                           double, double);
 
@@ -549,6 +570,7 @@ int row_array_get_value_row_col(void *, int, int, int, RASTER_MAP_TYPE,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -606,6 +628,9 @@ int row_array_get_value_row_col(void *, int, int, int, RASTER_MAP_TYPE,
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 void update_bin_com_index(struct BinIndex *, void *,
                           int, int, int, double, double, double);
 
@@ -627,6 +652,7 @@ int row_array_get_value_row_col(void *, int, int,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -656,6 +682,8 @@ int row_array_get_value_row_col(void *, int, int,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void update_bin_com_index(struct BinIndex *, void *, int, int, int, double,
                           double, double);
 
@@ -676,6 +704,7 @@ int row_array_get_value_row_col(void *, int, int, int, RASTER_MAP_TYPE,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -751,5 +780,9 @@ int row_array_get_value_row_col(void *, int, int, int, RASTER_MAP_TYPE,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #endif /* __BIN_UPDATE_H__ */
diff --git a/raster/r.in.pdal/bin_write.c b/raster/r.in.pdal/bin_write.c
index 4f5eaddaee8..eed20fc1e6b 100644
--- a/raster/r.in.pdal/bin_write.c
+++ b/raster/r.in.pdal/bin_write.c
@@ -43,6 +43,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -92,6 +93,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 /* Get error corrected sum */
 double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
                RASTER_MAP_TYPE rtype)
@@ -113,6 +116,7 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -152,6 +156,8 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 /* Get error corrected sum */
 double get_sum(void *sum_array, void *c_array,
@@ -171,6 +177,7 @@ double get_sum(void *sum_array, void *c_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -200,6 +207,8 @@ double get_sum(void *sum_array, void *c_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 /* Get error corrected sum */
 double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
                RASTER_MAP_TYPE rtype)
@@ -218,6 +227,7 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -247,6 +257,8 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 /* Get error corrected sum */
 double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
                RASTER_MAP_TYPE rtype)
@@ -265,6 +277,7 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -313,6 +326,8 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     size_t offset = ((size_t)row * cols + col) * Rast_cell_size(rtype);
     double sum = Rast_get_d_value(((char *)sum_array) + offset, rtype);
@@ -342,6 +357,7 @@ double get_sum(void *sum_array, void *c_array, int row, int cols, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -442,6 +458,11 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
                int cols, RASTER_MAP_TYPE rtype)
 =======
 >>>>>>> osgeo-main
+=======
+void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
+               int cols, RASTER_MAP_TYPE rtype)
+=======
+>>>>>>> osgeo-main
 
 void write_sum(void *raster_row, void *sum_array, void *c_array,
                int row, int cols, RASTER_MAP_TYPE rtype)
@@ -460,6 +481,7 @@ void write_sum(void *raster_row, void *sum_array, void *c_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -489,6 +511,8 @@ void write_sum(void *raster_row, void *sum_array, void *c_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
                int cols, RASTER_MAP_TYPE rtype)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -506,6 +530,7 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -535,6 +560,8 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
                int cols, RASTER_MAP_TYPE rtype)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -552,6 +579,7 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -600,6 +628,8 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int col;
     void *ptr = raster_row;
@@ -633,6 +663,7 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -682,6 +713,8 @@ void write_sum(void *raster_row, void *sum_array, void *c_array, int row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void write_variance(void *raster_row, void *n_array, void *mean_array,
                     void *m2_array, int row, int cols, RASTER_MAP_TYPE rtype,
                     int method)
@@ -703,6 +736,7 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -742,6 +776,8 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 void write_variance(void *raster_row, void *n_array, void *mean_array,
                     void *m2_array, int row, int cols,
@@ -761,6 +797,7 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -790,6 +827,8 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_variance(void *raster_row, void *n_array, void *mean_array,
                     void *m2_array, int row, int cols, RASTER_MAP_TYPE rtype,
                     int method)
@@ -808,6 +847,7 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -837,6 +877,8 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_variance(void *raster_row, void *n_array, void *mean_array,
                     void *m2_array, int row, int cols, RASTER_MAP_TYPE rtype,
                     int method)
@@ -855,6 +897,7 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -903,6 +946,8 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     double variance;
     int col;
@@ -959,6 +1004,7 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1004,6 +1050,8 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -1022,6 +1070,7 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1105,6 +1154,10 @@ void write_variance(void *raster_row, void *n_array, void *mean_array,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void write_median(struct BinIndex *bin_index, void *raster_row,
                   void *index_array, int row, int cols, RASTER_MAP_TYPE rtype)
 {
@@ -1139,6 +1192,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1223,6 +1277,10 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         if (Rast_is_null_value(((char *)index_array) + n_offset,
                                CELL_TYPE)) /* no points in cell */
@@ -1244,6 +1302,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1300,6 +1359,9 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE))    /* no points in cell */
             Rast_set_null_value(ptr, 1, rtype);
@@ -1319,6 +1381,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1347,6 +1410,8 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         if (Rast_is_null_value(((char *)index_array) + n_offset,
                                CELL_TYPE)) /* no points in cell */
@@ -1367,6 +1432,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1441,6 +1507,10 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
             head_id =
@@ -1470,6 +1540,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1535,6 +1606,10 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
             while (node_id != -1) { /* count number of points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+            while (node_id != -1) { /* count number of points in cell */
+=======
 >>>>>>> osgeo-main
             while (node_id != -1) {     /* count number of points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1558,6 +1633,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1635,6 +1711,8 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 n++;
                 node_id = ((struct z_node *)bin_index->nodes)[node_id].next;
@@ -1661,6 +1739,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1700,6 +1779,8 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1717,6 +1798,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1770,6 +1852,8 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             if (n == 1) /* only one point, use that */
                 Rast_set_d_value(
@@ -1792,6 +1876,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1866,6 +1951,10 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 n = (n + 1) / 2;
                 node_id = head_id;
@@ -1893,6 +1982,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1949,6 +2039,9 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
             if (n == 1)         /* only one point, use that */
                 Rast_set_d_value(ptr,
@@ -1970,6 +2063,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1993,6 +2087,8 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
                 n = (n + 1) / 2;
                 node_id = head_id;
@@ -2025,6 +2121,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2132,6 +2229,8 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
                 z = (n + 1) / 2.0;
@@ -2159,6 +2258,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2243,6 +2343,10 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     node_id = ((struct z_node *)bin_index->nodes)[node_id].next;
 
@@ -2267,6 +2371,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2323,6 +2428,9 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
                     node_id =
                         ((struct z_node *)bin_index->nodes)[node_id].next;
@@ -2346,6 +2454,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2374,6 +2483,8 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                     node_id = ((struct z_node *)bin_index->nodes)[node_id].next;
 
@@ -2397,6 +2508,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2471,6 +2583,10 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 Rast_set_d_value(ptr, z, rtype);
             }
@@ -2500,6 +2616,7 @@ void write_median(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2600,6 +2717,11 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
                 int row, int cols)
 =======
 >>>>>>> osgeo-main
+=======
+void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
+                int row, int cols)
+=======
+>>>>>>> osgeo-main
 
 void write_mode(struct BinIndex *bin_index, void *raster_row,
                 void *index_array, int row, int cols)
@@ -2618,6 +2740,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2647,6 +2770,8 @@ void write_mode(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
                 int row, int cols)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -2664,6 +2789,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2693,6 +2819,8 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
                 int row, int cols)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -2710,6 +2838,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2758,6 +2887,8 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int col;
     int node_id;
@@ -2787,6 +2918,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2866,6 +2998,11 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
         if (Rast_is_null_value(((char *)index_array) + n_offset,
                                CELL_TYPE)) /* no points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+        if (Rast_is_null_value(((char *)index_array) + n_offset,
+                               CELL_TYPE)) /* no points in cell */
+=======
 >>>>>>> osgeo-main
         if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE))    /* no points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -2891,6 +3028,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2972,6 +3110,8 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             Rast_set_null_value(ptr, 1, CELL_TYPE);
         else {
@@ -3004,6 +3144,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3088,6 +3229,10 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 else if (((struct cnt_node *)bin_index->nodes)[node_id].count >
                          ((struct cnt_node *)bin_index->nodes)[mode_node].count)
@@ -3113,6 +3258,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3169,6 +3315,9 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
                 else if (((struct cnt_node *)bin_index->
                           nodes)[node_id].count >
@@ -3195,6 +3344,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3223,6 +3373,8 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                 else if (((struct cnt_node *)bin_index->nodes)[node_id].count >
                          ((struct cnt_node *)bin_index->nodes)[mode_node].count)
@@ -3247,6 +3399,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3321,6 +3474,10 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         }
         ptr = G_incr_void_ptr(ptr, Rast_cell_size(CELL_TYPE));
@@ -3348,6 +3505,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3393,6 +3551,8 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -3411,6 +3571,7 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3494,6 +3655,10 @@ void write_mode(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void write_percentile(struct BinIndex *bin_index, void *raster_row,
                       void *index_array, int row, int cols,
                       RASTER_MAP_TYPE rtype, int pth)
@@ -3530,6 +3695,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3609,6 +3775,11 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
         if (Rast_is_null_value(((char *)index_array) + n_offset,
                                CELL_TYPE)) /* no points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+        if (Rast_is_null_value(((char *)index_array) + n_offset,
+                               CELL_TYPE)) /* no points in cell */
+=======
 >>>>>>> osgeo-main
         if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE))    /* no points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -3634,6 +3805,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3715,6 +3887,8 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             Rast_set_null_value(ptr, 1, rtype);
         else {
@@ -3744,6 +3918,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3809,6 +3984,10 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
             while (node_id != -1) { /* count number of points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+            while (node_id != -1) { /* count number of points in cell */
+=======
 >>>>>>> osgeo-main
             while (node_id != -1) {     /* count number of points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -3832,6 +4011,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3909,6 +4089,8 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 n++;
                 node_id = ((struct z_node *)bin_index->nodes)[node_id].next;
@@ -3936,6 +4118,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4001,6 +4184,10 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
             r_low = floor(z); /* lower rank */
 =======
+>>>>>>> osgeo-main
+=======
+            r_low = floor(z); /* lower rank */
+=======
 >>>>>>> osgeo-main
             r_low = floor(z);   /* lower rank */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -4024,6 +4211,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4101,6 +4289,8 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             if (r_low < 1)
                 r_low = 1;
@@ -4128,6 +4318,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4193,6 +4384,10 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
             r_up = ceil(z); /* upper rank */
 =======
+>>>>>>> osgeo-main
+=======
+            r_up = ceil(z); /* upper rank */
+=======
 >>>>>>> osgeo-main
             r_up = ceil(z);     /* upper rank */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -4216,6 +4411,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4293,6 +4489,8 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             if (r_up > n)
                 r_up = n;
@@ -4322,6 +4520,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4406,6 +4605,10 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             z = ((struct z_node *)bin_index->nodes)[node_id]
                     .z; /* save lower value */
@@ -4427,6 +4630,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4483,6 +4687,9 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
             z = ((struct z_node *)bin_index->nodes)[node_id].z; /* save lower value */
             node_id = head_id;
@@ -4502,6 +4709,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4530,6 +4738,8 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             z = ((struct z_node *)bin_index->nodes)[node_id]
                     .z; /* save lower value */
@@ -4550,6 +4760,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4624,6 +4835,10 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 node_id = ((struct z_node *)bin_index->nodes)[node_id].next;
 
@@ -4655,6 +4870,7 @@ void write_percentile(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4755,6 +4971,11 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
                     void *index_array, int row, int cols, RASTER_MAP_TYPE rtype)
 =======
 >>>>>>> osgeo-main
+=======
+void write_skewness(struct BinIndex *bin_index, void *raster_row,
+                    void *index_array, int row, int cols, RASTER_MAP_TYPE rtype)
+=======
+>>>>>>> osgeo-main
 
 void write_skewness(struct BinIndex *bin_index, void *raster_row,
                     void *index_array, int row, int cols,
@@ -4774,6 +4995,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4803,6 +5025,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_skewness(struct BinIndex *bin_index, void *raster_row,
                     void *index_array, int row, int cols, RASTER_MAP_TYPE rtype)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -4820,6 +5044,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4849,6 +5074,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_skewness(struct BinIndex *bin_index, void *raster_row,
                     void *index_array, int row, int cols, RASTER_MAP_TYPE rtype)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4866,6 +5093,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4914,6 +5142,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int n;
     double z;
@@ -4948,6 +5178,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5027,6 +5258,11 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
         if (Rast_is_null_value(((char *)index_array) + n_offset,
                                CELL_TYPE)) /* no points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+        if (Rast_is_null_value(((char *)index_array) + n_offset,
+                               CELL_TYPE)) /* no points in cell */
+=======
 >>>>>>> osgeo-main
         if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE))    /* no points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -5052,6 +5288,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5133,6 +5370,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             Rast_set_null_value(ptr, 1, rtype);
         else {
@@ -5161,6 +5400,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5200,6 +5440,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -5217,6 +5459,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5270,6 +5513,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             n = 0;        /* count */
             sum = 0.0;    /* sum */
@@ -5296,6 +5541,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5358,6 +5604,9 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
             n = 0;              /* count */
             sum = 0.0;          /* sum */
@@ -5380,6 +5629,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -5403,6 +5653,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -5420,6 +5672,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5473,6 +5726,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             while (node_id != -1) {
@@ -5504,6 +5759,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5569,6 +5825,10 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
             if (n > 1) { /* if n == 1, skew is "0.0" */
 =======
+>>>>>>> osgeo-main
+=======
+            if (n > 1) { /* if n == 1, skew is "0.0" */
+=======
 >>>>>>> osgeo-main
             if (n > 1) {        /* if n == 1, skew is "0.0" */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -5592,6 +5852,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5669,6 +5930,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 mean = sum / n;
                 node_id = head_id;
@@ -5696,6 +5959,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5761,6 +6025,10 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
                     node_id = ((struct z_node *)bin_index->nodes)[node_id].next;
 =======
+>>>>>>> osgeo-main
+=======
+                    node_id = ((struct z_node *)bin_index->nodes)[node_id].next;
+=======
 >>>>>>> osgeo-main
                     node_id =
                         ((struct z_node *)bin_index->nodes)[node_id].next;
@@ -5785,6 +6053,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5865,6 +6134,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 }
 
@@ -5901,6 +6172,7 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5950,6 +6222,8 @@ void write_skewness(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void write_trimmean(struct BinIndex *bin_index, void *raster_row,
                     void *index_array, int row, int cols, RASTER_MAP_TYPE rtype,
                     double trim)
@@ -5971,6 +6245,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6010,6 +6285,8 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 void write_trimmean(struct BinIndex *bin_index, void *raster_row,
                     void *index_array, int row, int cols,
@@ -6029,6 +6306,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6058,6 +6336,8 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_trimmean(struct BinIndex *bin_index, void *raster_row,
                     void *index_array, int row, int cols, RASTER_MAP_TYPE rtype,
                     double trim)
@@ -6076,6 +6356,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6105,6 +6386,8 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_trimmean(struct BinIndex *bin_index, void *raster_row,
                     void *index_array, int row, int cols, RASTER_MAP_TYPE rtype,
                     double trim)
@@ -6123,6 +6406,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6171,6 +6455,8 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int n;
     int j, k;
@@ -6204,6 +6490,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -6283,6 +6570,11 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
         if (Rast_is_null_value(((char *)index_array) + n_offset,
                                CELL_TYPE)) /* no points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+        if (Rast_is_null_value(((char *)index_array) + n_offset,
+                               CELL_TYPE)) /* no points in cell */
+=======
 >>>>>>> osgeo-main
         if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE))    /* no points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -6308,6 +6600,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6389,6 +6682,8 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             Rast_set_null_value(ptr, 1, rtype);
         else {
@@ -6418,6 +6713,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -6483,6 +6779,10 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
             while (node_id != -1) { /* count number of points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+            while (node_id != -1) { /* count number of points in cell */
+=======
 >>>>>>> osgeo-main
             while (node_id != -1) {     /* count number of points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -6506,6 +6806,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6583,6 +6884,8 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 n++;
                 node_id = ((struct z_node *)bin_index->nodes)[node_id].next;
@@ -6612,6 +6915,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -6696,6 +7000,10 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                 k = floor(trim * n +
                           0.5); /* number of ranks to discard on each tail */
@@ -6719,6 +7027,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6775,6 +7084,9 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
                 k = floor(trim * n + 0.5);      /* number of ranks to discard on each tail */
 
@@ -6796,6 +7108,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6824,6 +7137,8 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                 k = floor(trim * n +
                           0.5); /* number of ranks to discard on each tail */
@@ -6846,6 +7161,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -6920,6 +7236,10 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                         node_id =
                             ((struct z_node *)bin_index->nodes)[node_id].next;
@@ -6950,6 +7270,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -7015,6 +7336,10 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
                     while (j <= k) { /* get values in interval */
 =======
+>>>>>>> osgeo-main
+=======
+                    while (j <= k) { /* get values in interval */
+=======
 >>>>>>> osgeo-main
                     while (j <= k) {    /* get values in interval */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -7038,6 +7363,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7115,6 +7441,8 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                         n++;
                         sum += ((struct z_node *)bin_index->nodes)[node_id].z;
@@ -7163,6 +7491,7 @@ void write_trimmean(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -7263,6 +7592,11 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
                 int row, int cols, int min)
 =======
 >>>>>>> osgeo-main
+=======
+void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
+                int row, int cols, int min)
+=======
+>>>>>>> osgeo-main
 
 void write_sidn(struct BinIndex *bin_index, void *raster_row,
                 void *index_array, int row, int cols, int min)
@@ -7281,6 +7615,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7310,6 +7645,8 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
                 int row, int cols, int min)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -7327,6 +7664,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7356,6 +7694,8 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
                 int row, int cols, int min)
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -7373,6 +7713,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7421,6 +7762,8 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int col;
     int node_id;
@@ -7451,6 +7794,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -7530,6 +7874,11 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
         if (Rast_is_null_value(((char *)index_array) + n_offset,
                                CELL_TYPE)) /* no points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+        if (Rast_is_null_value(((char *)index_array) + n_offset,
+                               CELL_TYPE)) /* no points in cell */
+=======
 >>>>>>> osgeo-main
         if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE))    /* no points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -7555,6 +7904,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7636,6 +7986,8 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             Rast_set_c_value(ptr, 0, CELL_TYPE);
         else {
@@ -7669,6 +8021,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -7753,6 +8106,10 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                         count)
                     count =
@@ -7776,6 +8133,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7832,6 +8190,9 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
                     count)
                     count =
@@ -7854,6 +8215,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7882,6 +8244,8 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                         count)
                     count =
@@ -7904,6 +8268,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -7978,6 +8343,10 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                     count =
                         ((struct cnt_node *)bin_index->nodes)[node_id].count;
@@ -8010,6 +8379,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -8055,6 +8425,8 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -8073,6 +8445,7 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -8156,6 +8529,10 @@ void write_sidn(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void write_ev(struct BinIndex *bin_index, void *raster_row, void *index_array,
               int row, int cols, RASTER_MAP_TYPE rtype, int method)
 {
@@ -8187,6 +8564,7 @@ void write_ev(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -8266,6 +8644,11 @@ void write_ev(struct BinIndex *bin_index, void *raster_row, void *index_array,
         if (Rast_is_null_value(((char *)index_array) + n_offset,
                                CELL_TYPE)) /* no points in cell */
 =======
+>>>>>>> osgeo-main
+=======
+        if (Rast_is_null_value(((char *)index_array) + n_offset,
+                               CELL_TYPE)) /* no points in cell */
+=======
 >>>>>>> osgeo-main
         if (Rast_is_null_value(((char *)index_array) + n_offset, CELL_TYPE))    /* no points in cell */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -8291,6 +8674,7 @@ void write_ev(struct BinIndex *bin_index, void *raster_row, void *index_array,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8372,6 +8756,8 @@ void write_ev(struct BinIndex *bin_index, void *raster_row, void *index_array,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             Rast_set_null_value(ptr, 1, rtype);
         else {
diff --git a/raster/r.in.pdal/bin_write.h b/raster/r.in.pdal/bin_write.h
index 45d315cce05..db4b54d7abb 100644
--- a/raster/r.in.pdal/bin_write.h
+++ b/raster/r.in.pdal/bin_write.h
@@ -43,6 +43,7 @@ void write_sum(void *, void *, void *, int, int, RASTER_MAP_TYPE);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -128,6 +129,10 @@ void write_sum(void *, void *, void *, int, int, RASTER_MAP_TYPE);
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void write_variance(void *, void *, void *, void *, int, int, RASTER_MAP_TYPE,
                     int);
 void write_median(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE);
@@ -157,6 +162,7 @@ void write_ev(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -214,6 +220,9 @@ void write_ev(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE,
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 void write_variance(void *, void *, void *,
                     void *, int, int, RASTER_MAP_TYPE, int);
 void write_median(struct BinIndex *, void *,
@@ -232,6 +241,7 @@ void write_median(struct BinIndex *, void *,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -261,6 +271,8 @@ void write_median(struct BinIndex *, void *,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_variance(void *, void *, void *, void *, int, int, RASTER_MAP_TYPE,
                     int);
 void write_median(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE);
@@ -277,6 +289,7 @@ void write_median(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -300,6 +313,8 @@ void write_median(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void write_mode(struct BinIndex *, void *, void *, int, int);
 void write_percentile(struct BinIndex *, void *, void *, int, int,
                       RASTER_MAP_TYPE, int);
@@ -319,6 +334,7 @@ void write_sidn(struct BinIndex *, void *, void *, int, int, int);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
@@ -389,6 +405,8 @@ void write_sidn(struct BinIndex *, void *, void *, int, int, int);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void write_ev(struct BinIndex *, void *, void *,
               int, int, RASTER_MAP_TYPE, int);
 
@@ -407,6 +425,7 @@ void write_ev(struct BinIndex *, void *, void *,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -436,6 +455,8 @@ void write_ev(struct BinIndex *, void *, void *,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void write_ev(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE,
               int);
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -453,6 +474,7 @@ void write_ev(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -528,5 +550,9 @@ void write_ev(struct BinIndex *, void *, void *, int, int, RASTER_MAP_TYPE,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 #endif /* __BIN_WRITE_H__ */
diff --git a/raster/r.in.pdal/filters.c b/raster/r.in.pdal/filters.c
index dc9796303af..2d4ee62d980 100644
--- a/raster/r.in.pdal/filters.c
+++ b/raster/r.in.pdal/filters.c
@@ -33,6 +33,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -78,6 +79,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -96,6 +99,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -179,6 +183,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #include "filters.h"
 
 #include "lidar.h"
@@ -209,6 +217,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -254,6 +263,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -272,6 +283,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -355,6 +367,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 int spatial_filter_from_option(struct Option *option, double *xmin,
                                double *ymin, double *xmax, double *ymax)
 {
@@ -401,6 +417,7 @@ int spatial_filter_from_option(struct Option *option, double *xmin,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -481,6 +498,11 @@ int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax,
                                        double *ymax)
 =======
 >>>>>>> osgeo-main
+=======
+int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax,
+                                       double *ymax)
+=======
+>>>>>>> osgeo-main
 int spatial_filter_from_current_region(double *xmin, double *ymin,
                                        double *xmax, double *ymax)
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -506,6 +528,7 @@ int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -591,6 +614,8 @@ int spatial_filter_from_current_region(double *xmin, double *ymin,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     struct Cell_head region;
 
diff --git a/raster/r.in.pdal/filters.h b/raster/r.in.pdal/filters.h
index 7f58201ce8e..0fb62b607e2 100644
--- a/raster/r.in.pdal/filters.h
+++ b/raster/r.in.pdal/filters.h
@@ -36,6 +36,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -121,6 +122,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 struct ReturnFilter {
     int filter;
 };
@@ -142,6 +147,7 @@ struct ClassFilter {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -199,6 +205,9 @@ struct ClassFilter {
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 struct ReturnFilter
 {
     int filter;
@@ -221,6 +230,7 @@ struct ClassFilter
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -250,6 +260,8 @@ struct ClassFilter
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 struct ReturnFilter {
     int filter;
 };
@@ -270,6 +282,7 @@ struct ClassFilter {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -344,6 +357,10 @@ struct ClassFilter {
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     /** NULL terminated list of class numbers represented as string */
@@ -375,6 +392,7 @@ int spatial_filter_from_option(struct Option *option, double *xmin,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -455,6 +473,11 @@ int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax,
                                        double *ymax);
 =======
 >>>>>>> osgeo-main
+=======
+int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax,
+                                       double *ymax);
+=======
+>>>>>>> osgeo-main
 int spatial_filter_from_current_region(double *xmin, double *ymin,
                                        double *xmax, double *ymax);
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -480,6 +503,7 @@ int spatial_filter_from_current_region(double *xmin, double *ymin, double *xmax,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -565,6 +589,8 @@ int spatial_filter_from_current_region(double *xmin, double *ymin,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 int range_filter_from_option(struct Option *option, double *min, double *max);
 
diff --git a/raster/r.in.pdal/grasslidarfilter.cpp b/raster/r.in.pdal/grasslidarfilter.cpp
index 1cb099929d8..ec335f6ec6f 100644
--- a/raster/r.in.pdal/grasslidarfilter.cpp
+++ b/raster/r.in.pdal/grasslidarfilter.cpp
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -84,6 +85,10 @@
 =======
 /****************************************************************************
 =======
+>>>>>>> osgeo-main
+=======
+/****************************************************************************
+=======
 >>>>>>> osgeo-main
 
  /****************************************************************************
@@ -108,6 +113,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -188,6 +194,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  *
  * MODULE:    r.in.pdal
@@ -226,6 +234,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -311,6 +320,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #include "grasslidarfilter.h"
 
 bool GrassLidarFilter::processOne(pdal::PointRef &point)
@@ -335,6 +348,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -382,6 +396,8 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -401,6 +417,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
 <<<<<<< HEAD
@@ -461,6 +478,8 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     double x = point.getFieldAs < double >(Id::X);
     double y = point.getFieldAs < double >(Id::Y);
@@ -480,6 +499,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -508,6 +528,8 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     double x = point.getFieldAs(Id::X);
     double y = point.getFieldAs(Id::Y);
@@ -527,6 +549,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -601,6 +624,10 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     n_processed_++;
@@ -635,6 +662,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -700,6 +728,10 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
         double intensity = point.getFieldAs(Id::Intensity);
 =======
+>>>>>>> osgeo-main
+=======
+        double intensity = point.getFieldAs(Id::Intensity);
+=======
 >>>>>>> osgeo-main
         double intensity = point.getFieldAs < double >(Id::Intensity);
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -723,6 +755,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -800,6 +833,8 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         intensity *= iscale_;
@@ -830,6 +865,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -895,6 +931,10 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
         double value = point.getFieldAs(dim_to_import_);
 =======
+>>>>>>> osgeo-main
+=======
+        double value = point.getFieldAs(dim_to_import_);
+=======
 >>>>>>> osgeo-main
         double value = point.getFieldAs < double >(dim_to_import_);
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -918,6 +958,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -995,6 +1036,8 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         value *= dscale_;
@@ -1031,6 +1074,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1096,6 +1140,10 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
             return false; // skip points outside of base raster
 =======
+>>>>>>> osgeo-main
+=======
+            return false; // skip points outside of base raster
+=======
 >>>>>>> osgeo-main
             return false;       // skip points outside of base raster
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1119,6 +1167,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1196,6 +1245,8 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
     if (use_zrange_) {
@@ -1226,6 +1277,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1305,6 +1357,11 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
         int return_n = point.getFieldAs(Id::ReturnNumber);
         int n_returns = point.getFieldAs(Id::NumberOfReturns);
 =======
+>>>>>>> osgeo-main
+=======
+        int return_n = point.getFieldAs(Id::ReturnNumber);
+        int n_returns = point.getFieldAs(Id::NumberOfReturns);
+=======
 >>>>>>> osgeo-main
         int return_n = point.getFieldAs < int >(Id::ReturnNumber);
         int n_returns = point.getFieldAs < int >(Id::NumberOfReturns);
@@ -1331,6 +1388,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1415,6 +1473,8 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         if (return_filter_is_out(&return_filter_, return_n, n_returns)) {
@@ -1444,6 +1504,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1509,6 +1570,10 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
         int point_class = point.getFieldAs(Id::Classification);
 =======
+>>>>>>> osgeo-main
+=======
+        int point_class = point.getFieldAs(Id::Classification);
+=======
 >>>>>>> osgeo-main
         int point_class = point.getFieldAs < int >(Id::Classification);
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1532,6 +1597,7 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1609,6 +1675,8 @@ bool GrassLidarFilter::processOne(pdal::PointRef &point)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         if (class_filter_is_out(&class_filter_, point_class)) {
diff --git a/raster/r.in.pdal/grasslidarfilter.h b/raster/r.in.pdal/grasslidarfilter.h
index 18e980037c0..2b81d396d6b 100644
--- a/raster/r.in.pdal/grasslidarfilter.h
+++ b/raster/r.in.pdal/grasslidarfilter.h
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -84,6 +85,10 @@
 =======
 /****************************************************************************
 =======
+>>>>>>> osgeo-main
+=======
+/****************************************************************************
+=======
 >>>>>>> osgeo-main
 
  /****************************************************************************
@@ -108,6 +113,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -188,6 +194,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  *
  * MODULE:    r.in.pdal
@@ -226,6 +234,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -311,6 +320,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #ifndef GRASSLIDARFILTER_H
 #define GRASSLIDARFILTER_H
 
@@ -331,6 +344,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -388,6 +402,9 @@ extern "C" {
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 
 #ifndef GRASSLIDARFILTER_H
 #define GRASSLIDARFILTER_H
@@ -409,6 +426,7 @@ extern "C"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -438,6 +456,8 @@ extern "C"
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 #ifndef GRASSLIDARFILTER_H
 #define GRASSLIDARFILTER_H
 
@@ -457,6 +477,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -532,6 +553,10 @@ extern "C" {
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #include "filters.h"
 #include "lidar.h"
 #include "rast_segment.h"
@@ -554,6 +579,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -595,6 +621,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -621,6 +649,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -690,6 +719,10 @@ extern "C" {
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #include 
 #include 
 #include 
@@ -715,6 +748,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 /* All GRASS GIS filters which are similar across multiple modules
@@ -767,6 +801,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 
 /* All GRASS GIS filters which are similar across multiple modules
@@ -787,6 +823,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -816,6 +853,8 @@ extern "C" {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 /* All GRASS GIS filters which are similar across multiple modules
  * put together as one PDAL Stage class.
  */
@@ -834,6 +873,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -863,6 +903,8 @@ extern "C" {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 /* All GRASS GIS filters which are similar across multiple modules
  * put together as one PDAL Stage class.
  */
@@ -881,6 +923,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -929,6 +972,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 class GrassLidarFilter : public pdal::Filter, public pdal::Streamable {
 public:
     GrassLidarFilter()
@@ -957,6 +1002,7 @@ class GrassLidarFilter : public pdal::Filter, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> osgeo-main
@@ -995,6 +1041,8 @@ class GrassLidarFilter : public pdal::Filter, public pdal::Streamable {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     {
     }
@@ -1016,6 +1064,7 @@ class GrassLidarFilter : public pdal::Filter, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1055,6 +1104,8 @@ class GrassLidarFilter : public pdal::Filter, public pdal::Streamable {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 {
   public:
@@ -1108,6 +1159,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1136,6 +1188,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     {
     }
@@ -1155,6 +1209,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1183,6 +1238,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     {
     }
@@ -1202,6 +1259,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1249,6 +1307,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     void dim_to_import(pdal::Dimension::Id dim_to_import)
@@ -1277,6 +1337,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1342,6 +1403,10 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
     void set_spatial_filter(double xmin, double xmax, double ymin, double ymax)
 =======
+>>>>>>> osgeo-main
+=======
+    void set_spatial_filter(double xmin, double xmax, double ymin, double ymax)
+=======
 >>>>>>> osgeo-main
     void set_spatial_filter(double xmin, double xmax,
                             double ymin, double ymax)
@@ -1366,6 +1431,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1446,6 +1512,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     {
         use_spatial_filter_ = true;
@@ -1509,6 +1577,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1588,6 +1657,11 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
     void set_base_raster(SEGMENT *base_segment, struct Cell_head *region,
                          RASTER_MAP_TYPE rtype)
 =======
+>>>>>>> osgeo-main
+=======
+    void set_base_raster(SEGMENT *base_segment, struct Cell_head *region,
+                         RASTER_MAP_TYPE rtype)
+=======
 >>>>>>> osgeo-main
     void set_base_raster(SEGMENT * base_segment,
                          struct Cell_head *region, RASTER_MAP_TYPE rtype)
@@ -1614,6 +1688,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1698,6 +1773,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     {
         base_segment_ = base_segment;
@@ -1725,6 +1802,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1809,6 +1887,10 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     void set_z_scale(double scale) { zscale_ = scale; }
     void set_intensity_scale(double scale) { iscale_ = scale; }
@@ -1841,6 +1923,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1897,6 +1980,9 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     void set_z_scale(double scale)
     {
@@ -1924,6 +2010,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1952,6 +2039,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     void set_z_scale(double scale) { zscale_ = scale; }
     void set_intensity_scale(double scale) { iscale_ = scale; }
@@ -1969,6 +2058,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -1991,6 +2081,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     gpoint_count num_processed() { return n_processed_; }
@@ -2026,6 +2118,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2136,6 +2229,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     {
         pdal::PointRef p(view, 0);
@@ -2165,6 +2260,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2230,6 +2326,10 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
     virtual bool processOne(pdal::PointRef &point);
 =======
+>>>>>>> osgeo-main
+=======
+    virtual bool processOne(pdal::PointRef &point);
+=======
 >>>>>>> osgeo-main
     virtual bool processOne(pdal::PointRef & point);
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -2253,6 +2353,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2330,6 +2431,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     pdal::Dimension::Id dim_to_import_;
@@ -2392,6 +2495,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2476,6 +2580,10 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     GrassLidarFilter &operator=(const GrassLidarFilter &);
     GrassLidarFilter(const GrassLidarFilter &);
@@ -2497,6 +2605,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2553,6 +2662,9 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     GrassLidarFilter & operator=(const GrassLidarFilter &);
     GrassLidarFilter(const GrassLidarFilter &);
@@ -2574,6 +2686,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2602,6 +2715,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     GrassLidarFilter &operator=(const GrassLidarFilter &);
     GrassLidarFilter(const GrassLidarFilter &);
@@ -2622,6 +2737,7 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2697,4 +2813,8 @@ class GrassLidarFilter:public pdal::Filter, public pdal::Streamable
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #endif // GRASSLIDARFILTER_H
diff --git a/raster/r.in.pdal/grassrasterwriter.h b/raster/r.in.pdal/grassrasterwriter.h
index 7553123d8dd..0ae7d870246 100644
--- a/raster/r.in.pdal/grassrasterwriter.h
+++ b/raster/r.in.pdal/grassrasterwriter.h
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -64,6 +65,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -82,6 +85,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -165,6 +169,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /***************************************************************************
  *
  * MODULE:    r.in.pdal
@@ -206,6 +214,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -270,6 +279,10 @@ extern "C" {
 extern "C" {
 =======
 >>>>>>> osgeo-main
+=======
+extern "C" {
+=======
+>>>>>>> osgeo-main
 extern "C"
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -292,6 +305,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -345,6 +359,8 @@ extern "C"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #include "lidar.h"
 #include "point_binning.h"
 }
@@ -357,6 +373,7 @@ extern "C"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -436,6 +453,10 @@ extern "C" {
 extern "C" {
 =======
 >>>>>>> osgeo-main
+=======
+extern "C" {
+=======
+>>>>>>> osgeo-main
 extern "C"
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -457,6 +478,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -579,6 +601,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #include 
 #include 
 }
@@ -607,6 +631,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 /* Binning code wrapped as a PDAL Writer class */
@@ -659,6 +684,8 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 /* Binning code wrapped as a PDAL Writer class */
 #ifdef HAVE_PDAL_NOFILENAMEWRITER
 class GrassRasterWriter : public pdal::NoFilenameWriter,
@@ -691,6 +718,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -720,6 +748,8 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -759,6 +789,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -893,6 +924,8 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     {
         region_ = region;
@@ -928,6 +961,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1012,6 +1046,10 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     void set_output_scale(double scale) { scale_ = scale; }
 
@@ -1033,6 +1071,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1089,6 +1128,9 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     void set_output_scale(double scale)
     {
@@ -1112,6 +1154,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1140,6 +1183,8 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     void set_output_scale(double scale) { scale_ = scale; }
 
@@ -1160,6 +1205,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1234,6 +1280,10 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     {
         base_segment_ = base_segment;
@@ -1271,6 +1321,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1355,6 +1406,10 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     virtual bool processOne(pdal::PointRef &point)
     {
@@ -1379,6 +1434,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1435,6 +1491,9 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     virtual bool processOne(pdal::PointRef & point)
     {
@@ -1458,6 +1517,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1486,6 +1546,8 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     virtual bool processOne(pdal::PointRef &point)
     {
@@ -1509,6 +1571,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1583,6 +1646,10 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         z *= scale_;
@@ -1624,6 +1691,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1708,6 +1776,10 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             G_message(_("A point on the edge of computational region detected. "
                         "Ignoring."));
@@ -1732,6 +1804,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1788,6 +1861,9 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
             G_message(_("A point on the edge of computational region detected. Ignoring."));
             return false;
@@ -1810,6 +1886,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1838,6 +1915,8 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             G_message(_("A point on the edge of computational region detected. "
                         "Ignoring."));
@@ -1861,6 +1940,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1935,6 +2015,10 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         n_processed++;
         return true;
@@ -1963,6 +2047,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2028,6 +2113,10 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 private:
 =======
+>>>>>>> osgeo-main
+=======
+private:
+=======
 >>>>>>> osgeo-main
   private:
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -2051,6 +2140,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2128,6 +2218,8 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     struct Cell_head *region_;
     struct PointBinning *point_binning_;
diff --git a/raster/r.in.pdal/info.cpp b/raster/r.in.pdal/info.cpp
index 2ff35ee36b0..3e08f9de538 100644
--- a/raster/r.in.pdal/info.cpp
+++ b/raster/r.in.pdal/info.cpp
@@ -21,6 +21,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -86,6 +87,10 @@
 =======
  *
 =======
+>>>>>>> osgeo-main
+=======
+ *
+=======
 >>>>>>> osgeo-main
  *  
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -109,6 +114,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -186,6 +192,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  *   Copyright 2021 by Maris Nartiss, and The GRASS Development Team
  *   Author: Maris Nartiss
@@ -220,6 +228,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -251,6 +260,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #include 
 =======
 =======
@@ -271,6 +282,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
@@ -409,6 +421,11 @@
 >>>>>>> osgeo-main
 =======
 
+<<<<<<< HEAD
+>>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
+>>>>>>> osgeo-main
+=======
+
 <<<<<<< HEAD
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 >>>>>>> osgeo-main
@@ -432,6 +449,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -480,6 +498,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void get_extent(struct StringList *infiles, double *min_x, double *max_x,
                 double *min_y, double *max_y, double *min_z, double *max_z)
 {
@@ -510,6 +530,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -584,6 +605,10 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 =======
     *min_x = *max_x = *min_y = *max_y = *min_z = *max_z = NAN;
 =======
+>>>>>>> osgeo-main
+=======
+    *min_x = *max_x = *min_y = *max_y = *min_z = *max_z = NAN;
+=======
 >>>>>>> osgeo-main
     *min_x = *max_x = *min_y = *max_y = *min_z = *max_z = 0.0 / 0.0;
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -607,6 +632,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -635,6 +661,8 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     *min_x = *max_x = *min_y = *max_y = *min_z = *max_z = 0.0 / 0.0;
 =======
@@ -655,6 +683,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -738,6 +767,8 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     for (int i = 0; i < infiles->num_items; i++) {
@@ -775,6 +806,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -840,6 +872,10 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 =======
         const pdal::LasHeader &las_header = las_reader.header();
 =======
+>>>>>>> osgeo-main
+=======
+        const pdal::LasHeader &las_header = las_reader.header();
+=======
 >>>>>>> osgeo-main
         pdal::LasHeader las_header = las_reader.header();
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -863,6 +899,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -940,6 +977,8 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (first) {
             *min_x = las_header.minX();
@@ -989,6 +1028,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1034,6 +1074,8 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -1052,6 +1094,7 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1135,6 +1178,10 @@ void get_extent(struct StringList *infiles, double *min_x, double *max_x,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void print_extent(struct StringList *infiles)
 {
     double min_x, max_x, min_y, max_y, min_z, max_z;
@@ -1161,6 +1208,7 @@ void print_extent(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1245,6 +1293,10 @@ void print_extent(struct StringList *infiles)
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     fprintf(stdout, "n=%f s=%f e=%f w=%f b=%f t=%f\n", max_y, min_y, max_x,
             min_x, min_z, max_z);
@@ -1266,6 +1318,7 @@ void print_extent(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1322,6 +1375,9 @@ void print_extent(struct StringList *infiles)
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     fprintf(stdout, "n=%f s=%f e=%f w=%f b=%f t=%f\n",
             max_y, min_y, max_x, min_x, min_z, max_z);
@@ -1343,6 +1399,7 @@ void print_extent(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1371,6 +1428,8 @@ void print_extent(struct StringList *infiles)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     fprintf(stdout, "n=%f s=%f e=%f w=%f b=%f t=%f\n", max_y, min_y, max_x,
             min_x, min_z, max_z);
@@ -1391,6 +1450,7 @@ void print_extent(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1466,6 +1526,10 @@ void print_extent(struct StringList *infiles)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void print_lasinfo(struct StringList *infiles)
 {
     pdal::StageFactory factory;
@@ -1492,6 +1556,7 @@ void print_lasinfo(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1531,6 +1596,8 @@ void print_lasinfo(struct StringList *infiles)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1548,6 +1615,7 @@ void print_lasinfo(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1601,6 +1669,8 @@ void print_lasinfo(struct StringList *infiles)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     std::cout << std::endl
               << "Using PDAL library version '"
@@ -1626,6 +1696,7 @@ void print_lasinfo(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1672,6 +1743,9 @@ void print_lasinfo(struct StringList *infiles)
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     std::cout << std::endl << "Using PDAL library version '" <<
         pdal::Config::fullVersionString() << "'" << std::endl << std::endl;
@@ -1694,6 +1768,7 @@ void print_lasinfo(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1766,6 +1841,8 @@ void print_lasinfo(struct StringList *infiles)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     for (int i = 0; i < infiles->num_items; i++) {
@@ -1803,6 +1880,7 @@ void print_lasinfo(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1887,6 +1965,10 @@ void print_lasinfo(struct StringList *infiles)
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         const pdal::LasHeader &h = las_reader.header();
         pdal::PointLayoutPtr point_layout = table.layout();
@@ -1937,6 +2019,7 @@ void print_lasinfo(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1959,6 +2042,8 @@ void print_lasinfo(struct StringList *infiles)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         pdal::LasHeader las_header = las_reader.header();
 =======
@@ -2018,6 +2103,7 @@ void print_lasinfo(struct StringList *infiles)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2305,6 +2391,11 @@ void print_lasinfo(struct StringList *infiles)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
         bool first = 1;
diff --git a/raster/r.in.pdal/info.h b/raster/r.in.pdal/info.h
index 3b08783d749..dd00db844c8 100644
--- a/raster/r.in.pdal/info.h
+++ b/raster/r.in.pdal/info.h
@@ -21,6 +21,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -86,6 +87,10 @@
 =======
  *
 =======
+>>>>>>> osgeo-main
+=======
+ *
+=======
 >>>>>>> osgeo-main
  *  
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -109,6 +114,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -186,6 +192,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  *   Copyright 2021 by Maris Nartiss, and The GRASS Development Team
  *   Author: Maris Nartiss
@@ -216,6 +224,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -257,6 +266,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -278,6 +289,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -347,6 +359,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #include 
 #include 
 #include 
@@ -369,6 +385,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 extern "C" {
 =======
@@ -412,6 +429,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
@@ -434,6 +453,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -462,6 +482,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 extern "C"
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -482,6 +504,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -511,6 +534,8 @@ extern "C" {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 extern "C" {
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -528,6 +553,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -585,6 +611,8 @@ extern "C"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #include 
 #include 
 #include "string_list.h"
@@ -611,6 +639,7 @@ extern "C"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -691,6 +720,11 @@ void get_extent(struct StringList *, double *, double *, double *, double *,
                 double *, double *);
 =======
 >>>>>>> osgeo-main
+=======
+void get_extent(struct StringList *, double *, double *, double *, double *,
+                double *, double *);
+=======
+>>>>>>> osgeo-main
 void get_extent(struct StringList *, double *, double *,
                 double *, double *, double *, double *);
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -716,6 +750,7 @@ void get_extent(struct StringList *, double *, double *, double *, double *,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -801,6 +836,8 @@ void get_extent(struct StringList *, double *, double *,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void print_extent(struct StringList *);
 void print_lasinfo(struct StringList *);
 
diff --git a/raster/r.in.pdal/lidar.c b/raster/r.in.pdal/lidar.c
index 7eda96df67d..b37451aa7cb 100644
--- a/raster/r.in.pdal/lidar.c
+++ b/raster/r.in.pdal/lidar.c
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -64,6 +65,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -82,6 +85,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -165,6 +169,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /****************************************************************************
  *
  * MODULE:       r.in.pdal
@@ -200,6 +208,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -245,6 +254,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -263,6 +274,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -346,6 +358,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #include "lidar.h"
 
 void GLidarLayers_set_no_layers(struct GLidarLayers *layers)
@@ -391,6 +407,7 @@ struct class_table class_val[] = {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -475,6 +492,10 @@ struct class_table class_val[] = {
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     {13 /* 13 - 31 */, "Reserved for ASPRS Definition"},
     {0, 0}};
@@ -497,6 +518,7 @@ struct class_table class_type[] = {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -553,6 +575,9 @@ struct class_table class_type[] = {
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     {13 /* 13 - 31 */ , "Reserved for ASPRS Definition"},
     {0, 0}
@@ -579,6 +604,7 @@ struct class_table class_type[] = {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -607,6 +633,8 @@ struct class_table class_type[] = {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     {13 /* 13 - 31 */, "Reserved for ASPRS Definition"},
     {0, 0}};
@@ -628,6 +656,7 @@ struct class_table class_type[] = {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -703,6 +732,10 @@ struct class_table class_type[] = {
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 
 int return_to_cat(int return_n, int n_returns)
 {
diff --git a/raster/r.in.pdal/lidar.h b/raster/r.in.pdal/lidar.h
index 3535dc29681..2053925af52 100644
--- a/raster/r.in.pdal/lidar.h
+++ b/raster/r.in.pdal/lidar.h
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -64,6 +65,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -82,6 +85,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -165,6 +169,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /****************************************************************************
  *
  * MODULE:       r.in.pdal
@@ -200,6 +208,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -285,6 +294,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #ifndef GRASS_LIDAR_H
 #define GRASS_LIDAR_H
 
@@ -308,6 +321,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -355,6 +369,9 @@
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -387,6 +404,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -489,6 +507,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 /* Type and format specifier for count of points */
 #ifdef HAVE_LONG_LONG_INT
@@ -522,6 +542,7 @@ typedef unsigned long gpoint_count;
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -588,6 +609,10 @@ struct GLidarLayers {
 struct GLidarLayers {
 =======
 >>>>>>> osgeo-main
+=======
+struct GLidarLayers {
+=======
+>>>>>>> osgeo-main
 struct GLidarLayers
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -611,6 +636,7 @@ struct GLidarLayers {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -691,6 +717,8 @@ struct GLidarLayers {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int id_layer;
     int return_layer;
@@ -757,6 +785,7 @@ void GLidarLayers_set_no_layers(struct GLidarLayers *layers);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -823,6 +852,10 @@ struct class_table {
 struct class_table {
 =======
 >>>>>>> osgeo-main
+=======
+struct class_table {
+=======
+>>>>>>> osgeo-main
 struct class_table
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -846,6 +879,7 @@ struct class_table {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -926,6 +960,8 @@ struct class_table {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int code;
     char *name;
diff --git a/raster/r.in.pdal/main.cpp b/raster/r.in.pdal/main.cpp
index 6de55606a92..67044719e21 100644
--- a/raster/r.in.pdal/main.cpp
+++ b/raster/r.in.pdal/main.cpp
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -84,6 +85,10 @@
 =======
 /****************************************************************************
 =======
+>>>>>>> osgeo-main
+=======
+/****************************************************************************
+=======
 >>>>>>> osgeo-main
 
  /****************************************************************************
@@ -108,6 +113,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -188,6 +194,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  *
  * MODULE:    r.in.pdal
@@ -224,6 +232,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -264,6 +273,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #include 
 
 =======
@@ -274,6 +285,9 @@
 >>>>>>> 82b75069a1 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -300,6 +314,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -369,6 +384,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #include 
 #include 
 #include 
@@ -395,6 +414,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 extern "C" {
 =======
@@ -438,6 +458,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
@@ -460,6 +482,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -488,6 +511,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 extern "C"
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -508,6 +533,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -537,6 +563,8 @@ extern "C" {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 extern "C" {
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -554,6 +582,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -611,6 +640,8 @@ extern "C"
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #include 
 #include 
 #include 
@@ -642,6 +673,7 @@ extern "C"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -708,6 +740,10 @@ extern "C" {
 extern "C" {
 =======
 >>>>>>> osgeo-main
+=======
+extern "C" {
+=======
+>>>>>>> osgeo-main
 extern "C"
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -731,6 +767,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -812,6 +849,8 @@ extern "C" {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #include "lidar.h"
 #include "projection.h"
 #include "filters.h"
@@ -842,6 +881,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -887,6 +927,8 @@ extern "C" {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -905,6 +947,7 @@ extern "C" {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -988,6 +1031,10 @@ extern "C" {
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 int main(int argc, char *argv[])
 {
     int out_fd;
@@ -1026,6 +1073,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1105,6 +1153,17 @@ int main(int argc, char *argv[])
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
     int rows, cols; /* scan box size */
 =======
+>>>>>>> osgeo-main
+=======
+>>>>>>> 05ebc5df37 (libcairodriver: enable Cairo with and without Fontconfig (#1697))
+=======
+<<<<<<< HEAD
+>>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704))
+=======
+<<<<<<< HEAD
+>>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
+    int rows, cols; /* scan box size */
+=======
 >>>>>>> osgeo-main
     int rows, cols;             /* scan box size */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1128,6 +1187,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1205,6 +1265,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     char buff[BUFFSIZE];
@@ -1249,6 +1311,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1328,6 +1391,11 @@ int main(int argc, char *argv[])
     module->description = _("Creates a raster map from LAS LiDAR points using "
                             "univariate statistics.");
 =======
+>>>>>>> osgeo-main
+=======
+    module->description = _("Creates a raster map from LAS LiDAR points using "
+                            "univariate statistics.");
+=======
 >>>>>>> osgeo-main
     module->description =
         _("Creates a raster map from LAS LiDAR points using univariate statistics.");
@@ -1354,6 +1422,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1438,6 +1507,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     Option *input_opt = G_define_standard_option(G_OPT_F_BIN_INPUT);
@@ -1492,6 +1563,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1557,6 +1629,10 @@ int main(int argc, char *argv[])
 =======
     method_opt->answer = const_cast("mean");
 =======
+>>>>>>> osgeo-main
+=======
+    method_opt->answer = const_cast("mean");
+=======
 >>>>>>> osgeo-main
     method_opt->answer = const_cast < char *>("mean");
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1580,6 +1656,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1657,6 +1734,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     method_opt->guisection = _("Statistic");
@@ -1724,6 +1803,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1789,6 +1869,10 @@ int main(int argc, char *argv[])
 =======
     type_opt->answer = const_cast("FCELL");
 =======
+>>>>>>> osgeo-main
+=======
+    type_opt->answer = const_cast("FCELL");
+=======
 >>>>>>> osgeo-main
     type_opt->answer = const_cast < char *>("FCELL");
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1812,6 +1896,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1889,6 +1974,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     Option *base_raster_opt = G_define_standard_option(G_OPT_R_INPUT);
@@ -1916,6 +2003,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1981,6 +2069,10 @@ int main(int argc, char *argv[])
 =======
     base_raster_opt->label = _("Subtract raster values from the Z coordinates");
 =======
+>>>>>>> osgeo-main
+=======
+    base_raster_opt->label = _("Subtract raster values from the Z coordinates");
+=======
 >>>>>>> osgeo-main
     base_raster_opt->label =
         _("Subtract raster values from the Z coordinates");
@@ -2005,6 +2097,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2085,6 +2178,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     base_raster_opt->description =
         _("The scale for Z is applied beforehand, the range filter for"
@@ -2128,6 +2223,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2193,6 +2289,10 @@ int main(int argc, char *argv[])
 =======
     zscale_opt->answer = const_cast("1.0");
 =======
+>>>>>>> osgeo-main
+=======
+    zscale_opt->answer = const_cast("1.0");
+=======
 >>>>>>> osgeo-main
     zscale_opt->answer = const_cast < char *>("1.0");
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -2216,6 +2316,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2293,6 +2394,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     zscale_opt->description = _("Scale to apply to Z data");
@@ -2325,6 +2428,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2390,6 +2494,10 @@ int main(int argc, char *argv[])
 =======
     irange_opt->description = _("Filter range for intensity values (min,max)");
 =======
+>>>>>>> osgeo-main
+=======
+    irange_opt->description = _("Filter range for intensity values (min,max)");
+=======
 >>>>>>> osgeo-main
     irange_opt->description =
         _("Filter range for intensity values (min,max)");
@@ -2414,6 +2522,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2494,6 +2603,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     irange_opt->guisection = _("Selection");
 
@@ -2523,6 +2634,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2588,6 +2700,10 @@ int main(int argc, char *argv[])
 =======
     iscale_opt->answer = const_cast("1.0");
 =======
+>>>>>>> osgeo-main
+=======
+    iscale_opt->answer = const_cast("1.0");
+=======
 >>>>>>> osgeo-main
     iscale_opt->answer = const_cast < char *>("1.0");
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -2611,6 +2727,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2688,6 +2805,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     iscale_opt->description = _("Scale to apply to intensity values");
@@ -2734,6 +2853,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -2774,6 +2894,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         _("Reproject to project's coordinate system if needed");
     reproject_flag->description =
@@ -2799,6 +2921,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2867,6 +2990,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         _("Reproject to location's coordinate system if needed");
     reproject_flag->description =
@@ -2896,6 +3023,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
     // TODO: from the API it seems that also prj file path and proj string will
@@ -2940,6 +3068,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     // TODO: from the API it seems that also prj file path and proj string will work
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -2961,6 +3091,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2989,6 +3120,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     // TODO: from the API it seems that also prj file path and proj string will
     // work
@@ -3007,6 +3140,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3060,6 +3194,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     Option *input_srs_opt = G_define_option();
 
@@ -3113,6 +3249,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3192,6 +3329,11 @@ int main(int argc, char *argv[])
     trim_opt->description = _("Discard  percent of the smallest and "
                               " percent of the largest observations");
 =======
+>>>>>>> osgeo-main
+=======
+    trim_opt->description = _("Discard  percent of the smallest and "
+                              " percent of the largest observations");
+=======
 >>>>>>> osgeo-main
     trim_opt->description =
         _("Discard  percent of the smallest and  percent of the largest observations");
@@ -3218,6 +3360,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3302,6 +3445,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     trim_opt->guisection = _("Statistic");
 
@@ -3339,6 +3484,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3404,6 +3550,10 @@ int main(int argc, char *argv[])
 =======
     return_filter_opt->label = _("Only import points of selected return type");
 =======
+>>>>>>> osgeo-main
+=======
+    return_filter_opt->label = _("Only import points of selected return type");
+=======
 >>>>>>> osgeo-main
     return_filter_opt->label =
         _("Only import points of selected return type");
@@ -3428,6 +3578,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3508,6 +3659,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     return_filter_opt->description =
         _("If not specified, all points are imported");
@@ -3542,6 +3695,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3590,6 +3744,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     class_filter_opt->description =
         _("Input is comma separated integers. "
@@ -3612,6 +3768,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3642,6 +3799,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     class_filter_opt->description = _("Input is comma separated integers. "
                                       "If not specified, all points are imported.");
@@ -3665,6 +3824,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3693,6 +3853,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     class_filter_opt->description =
         _("Input is comma separated integers. "
@@ -3712,6 +3874,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3768,6 +3931,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     class_filter_opt->guisection = _("Selection");
 
@@ -3800,6 +3965,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3865,6 +4031,10 @@ int main(int argc, char *argv[])
 =======
     dimension_opt->answer = const_cast("z");
 =======
+>>>>>>> osgeo-main
+=======
+    dimension_opt->answer = const_cast("z");
+=======
 >>>>>>> osgeo-main
     dimension_opt->answer = const_cast < char *>("z");
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -3888,6 +4058,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3965,6 +4136,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     dimension_opt->guisection = _("Selection");
@@ -3995,6 +4168,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4034,6 +4208,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4051,6 +4227,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4104,6 +4281,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                "angle;%s;"
                "class;%s;"
@@ -4129,6 +4308,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4169,6 +4349,9 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
                "angle;%s;" "class;%s;" "source;%s", _("Z coordinate"),
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -4188,6 +4371,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -4271,6 +4455,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                /* GTC: LAS LiDAR point property */
                _("Intensity"),
@@ -4337,6 +4523,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         _("Override projection check (use current location's projection)");
     over_flag->description = _(
@@ -4381,6 +4568,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         _("Override projection check (use current project's CRS)");
     over_flag->description =
@@ -4403,6 +4592,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4430,6 +4620,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     over_flag->description =
         _("Assume that the dataset has same projection as the current location");
@@ -4452,6 +4644,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4480,6 +4673,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         _("Override projection check (use current location's projection)");
     over_flag->description = _(
@@ -4499,6 +4694,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4555,6 +4751,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     over_flag->guisection = _("Projection");
 
@@ -4600,6 +4798,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4645,6 +4844,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -4663,6 +4864,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4745,6 +4947,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     G_option_required(input_opt, file_list_opt, NULL);
     G_option_exclusive(input_opt, file_list_opt, NULL);
@@ -4774,6 +4980,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4819,6 +5026,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -4837,6 +5046,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4919,6 +5129,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     if (G_parser(argc, argv))
         return EXIT_FAILURE;
@@ -4949,6 +5163,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5014,6 +5229,10 @@ int main(int argc, char *argv[])
 =======
             G_fatal_error(_("File <%s> does not exist"), file_list_opt->answer);
 =======
+>>>>>>> osgeo-main
+=======
+            G_fatal_error(_("File <%s> does not exist"), file_list_opt->answer);
+=======
 >>>>>>> osgeo-main
             G_fatal_error(_("File <%s> does not exist"),
                           file_list_opt->answer);
@@ -5038,6 +5257,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5118,6 +5338,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         string_list_from_file(&infiles, file_list_opt->answer);
     }
@@ -5158,6 +5380,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5197,6 +5420,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -5214,6 +5439,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5267,6 +5493,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if (set_region_flag->answer && !(extents_flag->answer || res_opt->answer ||
                                      base_rast_res_flag->answer)) {
@@ -5292,6 +5520,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5354,6 +5583,9 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     if (set_region_flag->answer &&
         !(extents_flag->answer || res_opt->answer ||
@@ -5375,6 +5607,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -5398,6 +5631,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -5415,6 +5650,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5468,6 +5704,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                   set_region_flag->key, res_opt->key, extents_flag->key,
                   base_rast_res_flag->key);
@@ -5529,6 +5767,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5613,6 +5852,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     G_get_set_window(
         &loc_wind); /* TODO: v.in.lidar uses G_get_default_window() */
@@ -5635,6 +5878,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5691,6 +5935,9 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     G_get_set_window(&loc_wind);        /* TODO: v.in.lidar uses G_get_default_window() */
 
@@ -5710,6 +5957,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5738,6 +5986,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     G_get_set_window(
         &loc_wind); /* TODO: v.in.lidar uses G_get_default_window() */
@@ -5759,6 +6009,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -5833,6 +6084,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     if (extents_flag->answer) {
         double min_x, max_x, min_y, max_y, min_z, max_z;
@@ -5870,6 +6125,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5954,6 +6210,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         use_spatial_filter =
             spatial_filter_from_current_region(&xmin, &ymin, &xmax, &ymax);
@@ -5990,6 +6250,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6028,6 +6289,9 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         use_spatial_filter = spatial_filter_from_current_region(&xmin,
                                                                 &ymin,
@@ -6060,6 +6324,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
@@ -6178,6 +6443,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     bool use_class_filter = class_filter_create_from_strings(&class_filter,
                                                              class_filter_opt->
@@ -6197,6 +6464,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6225,6 +6493,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     bool use_class_filter = class_filter_create_from_strings(
         &class_filter, class_filter_opt->answers);
@@ -6243,6 +6513,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -6317,6 +6588,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     point_binning_set(&point_binning, method_opt->answer, pth_opt->answer,
@@ -6482,6 +6757,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -6547,6 +6823,10 @@ int main(int argc, char *argv[])
 =======
             Rast_set_input_window(&input_region); /* we have split window */
 =======
+>>>>>>> osgeo-main
+=======
+            Rast_set_input_window(&input_region); /* we have split window */
+=======
 >>>>>>> osgeo-main
             Rast_set_input_window(&input_region);       /* we have split window */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -6570,6 +6850,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6647,6 +6928,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         }
         else {
@@ -6689,6 +6972,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -6754,6 +7038,10 @@ int main(int argc, char *argv[])
 =======
     std::vector readers;
 =======
+>>>>>>> osgeo-main
+=======
+    std::vector readers;
+=======
 >>>>>>> osgeo-main
     std::vector < pdal::Stage * >readers;
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -6777,6 +7065,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -6854,6 +7143,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     pdal::StageFactory factory;
     pdal::MergeFilter merge_filter;
@@ -6890,6 +7181,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -6974,6 +7266,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         pdal::Stage *reader = factory.createStage(pdal_read_driver);
         if (!reader)
@@ -6995,6 +7291,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7051,6 +7348,9 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         pdal::Stage * reader = factory.createStage(pdal_read_driver);
         if (!reader)
@@ -7072,6 +7372,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -7100,6 +7401,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         pdal::Stage *reader = factory.createStage(pdal_read_driver);
         if (!reader)
@@ -7120,6 +7423,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -7194,6 +7498,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         reader->setOptions(las_opts);
         readers.push_back(reader);
@@ -7224,6 +7532,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -7289,6 +7598,10 @@ int main(int argc, char *argv[])
 =======
     pdal::Stage *last_stage = &merge_filter;
 =======
+>>>>>>> osgeo-main
+=======
+    pdal::Stage *last_stage = &merge_filter;
+=======
 >>>>>>> osgeo-main
     pdal::Stage * last_stage = &merge_filter;
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -7312,6 +7625,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7389,6 +7703,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     pdal::ReprojectionFilter reprojection_filter;
 
@@ -7410,6 +7726,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         G_message(_("Reprojecting the input to the location projection"));
 =======
@@ -7452,6 +7769,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_message(_("Reprojecting the input to the project's CRS"));
 =======
@@ -7471,6 +7790,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         G_message(_("Reprojecting the input to the location projection"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -7553,6 +7873,11 @@ int main(int argc, char *argv[])
 =======
         G_message(_("Reprojecting the input to the location projection"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        G_message(_("Reprojecting the input to the location projection"));
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         char *proj_wkt = location_projection_as_wkt(false);
 
@@ -7580,6 +7905,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -7659,6 +7985,11 @@ int main(int argc, char *argv[])
             o4.add("in_srs", input_srs_opt->answer);
         o4.add("out_srs", proj_wkt);
 =======
+>>>>>>> osgeo-main
+=======
+            o4.add("in_srs", input_srs_opt->answer);
+        o4.add("out_srs", proj_wkt);
+=======
 >>>>>>> osgeo-main
             o4.add < std::string > ("in_srs", input_srs_opt->answer);
         o4.add < std::string > ("out_srs", proj_wkt);
@@ -7685,6 +8016,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7769,6 +8101,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         reprojection_filter.setOptions(o4);
         reprojection_filter.setInput(*last_stage);
@@ -7814,6 +8148,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -7879,6 +8214,10 @@ int main(int argc, char *argv[])
 =======
     grass_filter.set_z_scale(zscale); // Default is 1 == no scale
 =======
+>>>>>>> osgeo-main
+=======
+    grass_filter.set_z_scale(zscale); // Default is 1 == no scale
+=======
 >>>>>>> osgeo-main
     grass_filter.set_z_scale(zscale);   // Default is 1 == no scale
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -7902,6 +8241,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -7979,6 +8319,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     grass_filter.set_intensity_scale(iscale);
     grass_filter.set_d_scale(dscale);
@@ -8009,6 +8351,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -8057,6 +8400,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     // stream_filter.setInput(*last_stage);
     //  there is no difference between 1 and 10k points in memory
@@ -8079,6 +8424,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8117,6 +8463,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     //stream_filter.setInput(*last_stage);
     // there is no difference between 1 and 10k points in memory
@@ -8136,6 +8484,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -8164,6 +8513,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     // stream_filter.setInput(*last_stage);
     //  there is no difference between 1 and 10k points in memory
@@ -8183,6 +8534,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -8211,6 +8563,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     // stream_filter.setInput(*last_stage);
     //  there is no difference between 1 and 10k points in memory
@@ -8230,6 +8584,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8277,6 +8632,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     pdal::point_count_t point_table_capacity = 10000;
     pdal::FixedPointTable point_table(point_table_capacity);
@@ -8301,6 +8658,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                               " that the projection of input matches"
                               " the location projection"));
@@ -8344,6 +8702,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                               " that the CRS of input matches"
                               " the project's CRS"));
@@ -8365,6 +8725,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -8393,6 +8754,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                               " that the projection of input matches"
                               " the location projection"));
@@ -8411,6 +8774,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8452,6 +8816,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
     else if (!reproject_flag->answer) {
@@ -8519,6 +8885,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -8558,6 +8925,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8575,6 +8944,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8628,6 +8998,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             G_warning(
                 _("Both dimension and user dimension parameters are specified. "
@@ -8653,6 +9025,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -8715,6 +9088,9 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
             G_warning(_("Both dimension and user dimension parameters are specified. "
                        "Using '%s' as the dimension to import."),
@@ -8735,6 +9111,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -8758,6 +9135,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -8775,6 +9154,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -8828,6 +9208,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
 
@@ -8860,6 +9242,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -8939,6 +9322,11 @@ int main(int argc, char *argv[])
     binning_writer.set_binning(®ion, &point_binning, &bin_index_nodes, rtype,
                                cols);
 =======
+>>>>>>> osgeo-main
+=======
+    binning_writer.set_binning(®ion, &point_binning, &bin_index_nodes, rtype,
+                               cols);
+=======
 >>>>>>> osgeo-main
     binning_writer.set_binning(®ion, &point_binning, &bin_index_nodes,
                                rtype, cols);
@@ -8965,6 +9353,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9049,6 +9438,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     binning_writer.dim_to_import(dim_to_import);
     if (base_raster_opt->answer)
@@ -9084,6 +9475,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -9163,6 +9555,11 @@ int main(int argc, char *argv[])
         write_values(&point_binning, &bin_index_nodes, raster_row, row, cols,
                      rtype);
 =======
+>>>>>>> osgeo-main
+=======
+        write_values(&point_binning, &bin_index_nodes, raster_row, row, cols,
+                     rtype);
+=======
 >>>>>>> osgeo-main
         write_values(&point_binning, &bin_index_nodes, raster_row, row,
                      cols, rtype);
@@ -9189,6 +9586,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9273,6 +9671,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_percent(row, rows, 10);
 
@@ -9305,6 +9705,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -9370,6 +9771,10 @@ int main(int argc, char *argv[])
 =======
     G_percent(1, 1, 1); /* flush */
 =======
+>>>>>>> osgeo-main
+=======
+    G_percent(1, 1, 1); /* flush */
+=======
 >>>>>>> osgeo-main
     G_percent(1, 1, 1);         /* flush */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -9393,6 +9798,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9470,6 +9876,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     G_free(raster_row);
 
@@ -9503,6 +9911,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -9594,6 +10003,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
     snprintf(title, sizeof(title),
              "Raw X,Y,Z data binned into a raster grid by cell %s",
@@ -9615,6 +10028,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727))
 =======
@@ -9661,6 +10075,9 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     sprintf(title, "Raw X,Y,Z data binned into a raster grid by cell %s",
             method_opt->answer);
@@ -9685,6 +10102,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -9713,6 +10131,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     sprintf(title, "Raw X,Y,Z data binned into a raster grid by cell %s",
             method_opt->answer);
@@ -9737,6 +10157,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -9813,6 +10234,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     Rast_put_cell_title(outmap, title);
 
@@ -9864,6 +10287,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -9962,6 +10386,10 @@ int main(int argc, char *argv[])
 =======
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
         snprintf(buff, BUFFSIZE,
                  _("Raster map <%s> created."
@@ -9983,6 +10411,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10020,6 +10449,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
     else {
@@ -10042,6 +10473,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10078,6 +10510,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         sprintf(buff, _("Raster map <%s> created."
                         " " GPOINT_COUNT_FORMAT
@@ -10097,6 +10531,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -10163,6 +10598,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -10173,6 +10610,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 =======
@@ -10193,6 +10631,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         sprintf(buff,
                 _("Raster map <%s> created."
@@ -10215,6 +10655,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -10237,6 +10678,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -10266,6 +10709,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -10295,6 +10739,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
         snprintf(buff, BUFFSIZE,
                  _("Raster map <%s> created."
@@ -10314,6 +10760,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10350,6 +10797,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
     else {
@@ -10372,6 +10821,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -10400,6 +10850,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -10418,6 +10870,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -10531,6 +10984,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
 
diff --git a/raster/r.in.pdal/point_binning.c b/raster/r.in.pdal/point_binning.c
index c58eaf920da..3a67cba86fe 100644
--- a/raster/r.in.pdal/point_binning.c
+++ b/raster/r.in.pdal/point_binning.c
@@ -45,6 +45,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -130,6 +131,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void *get_cell_ptr(void *array, int cols, int row, int col,
                    RASTER_MAP_TYPE map_type)
 {
@@ -153,6 +158,7 @@ void *get_cell_ptr(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -200,6 +206,9 @@ void *get_cell_ptr(void *array, int cols, int row, int col,
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 
 =======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -231,6 +240,7 @@ void *get_cell_ptr(void *array, int cols, int row, int col,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -330,6 +340,8 @@ void *get_cell_ptr(void *array, int cols, int row, int col,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
                 int value)
 {
@@ -372,6 +384,7 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         Rast_set_null_value(array, nrows * ncols, map_type);
 =======
@@ -414,6 +427,8 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         for (row = 0; row < nrows; row++) {
             Rast_set_null_value(ptr, ncols, map_type);
@@ -436,6 +451,7 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         Rast_set_null_value(array, nrows * ncols, map_type);
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -518,6 +534,11 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
 =======
         Rast_set_null_value(array, nrows * ncols, map_type);
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        Rast_set_null_value(array, nrows * ncols, map_type);
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         break;
 
@@ -549,6 +570,7 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -594,6 +616,8 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -612,6 +636,7 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -695,6 +720,10 @@ int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void point_binning_set(struct PointBinning *point_binning, char *method,
                        char *percentile, char *trim)
 {
@@ -810,6 +839,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -889,6 +919,11 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
             G_fatal_error(_("Unable to calculate percentile without the pth "
                             "option specified!"));
 =======
+>>>>>>> osgeo-main
+=======
+            G_fatal_error(_("Unable to calculate percentile without the pth "
+                            "option specified!"));
+=======
 >>>>>>> osgeo-main
             G_fatal_error(_("Unable to calculate percentile without the pth option specified!"));
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -914,6 +949,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -995,6 +1031,8 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         point_binning->method = METHOD_PERCENTILE;
         point_binning->bin_z_index = TRUE;
@@ -1028,6 +1066,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1107,6 +1146,11 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
             G_fatal_error(_("Unable to calculate trimmed mean without the trim "
                             "option specified!"));
 =======
+>>>>>>> osgeo-main
+=======
+            G_fatal_error(_("Unable to calculate trimmed mean without the trim "
+                            "option specified!"));
+=======
 >>>>>>> osgeo-main
             G_fatal_error(_("Unable to calculate trimmed mean without the trim option specified!"));
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1132,6 +1176,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1213,6 +1258,8 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         point_binning->method = METHOD_TRIMMEAN;
         point_binning->bin_z_index = TRUE;
@@ -1260,6 +1307,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1305,6 +1353,8 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -1323,6 +1373,7 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -1406,6 +1457,10 @@ void point_binning_set(struct PointBinning *point_binning, char *method,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void point_binning_allocate(struct PointBinning *point_binning, int rows,
                             int cols, RASTER_MAP_TYPE rtype)
 {
@@ -1440,6 +1495,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1519,6 +1575,11 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
         blank_array(point_binning->min_array, rows, cols, rtype,
                     -1); /* fill with NULLs */
 =======
+>>>>>>> osgeo-main
+=======
+        blank_array(point_binning->min_array, rows, cols, rtype,
+                    -1); /* fill with NULLs */
+=======
 >>>>>>> osgeo-main
         blank_array(point_binning->min_array, rows, cols, rtype, -1);   /* fill with NULLs */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1544,6 +1605,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1625,6 +1687,8 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
     if (point_binning->bin_max) {
@@ -1652,6 +1716,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1731,6 +1796,11 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
         blank_array(point_binning->max_array, rows, cols, rtype,
                     -1); /* fill with NULLs */
 =======
+>>>>>>> osgeo-main
+=======
+        blank_array(point_binning->max_array, rows, cols, rtype,
+                    -1); /* fill with NULLs */
+=======
 >>>>>>> osgeo-main
         blank_array(point_binning->max_array, rows, cols, rtype, -1);   /* fill with NULLs */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1756,6 +1826,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1837,6 +1908,8 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     }
     if (point_binning->bin_sum) {
@@ -1881,6 +1954,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1965,6 +2039,10 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     if (point_binning->bin_z_index || point_binning->bin_cnt_index ||
         point_binning->bin_eigenvalues) {
@@ -1992,6 +2070,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2038,6 +2117,9 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     if (point_binning->bin_z_index ||
         point_binning->bin_cnt_index || point_binning->bin_eigenvalues) {
@@ -2074,6 +2156,7 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2185,6 +2268,8 @@ void point_binning_allocate(struct PointBinning *point_binning, int rows,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void point_binning_free(struct PointBinning *point_binning,
                         struct BinIndex *bin_index_nodes)
 {
@@ -2224,6 +2309,7 @@ void point_binning_free(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2303,6 +2389,11 @@ void point_binning_free(struct PointBinning *point_binning,
     if (point_binning->bin_z_index || point_binning->bin_cnt_index ||
         point_binning->bin_eigenvalues) {
 =======
+>>>>>>> osgeo-main
+=======
+    if (point_binning->bin_z_index || point_binning->bin_cnt_index ||
+        point_binning->bin_eigenvalues) {
+=======
 >>>>>>> osgeo-main
     if (point_binning->bin_z_index ||
         point_binning->bin_cnt_index || point_binning->bin_eigenvalues) {
@@ -2329,6 +2420,7 @@ void point_binning_free(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2413,6 +2505,8 @@ void point_binning_free(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         G_free(point_binning->index_array);
         G_free(bin_index_nodes->nodes);
@@ -2443,6 +2537,7 @@ void point_binning_free(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2488,6 +2583,8 @@ void point_binning_free(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -2506,6 +2603,7 @@ void point_binning_free(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2589,6 +2687,10 @@ void point_binning_free(struct PointBinning *point_binning,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void write_values(struct PointBinning *point_binning,
                   struct BinIndex *bin_index_nodes, void *raster_row, int row,
                   int cols, RASTER_MAP_TYPE rtype)
@@ -2618,6 +2720,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2702,6 +2805,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     case METHOD_N: /* n is a straight copy */
         Rast_raster_cpy(raster_row,
@@ -2723,6 +2830,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2779,6 +2887,9 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     case METHOD_N:             /* n is a straight copy */
         Rast_raster_cpy(raster_row,
@@ -2799,6 +2910,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2827,6 +2939,8 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     case METHOD_N: /* n is a straight copy */
         Rast_raster_cpy(raster_row,
@@ -2847,6 +2961,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2921,6 +3036,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                         cols, CELL_TYPE);
         break;
@@ -2949,6 +3068,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3028,6 +3148,11 @@ void write_values(struct PointBinning *point_binning,
                             ((size_t)row * cols * Rast_cell_size(rtype)),
                         cols, rtype);
 =======
+>>>>>>> osgeo-main
+=======
+                            ((size_t)row * cols * Rast_cell_size(rtype)),
+                        cols, rtype);
+=======
 >>>>>>> osgeo-main
                         ((size_t)row * cols * Rast_cell_size(rtype)), cols,
                         rtype);
@@ -3054,6 +3179,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3138,6 +3264,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         break;
 
@@ -3165,6 +3293,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3249,6 +3378,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                             ((size_t)row * cols * Rast_cell_size(rtype)),
                         cols, rtype);
@@ -3282,6 +3415,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -3335,6 +3469,8 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                         ((size_t)row * cols * Rast_cell_size(rtype)), cols,
                         rtype);
@@ -3362,6 +3498,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8e24da816f (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
 <<<<<<< HEAD
@@ -3436,6 +3573,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             size_t offset =
                 ((size_t)row * cols + col) * Rast_cell_size(rtype);
@@ -3460,6 +3599,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3488,6 +3628,8 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             size_t offset = ((size_t)row * cols + col) * Rast_cell_size(rtype);
             double min = Rast_get_d_value(
@@ -3509,6 +3651,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -3583,6 +3726,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
             Rast_set_d_value(ptr, max - min, rtype);
@@ -3611,6 +3758,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3676,6 +3824,10 @@ void write_values(struct PointBinning *point_binning,
 =======
     case METHOD_MEAN: /* (sum / n) */
 =======
+>>>>>>> osgeo-main
+=======
+    case METHOD_MEAN: /* (sum / n) */
+=======
 >>>>>>> osgeo-main
     case METHOD_MEAN:          /* (sum / n) */
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -3699,6 +3851,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3776,6 +3929,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         ptr = raster_row;
         for (col = 0; col < cols; col++) {
@@ -3802,6 +3957,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3841,6 +3997,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -3858,6 +4016,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3911,6 +4070,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             int n = Rast_get_c_value(
                 ((char *)point_binning->n_array) + n_offset, CELL_TYPE);
@@ -3936,6 +4097,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -3998,6 +4160,9 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
             int n =
                 Rast_get_c_value(((char *)point_binning->n_array) + n_offset,
@@ -4021,6 +4186,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -4044,6 +4210,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -4061,6 +4229,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4114,6 +4283,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
             if (n == 0)
@@ -4146,6 +4317,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4230,6 +4402,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     case METHOD_STDDEV:    /*  sqrt(variance)        */
     case METHOD_VARIANCE:  /*  (sumsq - sum*sum/n)/n */
@@ -4256,6 +4432,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4302,6 +4479,9 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     case METHOD_STDDEV:        /*  sqrt(variance)        */
     case METHOD_VARIANCE:      /*  (sumsq - sum*sum/n)/n */
@@ -4338,6 +4518,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -4448,6 +4629,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         write_median(bin_index_nodes, raster_row, point_binning->index_array,
                      row, cols, rtype);
@@ -4475,6 +4658,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4559,6 +4743,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         write_mode(bin_index_nodes, raster_row, point_binning->index_array, row,
                    cols);
@@ -4581,6 +4769,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4637,6 +4826,9 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         write_mode(bin_index_nodes, raster_row, point_binning->index_array,
                    row, cols);
@@ -4658,6 +4850,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4686,6 +4879,8 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         write_mode(bin_index_nodes, raster_row, point_binning->index_array, row,
                    cols);
@@ -4707,6 +4902,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -4781,6 +4977,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         write_percentile(bin_index_nodes, raster_row,
                          point_binning->index_array, row, cols, rtype,
@@ -4808,6 +5008,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -4892,6 +5093,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     case METHOD_SKEWNESS: /* skewness = sum(xi-mean)^3/(N-1)*s^3 */
         write_skewness(bin_index_nodes, raster_row, point_binning->index_array,
@@ -4927,6 +5132,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -4973,6 +5179,9 @@ void write_values(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     case METHOD_SKEWNESS:      /* skewness = sum(xi-mean)^3/(N-1)*s^3 */
         write_skewness(bin_index_nodes, raster_row,
@@ -5019,6 +5228,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5159,6 +5369,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         break;
 
@@ -5186,6 +5398,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5265,6 +5478,11 @@ void write_values(struct PointBinning *point_binning,
         write_ev(bin_index_nodes, raster_row, point_binning->index_array, row,
                  cols, rtype, point_binning->method);
 =======
+>>>>>>> osgeo-main
+=======
+        write_ev(bin_index_nodes, raster_row, point_binning->index_array, row,
+                 cols, rtype, point_binning->method);
+=======
 >>>>>>> osgeo-main
         write_ev(bin_index_nodes, raster_row, point_binning->index_array,
                  row, cols, rtype, point_binning->method);
@@ -5291,6 +5509,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5375,6 +5594,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         break;
 
@@ -5404,6 +5625,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5449,6 +5671,8 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -5467,6 +5691,7 @@ void write_values(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -5550,6 +5775,10 @@ void write_values(struct PointBinning *point_binning,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 void update_value(struct PointBinning *point_binning,
                   struct BinIndex *bin_index_nodes, int cols, int arr_row,
                   int arr_col, RASTER_MAP_TYPE rtype, double x, double y,
@@ -5579,6 +5808,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5627,6 +5857,8 @@ void update_value(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         update_min(point_binning->min_array, cols, arr_row, arr_col, rtype, z);
     if (point_binning->bin_max)
@@ -5649,6 +5881,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5687,6 +5920,8 @@ void update_value(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         update_min(point_binning->min_array, cols, arr_row, arr_col, rtype,
                    z);
@@ -5708,6 +5943,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5736,6 +5972,8 @@ void update_value(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         update_min(point_binning->min_array, cols, arr_row, arr_col, rtype, z);
     if (point_binning->bin_max)
@@ -5755,6 +5993,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -5783,6 +6022,8 @@ void update_value(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         update_min(point_binning->min_array, cols, arr_row, arr_col, rtype, z);
     if (point_binning->bin_max)
@@ -5802,6 +6043,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -5849,6 +6091,8 @@ void update_value(struct PointBinning *point_binning,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     if (point_binning->bin_sum)
         update_sum(point_binning->sum_array, point_binning->c_array, cols,
@@ -5881,6 +6125,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -5965,6 +6210,10 @@ void update_value(struct PointBinning *point_binning,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         update_bin_cnt_index(bin_index_nodes, point_binning->index_array, cols,
                              arr_row, arr_col, z);
@@ -5987,6 +6236,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6043,6 +6293,9 @@ void update_value(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
         update_bin_cnt_index(bin_index_nodes, point_binning->index_array,
                              cols, arr_row, arr_col, z);
@@ -6064,6 +6317,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -6092,6 +6346,8 @@ void update_value(struct PointBinning *point_binning,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         update_bin_cnt_index(bin_index_nodes, point_binning->index_array, cols,
                              arr_row, arr_col, z);
@@ -6113,6 +6369,7 @@ void update_value(struct PointBinning *point_binning,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -6188,4 +6445,8 @@ void update_value(struct PointBinning *point_binning,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 }
diff --git a/raster/r.in.pdal/point_binning.h b/raster/r.in.pdal/point_binning.h
index 51d68ead871..654a9860843 100644
--- a/raster/r.in.pdal/point_binning.h
+++ b/raster/r.in.pdal/point_binning.h
@@ -40,6 +40,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -79,6 +80,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -96,6 +99,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -150,6 +154,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #define METHOD_NONE       0
 #define METHOD_N          1
 #define METHOD_MIN        2
@@ -180,6 +186,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -243,6 +250,9 @@
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 #define METHOD_NONE        0
 #define METHOD_N           1
 #define METHOD_MIN         2
@@ -269,6 +279,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -292,6 +303,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -309,6 +322,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -363,6 +377,8 @@
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 #define METHOD_MEDIAN     10
 #define METHOD_MODE       11
 #define METHOD_PERCENTILE 12
@@ -395,6 +411,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -479,6 +496,10 @@ struct z_node {
 struct z_node {
 =======
 >>>>>>> osgeo-main
+=======
+struct z_node {
+=======
+>>>>>>> osgeo-main
 
 struct z_node
 {
@@ -498,6 +519,7 @@ struct z_node
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -521,6 +543,8 @@ struct z_node
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 struct z_node {
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -540,6 +564,7 @@ struct z_node {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -596,6 +621,8 @@ struct z_node {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int next;
     double z;
@@ -622,6 +649,7 @@ struct z_node {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -688,6 +716,10 @@ struct cnt_node {
 struct cnt_node {
 =======
 >>>>>>> osgeo-main
+=======
+struct cnt_node {
+=======
+>>>>>>> osgeo-main
 struct cnt_node
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -711,6 +743,7 @@ struct cnt_node {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -791,6 +824,8 @@ struct cnt_node {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int next;
     CELL value;
@@ -818,6 +853,7 @@ struct cnt_node {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -884,6 +920,10 @@ struct com_node {
 struct com_node {
 =======
 >>>>>>> osgeo-main
+=======
+struct com_node {
+=======
+>>>>>>> osgeo-main
 struct com_node
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -907,6 +947,7 @@ struct com_node {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -987,6 +1028,8 @@ struct com_node {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int n;
     double *meanx;
@@ -1015,6 +1058,7 @@ struct com_node {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1081,6 +1125,10 @@ struct BinIndex {
 struct BinIndex {
 =======
 >>>>>>> osgeo-main
+=======
+struct BinIndex {
+=======
+>>>>>>> osgeo-main
 struct BinIndex
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1104,6 +1152,7 @@ struct BinIndex {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1184,6 +1233,8 @@ struct BinIndex {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int num_nodes;
     int max_nodes;
@@ -1211,6 +1262,7 @@ struct BinIndex {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1277,6 +1329,10 @@ struct PointBinning {
 struct PointBinning {
 =======
 >>>>>>> osgeo-main
+=======
+struct PointBinning {
+=======
+>>>>>>> osgeo-main
 struct PointBinning
 {
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1300,6 +1356,7 @@ struct PointBinning {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1380,6 +1437,8 @@ struct PointBinning {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int method;
 
@@ -1436,6 +1495,7 @@ void point_binning_free(struct PointBinning *, struct BinIndex *);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1475,6 +1535,8 @@ void point_binning_free(struct PointBinning *, struct BinIndex *);
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1492,6 +1554,7 @@ void point_binning_free(struct PointBinning *, struct BinIndex *);
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1546,6 +1609,8 @@ void point_binning_free(struct PointBinning *, struct BinIndex *);
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void write_values(struct PointBinning *, struct BinIndex *, void *, int, int,
                   RASTER_MAP_TYPE);
 void update_value(struct PointBinning *, struct BinIndex *, int, int, int,
@@ -1570,6 +1635,7 @@ void update_value(struct PointBinning *, struct BinIndex *, int, int, int,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1633,6 +1699,9 @@ void update_value(struct PointBinning *, struct BinIndex *, int, int, int,
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 
 void write_values(struct PointBinning *,
                   struct BinIndex *, void *, int, int, RASTER_MAP_TYPE);
@@ -1656,6 +1725,7 @@ void update_value(struct PointBinning *,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -1679,6 +1749,8 @@ void update_value(struct PointBinning *,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1696,6 +1768,7 @@ void update_value(struct PointBinning *,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1750,5 +1823,7 @@ void update_value(struct PointBinning *,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 #endif /* __POINT_BINNING_H__ */
diff --git a/raster/r.in.pdal/projection.c b/raster/r.in.pdal/projection.c
index c09578b83d0..e243416010f 100644
--- a/raster/r.in.pdal/projection.c
+++ b/raster/r.in.pdal/projection.c
@@ -48,6 +48,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
     strcpy(error_msg, _("Projection of dataset does not"
@@ -99,6 +100,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     strcpy(error_msg, _("Coordinate reference system of dataset does not"
                         " appear to match current project.\n\n"));
@@ -121,6 +124,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -149,6 +153,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     strcpy(error_msg, _("Projection of dataset does not"
                         " appear to match current location.\n\n"));
@@ -167,6 +173,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -195,6 +202,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     strcpy(error_msg, _("Projection of dataset does not"
                         " appear to match current location.\n\n"));
@@ -213,6 +222,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -260,6 +270,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
     /* TODO: output this info sorted by key: */
@@ -281,6 +293,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n"));
 =======
@@ -323,6 +336,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             strcat(error_msg, _("GRASS project PROJ_INFO is:\n"));
 =======
@@ -342,6 +357,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -424,6 +440,11 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
             strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n"));
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            strcat(error_msg, _("GRASS LOCATION PROJ_INFO is:\n"));
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             for (i_value = 0; i_value < loc_proj_info->nitems; i_value++)
                 sprintf(error_msg + strlen(error_msg), "%s: %s\n",
@@ -470,6 +491,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -554,6 +576,10 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                         "Dataset proj = %d (UTM), zone = %d\n", cellhd.proj,
                         cellhd.zone);
@@ -577,6 +603,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -633,6 +660,9 @@ void projection_mismatch_report(struct Cell_head cellhd,
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
                         "Dataset proj = %d (UTM), zone = %d\n",
                         cellhd.proj, cellhd.zone);
@@ -655,6 +685,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -683,6 +714,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                         "Dataset proj = %d (UTM), zone = %d\n", cellhd.proj,
                         cellhd.zone);
@@ -705,6 +738,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -779,6 +813,10 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         }
     }
@@ -800,6 +838,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n");
 =======
@@ -842,6 +881,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             strcat(error_msg, "GRASS project PROJ_UNITS is:\n");
 =======
@@ -861,6 +902,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
             strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n");
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -943,6 +985,11 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
             strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n");
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+            strcat(error_msg, "GRASS LOCATION PROJ_UNITS is:\n");
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             for (i_value = 0; i_value < loc_proj_units->nitems; i_value++)
                 sprintf(error_msg + strlen(error_msg), "%s: %s\n",
@@ -980,6 +1027,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1029,6 +1077,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             _("\nIn case of no significant differences"
               " in the coordinate reference system definitions,"
@@ -1054,6 +1104,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1132,6 +1183,11 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             _("\nIn case of no significant differences in the projection "
               "definitions,"
@@ -1153,6 +1209,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     strcat(error_msg,
            _("Consider generating a new location with 'location' parameter"
@@ -1196,6 +1253,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
     strcat(error_msg,
            _("Consider generating a new location with 'location' parameter"
@@ -1218,6 +1277,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1268,6 +1328,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
              " from input data set.\n"));
     G_fatal_error("%s", error_msg);
@@ -1294,6 +1356,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1360,6 +1423,10 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 =======
 >>>>>>> osgeo-main
+=======
+void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
+=======
+>>>>>>> osgeo-main
 void projection_check_wkt(struct Cell_head cellhd,
                           struct Cell_head loc_wind,
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
@@ -1383,6 +1450,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1463,6 +1531,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                           const char *projstr, int override, int verbose)
 {
@@ -1513,6 +1583,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1597,6 +1668,10 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     else if (loc_wind.proj != cellhd.proj ||
              (err = G_compare_projections(loc_proj_info, loc_proj_units,
@@ -1621,6 +1696,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1659,6 +1735,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             G_message(_("Coordinate reference system of input dataset and "
                         "current project appear to match"));
@@ -1681,6 +1759,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1709,6 +1788,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     else if (loc_wind.proj != cellhd.proj ||
              (err = G_compare_projections(loc_proj_info, loc_proj_units,
@@ -1726,6 +1807,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1795,6 +1877,10 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
         projection_mismatch_report(cellhd, loc_wind, loc_proj_info,
                                    loc_proj_units, proj_info, proj_units, err);
 >>>>>>> osgeo-main
+=======
+        projection_mismatch_report(cellhd, loc_wind, loc_proj_info,
+                                   loc_proj_units, proj_info, proj_units, err);
+>>>>>>> osgeo-main
 =======
         projection_mismatch_report(cellhd, loc_wind, loc_proj_info,
                                    loc_proj_units, proj_info, proj_units, err);
@@ -1819,6 +1905,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1847,6 +1934,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             G_message(_("Projection of input dataset and current location "
                         "appear to match"));
@@ -1865,6 +1954,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1906,6 +1996,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         }
     }
@@ -1932,6 +2024,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1977,6 +2070,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -1995,6 +2090,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2078,6 +2174,10 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /* Does the projection of the current location match the dataset? */
 int is_wkt_projection_same_as_loc(const char *wkt)
 {
@@ -2123,6 +2223,7 @@ int is_wkt_projection_same_as_loc(const char *wkt)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2202,6 +2303,11 @@ int is_wkt_projection_same_as_loc(const char *wkt)
     else if (G_compare_projections(loc_proj_info, loc_proj_units, proj_info,
                                    proj_units) != 1) {
 =======
+>>>>>>> osgeo-main
+=======
+    else if (G_compare_projections(loc_proj_info, loc_proj_units, proj_info,
+                                   proj_units) != 1) {
+=======
 >>>>>>> osgeo-main
     else if (G_compare_projections(loc_proj_info, loc_proj_units,
                                    proj_info, proj_units) != 1) {
@@ -2228,6 +2334,7 @@ int is_wkt_projection_same_as_loc(const char *wkt)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2312,6 +2419,8 @@ int is_wkt_projection_same_as_loc(const char *wkt)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         return FALSE;
     }
@@ -2361,6 +2470,7 @@ void wkt_projection_mismatch_report(const char *wkt)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2445,6 +2555,10 @@ void wkt_projection_mismatch_report(const char *wkt)
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     int err = G_compare_projections(loc_proj_info, loc_proj_units, proj_info,
                                     proj_units);
@@ -2467,6 +2581,7 @@ void wkt_projection_mismatch_report(const char *wkt)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2523,6 +2638,9 @@ void wkt_projection_mismatch_report(const char *wkt)
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     int err = G_compare_projections(loc_proj_info, loc_proj_units,
                                     proj_info, proj_units);
@@ -2544,6 +2662,7 @@ void wkt_projection_mismatch_report(const char *wkt)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -2572,6 +2691,8 @@ void wkt_projection_mismatch_report(const char *wkt)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     int err = G_compare_projections(loc_proj_info, loc_proj_units, proj_info,
                                     proj_units);
@@ -2593,6 +2714,7 @@ void wkt_projection_mismatch_report(const char *wkt)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -2668,6 +2790,10 @@ void wkt_projection_mismatch_report(const char *wkt)
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 }
 
 /* caller should free the returned string */
diff --git a/raster/r.in.pdal/projection.h b/raster/r.in.pdal/projection.h
index 1771212e615..983cb90592b 100644
--- a/raster/r.in.pdal/projection.h
+++ b/raster/r.in.pdal/projection.h
@@ -19,6 +19,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -64,6 +65,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -82,6 +85,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -165,6 +169,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 /****************************************************************************
  *
  * MODULE:       r.in.pdal
@@ -200,6 +208,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -245,6 +254,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -263,6 +274,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -346,6 +358,10 @@
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 #ifndef PROJECTION_CHECKS_H
 #define PROJECTION_CHECKS_H
 
@@ -377,6 +393,7 @@ void projection_mismatch_report(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -426,6 +443,8 @@ void projection_mismatch_report(struct Cell_head cellhd,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
                           const char *projstr, int override, int return_value,
                           int verbose);
@@ -447,6 +466,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -486,6 +506,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 void projection_check_wkt(struct Cell_head cellhd,
                           struct Cell_head loc_wind,
                           const char *projstr, int override,
@@ -505,6 +527,7 @@ void projection_check_wkt(struct Cell_head cellhd,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -534,6 +557,8 @@ void projection_check_wkt(struct Cell_head cellhd,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
                           const char *projstr, int override, int return_value,
                           int verbose);
@@ -552,6 +577,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -581,6 +607,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
                           const char *projstr, int override, int return_value,
                           int verbose);
@@ -599,6 +627,7 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -647,6 +676,8 @@ void projection_check_wkt(struct Cell_head cellhd, struct Cell_head loc_wind,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 int is_wkt_projection_same_as_loc(const char *wkt);
 void wkt_projection_mismatch_report(const char *wkt);
diff --git a/raster/r.in.pdal/r.in.pdal.html b/raster/r.in.pdal/r.in.pdal.html
index ae94d34741a..eddc4cd6342 100644
--- a/raster/r.in.pdal/r.in.pdal.html
+++ b/raster/r.in.pdal/r.in.pdal.html
@@ -253,6 +253,7 @@ 
    Filtering and selection
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 to create custom raster-based filters, for examplee, use
 =======
 <<<<<<< HEAD
@@ -295,6 +296,8 @@ 
    Filtering and selection
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 to create custom raster-based filters, for example, use
 =======
 to create custom raster-based filters, for examplee, use
@@ -313,6 +316,7 @@ 
    Filtering and selection
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 to create custom raster-based filters, for examplee, use
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -396,6 +400,11 @@ 
    Filtering and selection
    
 to create custom raster-based filters, for examplee, use
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
+=======
+=======
+to create custom raster-based filters, for examplee, use
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
 r.mapcalc to create
 a mean-(2*stddev) map. (In this example the user may want to
 include a lower bound filter in r.mapcalc to remove highly
@@ -430,6 +439,7 @@ 
    Filtering and selection
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -479,6 +489,8 @@ 
    Filtering and selection
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 raster value source. The dimension option allows using different
 point attributes as an output instead of Z value. In case if other than Z
 value is chosen, output map type will be set to CELL. Explanation
@@ -500,6 +512,7 @@ 
    Filtering and selection
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -539,6 +552,8 @@ 
    Filtering and selection
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 raster value source. The dimension option allows to use different
 point attributes as an output instead of Z value. In case if other than Z
 value is choosen, output map type will be set to CELL. Explanation
@@ -557,6 +572,7 @@ 
    Filtering and selection
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -586,6 +602,8 @@ 
    Filtering and selection
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 raster value source. The dimension option allows using different
 point attributes as an output instead of Z value. In case if other than Z
 value is chosen, output map type will be set to CELL. Explanation
@@ -604,6 +622,7 @@ 
    Filtering and selection
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -633,6 +652,8 @@ 
    Filtering and selection
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 raster value source. The dimension option allows using different
 point attributes as an output instead of Z value. In case if other than Z
 value is chosen, output map type will be set to CELL. Explanation
@@ -651,6 +672,7 @@ 
    Filtering and selection
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -699,6 +721,8 @@ 
    Filtering and selection
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 of various attributes can be found in LAS Specification chapter "Point
 Data Records". Be ware - not all attributes might be present and also
 their value ranges and meaning might vary between LAS file producers.
@@ -809,6 +833,7 @@ 
    Transformation
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -875,6 +900,10 @@ 
    Transformation
    
 iscale and dscale parameters - values are multiplied
 =======
 >>>>>>> osgeo-main
+=======
+iscale and dscale parameters - values are multiplied
+=======
+>>>>>>> osgeo-main
 iscale and dscale parametres – values are multiplied
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -897,6 +926,7 @@ 
    Transformation
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -975,6 +1005,8 @@ 
    Transformation
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 before range filters irange or drnage are applied (if present).
 
    
 Output value scaling can be performed independently of filtering by providing
@@ -1004,6 +1036,7 @@ 
    Transformation
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1079,6 +1112,10 @@ 
    Transformation
    
 dscale are set for Z output dimension, filtering by zrange
 =======
 >>>>>>> osgeo-main
+=======
+dscale are set for Z output dimension, filtering by zrange
+=======
+>>>>>>> osgeo-main
 dscale are set for Z output dimension, filtering by zrange 
 >>>>>>> 9d4a079d2e (libcairodriver: enable Cairo with and without Fontconfig (#1697))
 =======
@@ -1101,6 +1138,7 @@ 
    Transformation
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1130,6 +1168,8 @@ 
    Transformation
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 dscale are set for Z output dimension, filtering by zrange 
 =======
 dscale are set for Z output dimension, filtering by zrange
@@ -1149,6 +1189,7 @@ 
    Transformation
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1233,6 +1274,8 @@ 
    Transformation
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 will be done with unscaled values but output will be scaled by dscale.
 dscale takes precedence over zscale and iscale
 if more than one parameter is provided.
@@ -1261,6 +1304,7 @@ 
    Format and projection support
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 compile libLAS with GDAL which is used to test if the LAS projection
 matches that of the GRASS location.
 =======
@@ -1304,6 +1348,8 @@ 
    Format and projection support
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 compile libLAS with GDAL which is used to test if the LAS coordinate reference
 system matches that of the GRASS project (previously called location).
 =======
@@ -1324,6 +1370,7 @@ 
    Format and projection support
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -1353,6 +1400,8 @@ 
    Format and projection support
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 compile libLAS with GDAL which is used to test if the LAS projection
 matches that of the GRASS location.
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1370,6 +1419,7 @@ 
    Format and projection support
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1412,6 +1462,8 @@ 
    Format and projection support
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
diff --git a/vector/v.split/main.c b/vector/v.split/main.c
index c4f31b792bf..321e4233e2e 100644
--- a/vector/v.split/main.c
+++ b/vector/v.split/main.c
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -142,6 +143,10 @@ int main(int argc, char *argv[])
 =======
     double (*line_length)(const struct line_pnts *);
 =======
+>>>>>>> osgeo-main
+=======
+    double (*line_length)(const struct line_pnts *);
+=======
 >>>>>>> osgeo-main
     double (*line_length)();
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -165,6 +170,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -193,6 +199,8 @@ int main(int argc, char *argv[])
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     double (*line_length)();
 =======
@@ -213,6 +221,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -296,6 +305,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int geodesic = 0;
 
diff --git a/vector/v.surf.bspline/resamp.c b/vector/v.surf.bspline/resamp.c
index 5417374b743..1a40b713ced 100644
--- a/vector/v.surf.bspline/resamp.c
+++ b/vector/v.surf.bspline/resamp.c
@@ -40,6 +40,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 struct Point *P_Read_Raster_Region_masked(
     SEGMENT *mask_seg, struct Cell_head *Original, struct bound_box output_box,
     struct bound_box General, int *num_points, int dim_vect, double mean)
@@ -84,6 +85,8 @@ struct Point *P_Read_Raster_Region_masked(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 struct Point *P_Read_Raster_Region_masked(SEGMENT *mask_seg,
                                           struct Cell_head *Original,
                                           struct bound_box output_box UNUSED,
@@ -109,6 +112,7 @@ struct Point *P_Read_Raster_Region_masked(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -138,6 +142,8 @@ struct Point *P_Read_Raster_Region_masked(
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 struct Point *P_Read_Raster_Region_masked(
     SEGMENT *mask_seg, struct Cell_head *Original, struct bound_box output_box,
     struct bound_box General, int *num_points, int dim_vect, double mean)
@@ -156,6 +162,7 @@ struct Point *P_Read_Raster_Region_masked(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -198,6 +205,8 @@ struct Point *P_Read_Raster_Region_masked(
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 {
     int col, row, startcol, endcol, startrow, endrow, nrows, ncols;
     int pippo, npoints;
@@ -313,6 +322,7 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         /* X,Y are cell center cordinates, MUST be inside General box */
 =======
@@ -355,6 +365,8 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         /* X,Y are cell center coordinates, MUST be inside General box */
 =======
@@ -374,6 +386,7 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         /* X,Y are cell center cordinates, MUST be inside General box */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -456,6 +469,11 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 =======
         /* X,Y are cell center cordinates, MUST be inside General box */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        /* X,Y are cell center cordinates, MUST be inside General box */
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         row = (int)(floor(Rast_northing_to_row(Y, Original)) + 0.1);
         col = (int)(floor((X - Original->west) / Original->ew_res) + 0.1);
@@ -493,6 +511,7 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -544,6 +563,8 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         points_in_box++;
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -565,6 +586,7 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -588,6 +610,8 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
         points_in_box++;
@@ -608,6 +632,7 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -676,6 +701,8 @@ int P_Sparse_Raster_Points(SEGMENT *out_seg, struct Cell_head *Elaboration,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         G_debug(3, "P_Sparse_Raster_Points: interpolate point %d...", i);
diff --git a/vector/v.surf.rst/main.c b/vector/v.surf.rst/main.c
index b5ed5578fe2..2a00c62d5d1 100644
--- a/vector/v.surf.rst/main.c
+++ b/vector/v.surf.rst/main.c
@@ -933,6 +933,7 @@ static FILE *create_temp_file(const char *name, char **tmpname)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1021,6 +1022,11 @@ static FILE *create_temp_file(const char *name, char **tmpname)
         if (fwrite(zero_array_cell, sizeof(FCELL), n_cols, fp) !=
             (size_t)n_cols) {
 =======
+>>>>>>> osgeo-main
+=======
+        if (fwrite(zero_array_cell, sizeof(FCELL), n_cols, fp) !=
+            (size_t)n_cols) {
+=======
 >>>>>>> osgeo-main
         if (fwrite(zero_array_cell, sizeof(FCELL), n_cols, fp) != n_cols) {
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -1045,6 +1051,7 @@ static FILE *create_temp_file(const char *name, char **tmpname)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1073,6 +1080,8 @@ static FILE *create_temp_file(const char *name, char **tmpname)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         if (fwrite(zero_array_cell, sizeof(FCELL), n_cols, fp) != n_cols) {
 =======
@@ -1094,6 +1103,7 @@ static FILE *create_temp_file(const char *name, char **tmpname)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1180,6 +1190,8 @@ static FILE *create_temp_file(const char *name, char **tmpname)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             clean();
             G_fatal_error(_("Error writing temporary file <%s>"), *tmpname);
diff --git a/vector/v.to.3d/testsuite/test_vto3d.py b/vector/v.to.3d/testsuite/test_vto3d.py
index bfa982ddd87..2297ec3a174 100644
--- a/vector/v.to.3d/testsuite/test_vto3d.py
+++ b/vector/v.to.3d/testsuite/test_vto3d.py
@@ -15,10 +15,13 @@ def setUpClass(cls):
     def tearDownClass(cls):
         cls.del_temp_region()
 
-    def tearDown(cls):
+    def tearDown(self):
         """Remove contours map after each test method"""
-        cls.runModule(
-            "g.remove", flags="f", type="vector", name=[cls.contours2d, cls.contours3d]
+        self.runModule(
+            "g.remove",
+            flags="f",
+            type="vector",
+            name=[self.contours2d, self.contours3d],
         )
 
     def test_contours(self):
diff --git a/vector/v.to.db/global.h b/vector/v.to.db/global.h
index 9c488b0128f..82adc789ce7 100644
--- a/vector/v.to.db/global.h
+++ b/vector/v.to.db/global.h
@@ -42,6 +42,7 @@ struct options {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     int print; /* print only */
     int sql;   /* print only sql statements */
@@ -86,6 +87,8 @@ struct options {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int print;        /* print only */
     int print_header; /* print header for print and total */
@@ -110,6 +113,7 @@ struct options {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -138,6 +142,8 @@ struct options {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     int print; /* print only */
     int sql;   /* print only sql statements */
@@ -157,6 +163,7 @@ struct options {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -198,6 +205,8 @@ struct options {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int units;
     int qfield; /* query field */
diff --git a/vector/v.to.db/parse.c b/vector/v.to.db/parse.c
index d99f9cae47d..8ad45498e5f 100644
--- a/vector/v.to.db/parse.c
+++ b/vector/v.to.db/parse.c
@@ -40,6 +40,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         struct Flag *p, *s, *t;
 =======
@@ -82,6 +83,8 @@ int parse_command_line(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         struct Flag *h, *p, *s, *t;
 =======
@@ -101,6 +104,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         struct Flag *p, *s, *t;
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -183,6 +187,11 @@ int parse_command_line(int argc, char *argv[])
 =======
         struct Flag *p, *s, *t;
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        struct Flag *p, *s, *t;
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     } flags;
     char *desc;
@@ -246,6 +255,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -286,6 +296,8 @@ int parse_command_line(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         _("compactness of an area, calculated as compactness = perimeter / (2 "
           "* sqrt(PI * area))"),
@@ -306,6 +318,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -374,6 +387,10 @@ int parse_command_line(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         _("compactness of an area, calculated as \n"
           "              compactness = perimeter / (2 * sqrt(PI * area))"),
@@ -396,6 +413,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -486,6 +504,11 @@ int parse_command_line(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         _("perimeter length of an area"), _("line length"),
         _("number of features for each category"),
@@ -510,6 +533,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         _("result of a database query for all records of the geometry"
 =======
@@ -552,6 +576,8 @@ int parse_command_line(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         _("result of a database query for all records of the geometry "
 =======
@@ -571,6 +597,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         _("result of a database query for all records of the geometry"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -653,6 +680,11 @@ int parse_command_line(int argc, char *argv[])
 =======
         _("result of a database query for all records of the geometry"
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        _("result of a database query for all records of the geometry"
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
           "(or geometries) from table specified by 'query_layer' option"),
         _("slope steepness of vector line or boundary"),
@@ -711,6 +743,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -751,6 +784,8 @@ int parse_command_line(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     flags.h = G_define_flag();
     flags.h->key = 'h';
@@ -773,6 +808,7 @@ int parse_command_line(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
@@ -841,6 +877,10 @@ int parse_command_line(int argc, char *argv[])
 =======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     flags.s = G_define_flag();
     flags.s->key = 's';
diff --git a/vector/v.to.db/report.c b/vector/v.to.db/report.c
index 8606dc7fc24..66a7c515385 100644
--- a/vector/v.to.db/report.c
+++ b/vector/v.to.db/report.c
@@ -33,6 +33,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -75,6 +76,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -94,6 +97,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -176,6 +180,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat\n");
         for (i = 0; i < vstat.rcat; i++)
@@ -237,6 +246,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -279,6 +289,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -298,6 +310,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -380,6 +393,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%scompact\n", options.fs);
         for (i = 0; i < vstat.rcat; i++) {
@@ -416,6 +434,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -458,6 +477,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -477,6 +498,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -559,6 +581,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%sfd\n", options.fs);
         for (i = 0; i < vstat.rcat; i++) {
@@ -587,6 +614,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -629,6 +657,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -648,6 +678,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -730,6 +761,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%sperimeter\n", options.fs);
         for (i = 0; i < vstat.rcat; i++)
@@ -754,6 +790,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -796,6 +833,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -815,6 +854,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -897,6 +937,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%sN%sS%sE%sW\n", options.fs, options.fs,
                     options.fs, options.fs);
@@ -941,6 +986,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -983,6 +1029,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -1002,6 +1050,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1084,6 +1133,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%sslope\n", options.fs);
         for (i = 0; i < vstat.rcat; i++)
@@ -1108,6 +1162,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -1150,6 +1205,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -1169,6 +1226,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1251,6 +1309,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%ssinuous\n", options.fs);
         for (i = 0; i < vstat.rcat; i++)
@@ -1276,6 +1339,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -1318,6 +1382,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -1337,6 +1403,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1419,6 +1486,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%sx%sy%sz\n", options.fs, options.fs,
                     options.fs);
@@ -1447,6 +1519,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -1489,6 +1562,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -1508,6 +1583,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1590,6 +1666,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%sleft%sright\n", options.fs, options.fs);
         for (i = 0; i < vstat.rcat; i++) {
@@ -1644,6 +1725,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -1686,6 +1768,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -1705,6 +1789,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1787,6 +1872,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%squery\n", options.fs);
         for (i = 0; i < vstat.rcat; i++) {
@@ -1828,6 +1918,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (G_verbose() > G_verbose_min())
 =======
@@ -1870,6 +1961,8 @@ int report(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         if (print_header)
 =======
@@ -1889,6 +1982,7 @@ int report(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -1971,6 +2065,11 @@ int report(void)
 =======
         if (G_verbose() > G_verbose_min())
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+        if (G_verbose() > G_verbose_min())
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
             fprintf(stdout, "cat%sazimuth\n", options.fs);
         for (i = 0; i < vstat.rcat; i++)
diff --git a/vector/v.to.rast/main.c b/vector/v.to.rast/main.c
index 0339c1c352a..acdbfce2d95 100644
--- a/vector/v.to.rast/main.c
+++ b/vector/v.to.rast/main.c
@@ -90,6 +90,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     G_asprintf(&desc, "attr;%s;cat;%s;val;%s;z;%s;dir;%s",
 =======
@@ -132,6 +133,8 @@ int main(int argc, char *argv[])
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     G_asprintf(&desc, "attr;%s;cat;%s;value;%s;z;%s;dir;%s",
 =======
@@ -151,6 +154,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     G_asprintf(&desc, "attr;%s;cat;%s;val;%s;z;%s;dir;%s",
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -233,6 +237,11 @@ int main(int argc, char *argv[])
 =======
     G_asprintf(&desc, "attr;%s;cat;%s;val;%s;z;%s;dir;%s",
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    G_asprintf(&desc, "attr;%s;cat;%s;val;%s;z;%s;dir;%s",
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
                _("read values from attribute table"), _("use category values"),
                _("use value specified by value option"),
@@ -284,6 +293,7 @@ int main(int argc, char *argv[])
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -374,6 +384,11 @@ int main(int argc, char *argv[])
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 
     memory = G_define_standard_option(G_OPT_MEMORYMB);
diff --git a/vector/v.to.rast/support.c b/vector/v.to.rast/support.c
index f95ee7e0660..85b4c6b86ed 100644
--- a/vector/v.to.rast/support.c
+++ b/vector/v.to.rast/support.c
@@ -174,6 +174,7 @@ int update_dbcolors(const char *rast_name, const char *vector_map, int field,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
          * later all togheter */
 =======
@@ -216,6 +217,8 @@ int update_dbcolors(const char *rast_name, const char *vector_map, int field,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
          * later all together */
 =======
@@ -235,6 +238,7 @@ int update_dbcolors(const char *rast_name, const char *vector_map, int field,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
          * later all togheter */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -317,6 +321,11 @@ int update_dbcolors(const char *rast_name, const char *vector_map, int field,
 =======
          * later all togheter */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+         * later all togheter */
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
         colors_n_values++;
         my_color_rules[i].red = red;
diff --git a/vector/v.to.rast/vect2rast.c b/vector/v.to.rast/vect2rast.c
index 39d1ee3fa5f..4b3e1cbf658 100644
--- a/vector/v.to.rast/vect2rast.c
+++ b/vector/v.to.rast/vect2rast.c
@@ -251,6 +251,7 @@ int vect_to_rast(const char *vector_map, const char *raster_map,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -285,6 +286,8 @@ int vect_to_rast(const char *vector_map, const char *raster_map,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     /* maximum possible number of lines: number of GV_LINE + GV_POINT
 =======
@@ -304,6 +307,7 @@ int vect_to_rast(const char *vector_map, const char *raster_map,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -351,6 +355,8 @@ int vect_to_rast(const char *vector_map, const char *raster_map,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     /* maximum possible numer of lines: number of GV_LINE + GV_POINT
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
diff --git a/vector/v.transform/trans.h b/vector/v.transform/trans.h
index 409f4d0c85f..d4421e586ef 100644
--- a/vector/v.transform/trans.h
+++ b/vector/v.transform/trans.h
@@ -46,6 +46,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
  * Those cooresponding points in the other coordinate system
 =======
@@ -88,6 +89,8 @@
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
  * Those corresponding points in the other coordinate system
 =======
@@ -107,6 +110,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
  * Those cooresponding points in the other coordinate system
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -189,6 +193,11 @@
 =======
  * Those cooresponding points in the other coordinate system
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+ * Those cooresponding points in the other coordinate system
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
  * are placed in bx[], by[].
  *
diff --git a/vector/v.univar/main.c b/vector/v.univar/main.c
index e0051c08394..1395bea651d 100644
--- a/vector/v.univar/main.c
+++ b/vector/v.univar/main.c
@@ -98,6 +98,7 @@ double sum_abs = 0.0;
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -187,6 +188,11 @@ double min = NAN;
 double max = NAN;
 =======
 >>>>>>> osgeo-main
+=======
+double min = NAN;
+double max = NAN;
+=======
+>>>>>>> osgeo-main
 double min = 0.0 / 0.0; /* init as nan */
 double max = 0.0 / 0.0;
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -212,6 +218,7 @@ double max = NAN;
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -241,6 +248,8 @@ double max = NAN;
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 double min = 0.0 / 0.0; /* init as nan */
 double max = 0.0 / 0.0;
 =======
@@ -262,6 +271,7 @@ double max = NAN;
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -353,6 +363,8 @@ double max = 0.0 / 0.0;
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 double mean, mean_abs, pop_variance, sample_variance, pop_stdev, sample_stdev,
     pop_coeff_variation, kurtosis, skewness;
 double total_size = 0.0; /* total size: length/area */
diff --git a/vector/v.univar/v.univar.html b/vector/v.univar/v.univar.html
index 4f94a7fdc87..e73d5c86085 100644
--- a/vector/v.univar/v.univar.html
+++ b/vector/v.univar/v.univar.html
@@ -194,6 +194,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -266,6 +267,10 @@ 
    AUTHORS
    
 Martin Landa
 =======
 >>>>>>> osgeo-main
+=======
+Martin Landa
+=======
+>>>>>>> osgeo-main
 Martin Landa 
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -288,6 +293,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -317,6 +323,8 @@ 
    AUTHORS
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 Martin Landa 
 =======
 Martin Landa
@@ -336,6 +344,7 @@ 
    AUTHORS
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -414,3 +423,5 @@ 
    AUTHORS
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
diff --git a/vector/v.vect.stats/testsuite/test_vect_stats.py b/vector/v.vect.stats/testsuite/test_vect_stats.py
index fe982ceff33..e8a1c30c966 100644
--- a/vector/v.vect.stats/testsuite/test_vect_stats.py
+++ b/vector/v.vect.stats/testsuite/test_vect_stats.py
@@ -5,8 +5,8 @@
 Author:     Sunveer Singh, Google Code-in 2017
 Copyright:  (C) 2017 by Sunveer Singh and the GRASS Development Team
 Licence:    This program is free software under the GNU General Public
-	            License (>=v2). Read the file COPYING that comes with GRASS
-	            for details.
+            License (>=v2). Read the file COPYING that comes with GRASS
+            for details.
 """
 
 from grass.gunittest.case import TestCase
diff --git a/vector/v.vol.rst/oct.c b/vector/v.vol.rst/oct.c
index 5025e342dc0..d8d26fc672e 100644
--- a/vector/v.vol.rst/oct.c
+++ b/vector/v.vol.rst/oct.c
@@ -58,6 +58,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -150,6 +151,10 @@
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
 struct octfunc *
 OT_functions_new(int (*compare)(struct quadruple *, struct octdata *),
                  struct octdata **(*divide_data)(struct octdata *),
@@ -175,6 +180,7 @@ OT_functions_new(int (*compare)(struct quadruple *, struct octdata *),
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> fce97d24c8 (Fix missing function prototypes (#2727))
 =======
@@ -232,6 +238,9 @@ OT_functions_new(int (*compare)(struct quadruple *, struct octdata *),
 =======
 =======
 >>>>>>> osgeo-main
+=======
+=======
+>>>>>>> osgeo-main
 struct octfunc *OT_functions_new(int (*compare)(), VOID_T **(*divide_data)(),
                                  int (*add_data)(), int (*intersect)(),
                                  int (*division_check)(), int (*get_points)())
@@ -250,6 +259,7 @@ struct octfunc *OT_functions_new(int (*compare)(), VOID_T **(*divide_data)(),
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -279,6 +289,8 @@ struct octfunc *OT_functions_new(int (*compare)(), VOID_T **(*divide_data)(),
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 struct octfunc *OT_functions_new(int (*compare)(), VOID_T **(*divide_data)(),
                                  int (*add_data)(), int (*intersect)(),
                                  int (*division_check)(), int (*get_points)())
@@ -298,6 +310,7 @@ struct octfunc *OT_functions_new(int (*compare)(), VOID_T **(*divide_data)(),
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -321,6 +334,8 @@ struct octfunc *OT_functions_new(int (*compare)(), VOID_T **(*divide_data)(),
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 struct octfunc *OT_functions_new(int (*compare)(), VOID_T **(*divide_data)(),
@@ -352,6 +367,7 @@ OT_functions_new(int (*compare)(struct quadruple *, struct octdata *),
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -412,6 +428,8 @@ OT_functions_new(int (*compare)(struct quadruple *, struct octdata *),
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 /* Initializes FUNCTIONS structure with given arguments */
 {
     struct octfunc *functions;
@@ -452,6 +470,7 @@ OT_functions_new(int (*compare)(struct quadruple *, struct octdata *),
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -527,6 +546,10 @@ struct octtree *OT_tree_new(struct octdata *data, struct octtree **leafs,
 struct octtree *OT_tree_new(struct octdata *data, struct octtree **leafs,
 =======
 >>>>>>> osgeo-main
+=======
+struct octtree *OT_tree_new(struct octdata *data, struct octtree **leafs,
+=======
+>>>>>>> osgeo-main
 struct octtree *OT_tree_new(VOID_T *data, struct octtree **leafs,
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -549,6 +572,7 @@ struct octtree *OT_tree_new(struct octdata *data, struct octtree **leafs,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -578,6 +602,8 @@ struct octtree *OT_tree_new(struct octdata *data, struct octtree **leafs,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 struct octtree *OT_tree_new(VOID_T *data, struct octtree **leafs,
 =======
 struct octtree *OT_tree_new(struct octdata *data, struct octtree **leafs,
@@ -597,6 +623,7 @@ struct octtree *OT_tree_new(struct octdata *data, struct octtree **leafs,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -680,6 +707,8 @@ struct octtree *OT_tree_new(VOID_T *data, struct octtree **leafs,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                             struct octtree *parent, struct octfunc *functions,
                             int octant)
diff --git a/vector/v.vol.rst/oct.h b/vector/v.vol.rst/oct.h
index 8cad92bf119..dd98d981802 100644
--- a/vector/v.vol.rst/oct.h
+++ b/vector/v.vol.rst/oct.h
@@ -28,6 +28,7 @@ struct octfunc {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -119,6 +120,10 @@ struct octfunc {
 =======
 =======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 >>>>>>> osgeo-main
     int (*compare)(struct quadruple *, struct octdata *);
     struct octdata **(*divide_data)(struct octdata *);
@@ -143,6 +148,7 @@ struct octfunc {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -181,6 +187,8 @@ struct octfunc {
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 };
 
 struct octtree {
@@ -200,6 +208,7 @@ struct octtree {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -261,6 +270,11 @@ struct octtree {
 =======
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
+=======
+=======
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
     int (*compare)();
     VOID_T **(*divide_data)();
@@ -280,6 +294,7 @@ struct octtree {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -317,6 +332,9 @@ struct octtree {
 >>>>>>> osgeo-main
 =======
 =======
+>>>>>>> osgeo-main
+=======
+=======
 >>>>>>> osgeo-main
     int (*compare)();
     VOID_T **(*divide_data)();
@@ -339,6 +357,9 @@ struct octtree {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
 =======
@@ -396,6 +417,7 @@ struct octtree {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
@@ -563,6 +585,8 @@ struct octtree {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     struct octtree **leafs;
     struct octtree *parent;
diff --git a/vector/v.vol.rst/user1.c b/vector/v.vol.rst/user1.c
index 2417f682429..372120c8e31 100644
--- a/vector/v.vol.rst/user1.c
+++ b/vector/v.vol.rst/user1.c
@@ -437,6 +437,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -511,6 +512,10 @@ int OUTGR(void)
 =======
             if (read_val != (size_t)nsizc) {
 =======
+>>>>>>> osgeo-main
+=======
+            if (read_val != (size_t)nsizc) {
+=======
 >>>>>>> osgeo-main
             if (read_val != nsizc) {
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -534,6 +539,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -562,6 +568,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
             if (read_val != nsizc) {
 =======
@@ -582,6 +590,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -665,6 +674,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
                 clean();
                 G_fatal_error(_("Unable to read data from temp file"));
@@ -720,6 +731,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -776,6 +788,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val =
             fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl, Tmp_fd_z);
@@ -799,6 +813,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -829,6 +844,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_z);
         if (read_val < 0) {
@@ -851,6 +868,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_z);
         if (read_val < 0) {
@@ -889,6 +907,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_z);
         if (read_val < 0) {
@@ -912,6 +932,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -940,6 +961,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -958,6 +981,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1023,6 +1047,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
@@ -1100,6 +1126,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1156,6 +1183,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
                          Tmp_fd_dx);
@@ -1179,6 +1208,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1209,6 +1239,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dx);
         if (read_val < 0) {
@@ -1231,6 +1263,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dx);
         if (read_val < 0) {
@@ -1269,6 +1302,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dx);
         if (read_val < 0) {
@@ -1292,6 +1327,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1320,6 +1356,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -1338,6 +1376,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1403,6 +1442,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
@@ -1479,6 +1520,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1535,6 +1577,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
                          Tmp_fd_dy);
@@ -1558,6 +1602,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1588,6 +1633,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dy);
         if (read_val < 0) {
@@ -1610,6 +1657,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dy);
         if (read_val < 0) {
@@ -1648,6 +1696,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dy);
         if (read_val < 0) {
@@ -1671,6 +1721,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -1699,6 +1750,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -1717,6 +1770,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1782,6 +1836,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
@@ -1858,6 +1914,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -1914,6 +1971,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
                          Tmp_fd_dz);
@@ -1937,6 +1996,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -1967,6 +2027,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dz);
         if (read_val < 0) {
@@ -1989,6 +2051,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dz);
         if (read_val < 0) {
@@ -2027,6 +2090,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dz);
         if (read_val < 0) {
@@ -2050,6 +2115,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -2078,6 +2144,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -2096,6 +2164,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2161,6 +2230,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
@@ -2237,6 +2308,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2293,6 +2365,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
                          Tmp_fd_xx);
@@ -2316,6 +2390,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2346,6 +2421,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_xx);
         if (read_val < 0) {
@@ -2368,6 +2445,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_xx);
         if (read_val < 0) {
@@ -2406,6 +2484,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_xx);
         if (read_val < 0) {
@@ -2429,6 +2509,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -2457,6 +2538,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -2475,6 +2558,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2540,6 +2624,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
@@ -2616,6 +2702,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -2672,6 +2759,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
                          Tmp_fd_yy);
@@ -2695,6 +2784,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2725,6 +2815,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_yy);
         if (read_val < 0) {
@@ -2747,6 +2839,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_yy);
         if (read_val < 0) {
@@ -2785,6 +2878,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_yy);
         if (read_val < 0) {
@@ -2808,6 +2903,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -2836,6 +2932,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -2854,6 +2952,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -2919,6 +3018,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
@@ -2995,6 +3096,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -3051,6 +3153,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
                          Tmp_fd_xy);
@@ -3074,6 +3178,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3104,6 +3209,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_xy);
         if (read_val < 0) {
@@ -3126,6 +3233,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_xy);
         if (read_val < 0) {
@@ -3164,6 +3272,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_xy);
         if (read_val < 0) {
@@ -3187,6 +3297,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -3215,6 +3326,8 @@ int OUTGR(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
 >>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
@@ -3233,6 +3346,7 @@ int OUTGR(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -3298,6 +3412,8 @@ int OUTGR(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
diff --git a/vector/v.vol.rst/user3.c b/vector/v.vol.rst/user3.c
index efd30f69d7e..ac3f25610ec 100644
--- a/vector/v.vol.rst/user3.c
+++ b/vector/v.vol.rst/user3.c
@@ -260,6 +260,7 @@ int COGRR1(double x_or, double y_or, double z_or, int n_rows, int n_cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -306,6 +307,8 @@ int COGRR1(double x_or, double y_or, double z_or, int n_rows, int n_cols,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 =======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
     int POINT();
@@ -326,6 +329,7 @@ int COGRR1(double x_or, double y_or, double z_or, int n_rows, int n_cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -354,6 +358,8 @@ int COGRR1(double x_or, double y_or, double z_or, int n_rows, int n_cols,
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     int POINT();
 =======
@@ -373,6 +379,7 @@ int COGRR1(double x_or, double y_or, double z_or, int n_rows, int n_cols,
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -441,6 +448,8 @@ int COGRR1(double x_or, double y_or, double z_or, int n_rows, int n_cols,
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int ind, ind1;
     static int first_time_z = 1;
diff --git a/vector/v.vol.rst/v.vol.rst.html b/vector/v.vol.rst/v.vol.rst.html
index eb9af03c7f8..20f4fef4110 100644
--- a/vector/v.vol.rst/v.vol.rst.html
+++ b/vector/v.vol.rst/v.vol.rst.html
@@ -80,6 +80,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -152,6 +153,10 @@ 
    DESCRIPTION
    
 algorithm.
 =======
 >>>>>>> osgeo-main
+=======
+algorithm.
+=======
+>>>>>>> osgeo-main
 algorithm. 
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -174,6 +179,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -203,6 +209,8 @@ 
    DESCRIPTION
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 algorithm. 
 =======
 algorithm.
@@ -222,6 +230,7 @@ 
    DESCRIPTION
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -300,6 +309,8 @@ 
    DESCRIPTION
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
    SQL support
    
 
@@ -419,6 +430,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -491,6 +503,10 @@ 
    NOTES
    
 3D region for interpolation.
 =======
 >>>>>>> osgeo-main
+=======
+3D region for interpolation.
+=======
+>>>>>>> osgeo-main
 3D region for interpolation. 
 <<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -513,6 +529,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -542,6 +559,8 @@ 
    NOTES
    
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 3D region for interpolation. 
 =======
 3D region for interpolation.
@@ -561,6 +580,7 @@ 
    NOTES
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -639,6 +659,8 @@ 
    NOTES
    
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 
 
    EXAMPLES
    
 
diff --git a/vector/v.voronoi/skeleton.c b/vector/v.voronoi/skeleton.c
index 4498b71637e..24342dd65a4 100644
--- a/vector/v.voronoi/skeleton.c
+++ b/vector/v.voronoi/skeleton.c
@@ -552,6 +552,7 @@ int tie_up(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -626,6 +627,10 @@ int tie_up(void)
 =======
         distmin = INFINITY;
 =======
+>>>>>>> osgeo-main
+=======
+        distmin = INFINITY;
+=======
 >>>>>>> osgeo-main
         distmin = 1. / 0.; /* +inf */
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -649,6 +654,7 @@ int tie_up(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -677,6 +683,8 @@ int tie_up(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         distmin = 1. / 0.; /* +inf */
 =======
@@ -697,6 +705,7 @@ int tie_up(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -780,6 +789,8 @@ int tie_up(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         xmin = x;
         ymin = y;
diff --git a/vector/v.voronoi/sw_main.c b/vector/v.voronoi/sw_main.c
index a8e1c28907e..a17ebb04ee1 100644
--- a/vector/v.voronoi/sw_main.c
+++ b/vector/v.voronoi/sw_main.c
@@ -92,6 +92,7 @@ struct Site *nextone(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
@@ -183,6 +184,11 @@ struct Site *nextone(void)
 =======
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
+=======
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 void removeDuplicates(void)
 {
     int i, j;
@@ -514,6 +520,7 @@ int readbounds(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -565,6 +572,8 @@ int readbounds(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         nconnected = 0;
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -586,6 +595,7 @@ int readbounds(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -609,6 +619,8 @@ int readbounds(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
         nconnected = 0;
@@ -629,6 +641,7 @@ int readbounds(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -697,6 +710,8 @@ int readbounds(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         Vect_reset_list(linelist);
         Vect_reset_list(arealist);
@@ -736,6 +751,7 @@ int readbounds(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -787,6 +803,8 @@ int readbounds(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
                 nconnected++;
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -808,6 +826,7 @@ int readbounds(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> osgeo-main
@@ -831,6 +850,8 @@ int readbounds(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> 498a331298 (Fix missing function prototypes (#2727))
 =======
                 nconnected++;
@@ -851,6 +872,7 @@ int readbounds(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -919,6 +941,8 @@ int readbounds(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
             }
         }
diff --git a/vector/v.what.rast/local_proto.h b/vector/v.what.rast/local_proto.h
index c97fb977593..ea849c9c4ed 100644
--- a/vector/v.what.rast/local_proto.h
+++ b/vector/v.what.rast/local_proto.h
@@ -18,6 +18,7 @@ struct order {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     int count; /* nuber of points with category 'cat' */
 =======
@@ -60,6 +61,8 @@ struct order {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int count; /* number of points with category 'cat' */
 =======
@@ -79,6 +82,7 @@ struct order {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     int count; /* nuber of points with category 'cat' */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -161,6 +165,11 @@ struct order {
 =======
     int count; /* nuber of points with category 'cat' */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    int count; /* nuber of points with category 'cat' */
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     int row;
     int col;
diff --git a/vector/v.what.rast3/local_proto.h b/vector/v.what.rast3/local_proto.h
index ae60f420bd5..d5daf3ee925 100644
--- a/vector/v.what.rast3/local_proto.h
+++ b/vector/v.what.rast3/local_proto.h
@@ -18,6 +18,7 @@ struct order {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     int count; /* nuber of points with category 'cat' */
 =======
@@ -60,6 +61,8 @@ struct order {
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
     int count; /* number of points with category 'cat' */
 =======
@@ -79,6 +82,7 @@ struct order {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     int count; /* nuber of points with category 'cat' */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -161,6 +165,11 @@ struct order {
 =======
     int count; /* nuber of points with category 'cat' */
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+=======
+    int count; /* nuber of points with category 'cat' */
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
     double x;
     double y;
diff --git a/vector/vectorintro.html b/vector/vectorintro.html
index fbae9dcbd3a..f4f72392546 100644
--- a/vector/vectorintro.html
+++ b/vector/vectorintro.html
@@ -36,6 +36,7 @@ 
    Attribute management
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -111,6 +112,10 @@ 
    Attribute management
    
 The default database driver used by GRASS GIS 8 is SQLite. GRASS GIS
 =======
 >>>>>>> osgeo-main
+=======
+The default database driver used by GRASS GIS 8 is SQLite. GRASS GIS
+=======
+>>>>>>> osgeo-main
 The default database driver used by GRASS GIS 8 is SQLite. GRASS GIS 
 >>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -133,6 +138,7 @@ 
    Attribute management
    
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 The default database driver used by GRASS GIS 8 is SQLite. GRASS GIS
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -258,6 +264,11 @@ 
    Attribute management
    
 The default database driver used by GRASS GIS 8 is SQLite. GRASS GIS
 >>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
 >>>>>>> osgeo-main
+=======
+=======
+The default database driver used by GRASS GIS 8 is SQLite. GRASS GIS
+>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
+>>>>>>> osgeo-main
 handles multiattribute vector data by default. The db.* set of
 commands  provides basic SQL support for attribute management, while the
 v.db.* set of commands operates on vector maps.
diff --git a/visualization/ximgview/main.c b/visualization/ximgview/main.c
index a37bb350b72..f3e116ad94f 100644
--- a/visualization/ximgview/main.c
+++ b/visualization/ximgview/main.c
@@ -169,6 +169,7 @@ static void main_loop(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -243,6 +244,10 @@ static void main_loop(void)
 =======
         unsigned long delay = 0;
 =======
+>>>>>>> osgeo-main
+=======
+        unsigned long delay = 0;
+=======
 >>>>>>> osgeo-main
         unsigned long delay;
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -266,6 +271,7 @@ static void main_loop(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -294,6 +300,8 @@ static void main_loop(void)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
         unsigned long delay;
 =======
@@ -314,6 +322,7 @@ static void main_loop(void)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -397,6 +406,8 @@ static void main_loop(void)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
 
         while (XPending(dpy) > 0) {
@@ -502,6 +513,7 @@ static int read_bmp_header(const unsigned char *p)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> main
 =======
@@ -576,6 +588,10 @@ static int read_bmp_header(const unsigned char *p)
 =======
     if (get_4(&p) != (unsigned int)i_width * i_height * 4)
 =======
+>>>>>>> osgeo-main
+=======
+    if (get_4(&p) != (unsigned int)i_width * i_height * 4)
+=======
 >>>>>>> osgeo-main
     if (get_4(&p) != i_width * i_height * 4)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -599,6 +615,7 @@ static int read_bmp_header(const unsigned char *p)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
 =======
@@ -627,6 +644,8 @@ static int read_bmp_header(const unsigned char *p)
 >>>>>>> osgeo-main
 =======
 >>>>>>> osgeo-main
+=======
+>>>>>>> osgeo-main
 =======
     if (get_4(&p) != i_width * i_height * 4)
 =======
@@ -647,6 +666,7 @@ static int read_bmp_header(const unsigned char *p)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -730,6 +750,8 @@ static int read_bmp_header(const unsigned char *p)
 =======
 >>>>>>> osgeo-main
 =======
+>>>>>>> osgeo-main
+=======
 >>>>>>> osgeo-main
         return 0;